From 16826a685f4e40e40d11fb31434674b63203f982 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Wed, 18 Dec 2024 23:59:30 +0100
Subject: [PATCH 1/2] [Test] add test_channelslast_residual

Co-authored-by: Javier Campos <jcampos@fnal.gov>
---
 src/qonnx/data/onnx/residual_block_clean.onnx | Bin 0 -> 19297 bytes
 .../test_channelslast_residual.py             |  55 ++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 src/qonnx/data/onnx/residual_block_clean.onnx
 create mode 100644 tests/transformation/test_channelslast_residual.py

diff --git a/src/qonnx/data/onnx/residual_block_clean.onnx b/src/qonnx/data/onnx/residual_block_clean.onnx
new file mode 100644
index 0000000000000000000000000000000000000000..fea0eadb0cedc57b63bf0c0320c17e4ba7d47ca7
GIT binary patch
literal 19297
zcmeI4PjAyO7{<vGsOycWm@%QTQ^W*{G%4w22ni{a1E)!7M=nuHBAPC1qNGJT@)0;7
zP8|3Ed<kwG#&^O_>|!%e$2Kn0)5>)nyN};Lzf0=qC4IJ;og~Lqk?qx4Gt1_C<Dz_X
z^z_>&i+;3d|7}r@lOoP%^!AH#_AU<MDyfs>z#N8bUCx$^d9Zz}8+eZBeMb9fUL^Cp
zoHdaZSzoN4e~)e)W%Vp8;%1UmSwtctF5jU}m84B{qkD@>1KMlmb)IHT<U|g?Lb+x7
zZqky_G)xYaVPUKp7XE`_c4X^@ar2c6nqi$&^s%(7+l;LrX2pUBtlPO8c#h~>7qnUF
z!q9X<4wVZ--G$+QcA?u$x}bvBTFisjx-c}8&^aqTr_a+=IexSK?%BMf6ROQHD%s-k
z+3p`CC$Gw~hy$-Dzn)>FOaHkTVeBw#@^q0DBSG`aI;kf9=N;k_i}2UL^4{<KI6Zxa
zh8TbWFaQR?02lxRU;qq&0Wbgtu0I1K^A8RGfVlj=@X19}Z_0)K*L{As=@OgRT=m2L
zMP>23>rWzbj2wdjFaQR?02lxRU;qq&0WbgtzyKHk17H9QfB`T72EYIq00Us)@(jr1
zI`!1>6`lU6r;c&@cliu~a>Nh}fB`T72EYIq00UqE41fVJ00zJS7ytuc01SWuFaQR?
z02lxRVBowA$kRVnaOa9n|5U-A*SlKXBzB)}5sNXpMy$5k<hw=1$M_-DO5m_9y2;lK
z<T{u48=_4gnWdHjZJ}5sM2TqA2j;?%QA)U?!zbOPiaPN8O+_f#qAgX_QRW|2RNz*s
zsE`;cyGH3CO+)x1ED1%Ms%5gM(AoGbmuaPxR;tO$Myu3TY|2yjtH#ma_8hGZ?*0V)
C?m?^o

literal 0
HcmV?d00001

diff --git a/tests/transformation/test_channelslast_residual.py b/tests/transformation/test_channelslast_residual.py
new file mode 100644
index 00000000..7c4782ad
--- /dev/null
+++ b/tests/transformation/test_channelslast_residual.py
@@ -0,0 +1,55 @@
+# Copyright (c) 2024 Advanced Micro Devices, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# * Neither the name of qonnx nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import numpy as np
+from pkgutil import get_data
+
+import qonnx.core.onnx_exec as oxe
+from qonnx.core.modelwrapper import ModelWrapper
+from qonnx.transformation.channels_last import ConvertToChannelsLastAndClean
+from qonnx.util.basic import gen_finn_dt_tensor
+
+
+def test_channelslast_residual():
+    raw_m = get_data("qonnx.data", "onnx/residual_block_clean.onnx")
+    model = ModelWrapper(raw_m)
+    iname = model.graph.input[0].name
+    idt = model.get_tensor_datatype(iname)
+    ishape = model.get_tensor_shape(iname)
+    idict = {iname: gen_finn_dt_tensor(idt, ishape)}
+    oname = model.graph.output[0].name
+    expected_out = oxe.execute_onnx(model, idict)[oname]
+    model = model.transform(ConvertToChannelsLastAndClean(make_input_channels_last=False))
+    expected_ops = ["Transpose", "Conv", "Conv", "Relu", "Conv", "Relu", "Add", "MaxPool", "Transpose"]
+    ops = [x.op_type for x in model.graph.node]
+    assert ops == expected_ops, "Did not found expected op sequence after lowering and channels-last"
+    for node in model.graph.node:
+        if node.op_type in ["Conv", "MaxPool"]:
+            assert node.domain == "qonnx.custom_op.channels_last"
+    out = oxe.execute_onnx(model, idict)[oname]
+    assert np.isclose(expected_out, out, atol=1e-4).all()

From cf7c56eb0deaddb2035b750c36b48979361e2599 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Thu, 19 Dec 2024 00:01:47 +0100
Subject: [PATCH 2/2] [ChanLast] don't remove opposing transposes if first one
 is forking

---
 src/qonnx/transformation/channels_last.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qonnx/transformation/channels_last.py b/src/qonnx/transformation/channels_last.py
index c22889a6..175af058 100644
--- a/src/qonnx/transformation/channels_last.py
+++ b/src/qonnx/transformation/channels_last.py
@@ -301,7 +301,10 @@ def apply(self, model):
                 ndim = len(input_shape)
                 if list(to_channels_first_args(ndim)) == perm_1:
                     successor_nodes = model.find_direct_successors(n)
-                    if successor_nodes is None:
+                    # skip if:
+                    # - this Transpose has no successors (nothing to do)
+                    # - this Transpose output is forking (cannot remove)
+                    if successor_nodes is None or len(successor_nodes) > 1:
                         continue
                     successor_node = successor_nodes[0]