From dc29cb0ace346b5af02ab66a1bf0c9c1f2218516 Mon Sep 17 00:00:00 2001
From: Smirnov Egor <s.e.a.98@yandex.ru>
Date: Wed, 18 Aug 2021 18:42:27 +0300
Subject: [PATCH 1/3] add tests for dynamic batch_size and axis selection in
 Scale layer

---
 .../dnn/onnx/data/input_dynamic_batch.npy     | Bin 0 -> 416 bytes
 .../dnn/onnx/data/input_scale_broadcast_0.npy | Bin 0 -> 288 bytes
 .../dnn/onnx/data/input_scale_broadcast_1.npy | Bin 0 -> 144 bytes
 .../dnn/onnx/data/input_scale_broadcast_2.npy | Bin 0 -> 160 bytes
 .../dnn/onnx/data/output_dynamic_batch.npy    | Bin 0 -> 224 bytes
 .../dnn/onnx/data/output_scale_broadcast.npy  | Bin 0 -> 288 bytes
 testdata/dnn/onnx/generate_onnx_models.py     |  26 +++++++++++++++
 testdata/dnn/onnx/models/dynamic_batch.onnx   | Bin 0 -> 340 bytes
 testdata/dnn/onnx/models/scale_broadcast.onnx |  30 ++++++++++++++++++
 9 files changed, 56 insertions(+)
 create mode 100644 testdata/dnn/onnx/data/input_dynamic_batch.npy
 create mode 100644 testdata/dnn/onnx/data/input_scale_broadcast_0.npy
 create mode 100644 testdata/dnn/onnx/data/input_scale_broadcast_1.npy
 create mode 100644 testdata/dnn/onnx/data/input_scale_broadcast_2.npy
 create mode 100644 testdata/dnn/onnx/data/output_dynamic_batch.npy
 create mode 100644 testdata/dnn/onnx/data/output_scale_broadcast.npy
 create mode 100644 testdata/dnn/onnx/models/dynamic_batch.onnx
 create mode 100644 testdata/dnn/onnx/models/scale_broadcast.onnx

diff --git a/testdata/dnn/onnx/data/input_dynamic_batch.npy b/testdata/dnn/onnx/data/input_dynamic_batch.npy
new file mode 100644
index 0000000000000000000000000000000000000000..6146df46f902c0dc531be3057d99bdb878644afc
GIT binary patch
literal 416
zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
iXCxM+0{I$7Its>MWTL5~P^&-&;9_8Cuph;^!vFxRQ&D38

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/data/input_scale_broadcast_0.npy b/testdata/dnn/onnx/data/input_scale_broadcast_0.npy
new file mode 100644
index 0000000000000000000000000000000000000000..84e55f5f6ea30d85a179fe0a05638ff9f27980d7
GIT binary patch
literal 288
zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
jXCxM+0{I$7Itqq53MM)VrkXkmwF+baE(V4M`@xI>_?<a}

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/data/input_scale_broadcast_1.npy b/testdata/dnn/onnx/data/input_scale_broadcast_1.npy
new file mode 100644
index 0000000000000000000000000000000000000000..b081291560f65a4c96c6647ebce17643bb4e62e2
GIT binary patch
literal 144
zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
gXCxM+0{I$-ItnH_3Wl0G3bhL40WJoH276=-04u8=g#Z8m

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/data/input_scale_broadcast_2.npy b/testdata/dnn/onnx/data/input_scale_broadcast_2.npy
new file mode 100644
index 0000000000000000000000000000000000000000..95938facbf34bfcee44974dd4d44d6a0f43ea22b
GIT binary patch
literal 160
zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
iXCxM+0{I$7Itqq53MN2OQ%9jzfegUKz|dfi4+8)+OCg^C

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/data/output_dynamic_batch.npy b/testdata/dnn/onnx/data/output_dynamic_batch.npy
new file mode 100644
index 0000000000000000000000000000000000000000..4a69fa17765a6306ab2dfe0f1cb86c6047931592
GIT binary patch
literal 224
zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
jXCxM+0{I#yIts=*3WhogMw&VbwF+baE(V4Mds<=u7y2!c

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/data/output_scale_broadcast.npy b/testdata/dnn/onnx/data/output_scale_broadcast.npy
new file mode 100644
index 0000000000000000000000000000000000000000..84e55f5f6ea30d85a179fe0a05638ff9f27980d7
GIT binary patch
literal 288
zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
jXCxM+0{I$7Itqq53MM)VrkXkmwF+baE(V4M`@xI>_?<a}

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/generate_onnx_models.py b/testdata/dnn/onnx/generate_onnx_models.py
index 6187bbe54..538df2739 100644
--- a/testdata/dnn/onnx/generate_onnx_models.py
+++ b/testdata/dnn/onnx/generate_onnx_models.py
@@ -1117,6 +1117,19 @@ def forward(self, x):
 model = Scale()
 save_data_and_model("scale", x, model)
 
+class ScaleBroadcast(nn.Module):
+    def __init__(self, *args, **kwargs):
+        super(ScaleBroadcast, self).__init__()
+
+    def forward(self, x0, x1, x2):
+        return torch.mul(torch.mul(x0, x1), x2)
+
+model = ScaleBroadcast()
+input_0 = Variable(torch.ones(2, 1, 4, 5, dtype=torch.float32))
+input_1 = Variable(torch.ones(1, 4, 1, dtype=torch.float32))
+input_2 = Variable(torch.ones(2, 1, 4, 1, dtype=torch.float32))
+save_data_and_model_multy_inputs("scale_broadcast", model, input_0, input_1, input_2)
+
 x = Variable(torch.randn(1, 3, 25))
 conv1d = nn.Conv1d(3, 2, kernel_size=3, padding=2, stride=2, dilation=2, bias=False)
 save_data_and_model("conv1d", x, conv1d)
@@ -1268,6 +1281,19 @@ def forward(self, x):
 save_data_and_model("average_pooling_dynamic_axes", input, ave_pool)
 postprocess_model("models/average_pooling_dynamic_axes.onnx", [[1, 3, 'height', 'width']])
 
+class DynamicBatch(nn.Module):
+    def __init__(self, *args, **kwargs):
+        super(DynamicBatch, self).__init__()
+        self.pool = nn.MaxPool2d(2, stride=2)
+
+    def forward(self, x):
+        return torch.cat((self.pool(x), torch.ones(2, 3, 1, 2)))
+
+model = DynamicBatch()
+input_ = Variable(torch.ones(2, 3, 3, 4, dtype=torch.float32))
+save_data_and_model("dynamic_batch", input_, model, export_params=True)
+postprocess_model("models/dynamic_batch.onnx", [['batch_size', 3, 3, 4]])
+
 x = Variable(torch.randn(1, 3, 10))
 max_pool = nn.MaxPool1d(kernel_size=(5), stride=1, padding=2, dilation=1)
 save_data_and_model("maxpooling_1d", x, max_pool)
diff --git a/testdata/dnn/onnx/models/dynamic_batch.onnx b/testdata/dnn/onnx/models/dynamic_batch.onnx
new file mode 100644
index 0000000000000000000000000000000000000000..c2a3b49ae96d227b0f666415192d6d0625a010fa
GIT binary patch
literal 340
zcmb79K}y6x5KPaGo7r{`aZr&FL;`{gtR&f!A{g`{g5b%6moS?hNHioNGb_=PPsvC8
zn~57AAWhLlby0M&DR=7+TQzAWCgH{9)i=Rsgn&aRW{;|Us;VLhe0QYs0OxPIDRq&U
zOw~FjG3mgSdq``wHnFpvLGsWww#nDpj3!JuL;~-s(pXj6B=p%Im-o2yu8NJ8*Nm_U
z14cY}2ps3@=0E6w;yFTy5OG+FAwE?$iTvr7$z7zX&CQY10pZ?n>&0ts7rL#h#=e{l
r#ZU2s0T(#uxKcLF5|e*w?7td8SH}oTeu(?M&Fe)v9-!akmUy!t?vqD>

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/models/scale_broadcast.onnx b/testdata/dnn/onnx/models/scale_broadcast.onnx
new file mode 100644
index 000000000..c45a4f5fa
--- /dev/null
+++ b/testdata/dnn/onnx/models/scale_broadcast.onnx
@@ -0,0 +1,30 @@
+pytorch1.9:°

+
+
0
+
1
3Mul_0"Mul
+
+
3
+
2
4Mul_1"Multorch-jit-exportZ
+
0
+

+
+

+
+Z
+
1
+

+

+
+
Z
+
2
+

+
+

+
+
b
+
4
+

+
+

+
+B	
\ No newline at end of file

From 88882e471c7d416b061fdb02bdf31fbc294fb429 Mon Sep 17 00:00:00 2001
From: wjj19950828 <wjjisloser@163.com>
Date: Fri, 6 Aug 2021 21:29:54 +0800
Subject: [PATCH 2/3] add onnx model and test data

---
 .../dnn/onnx/data/input_resize_humanseg.npy   | Bin 0 -> 224 bytes
 .../dnn/onnx/data/output_resize_humanseg.npy  | Bin 0 -> 512 bytes
 testdata/dnn/onnx/generate_onnx_models.py     |  24 ++++++++++++++++++
 testdata/dnn/onnx/models/resize_humanseg.onnx | Bin 0 -> 834 bytes
 4 files changed, 24 insertions(+)
 create mode 100644 testdata/dnn/onnx/data/input_resize_humanseg.npy
 create mode 100644 testdata/dnn/onnx/data/output_resize_humanseg.npy
 create mode 100644 testdata/dnn/onnx/models/resize_humanseg.onnx

diff --git a/testdata/dnn/onnx/data/input_resize_humanseg.npy b/testdata/dnn/onnx/data/input_resize_humanseg.npy
new file mode 100644
index 0000000000000000000000000000000000000000..21953e023443e2b074b3e44196fdafa878489603
GIT binary patch
literal 224
zcmbR27wQ`j$;eQ~P_3SlTAW;@Zl$1ZlV+l>qoAIaUsO_*m=~X4l#&V(cT3DEP6dh=
zXCxM+0{I$-ItoTQ3dTALCYm}5wF+bau9`_H_D(-n+6mbN*^8divX!pBV;dSOVK1|Y
z-TrOvHM=RhR@>#r%G(QvJg_^OWMj`ckHucZK*au^sj7WgeXYIKqd<G%{>yeE!3p-y
Y9tPR3REW2o^TXVpH`>=;wbjNR0F@U%IRF3v

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/data/output_resize_humanseg.npy b/testdata/dnn/onnx/data/output_resize_humanseg.npy
new file mode 100644
index 0000000000000000000000000000000000000000..3a5d3fdac3874c7276740cf1be57e5b9ebfe3917
GIT binary patch
literal 512
zcmbWr-Ahw(9LMpq<I`#rBxf!R`~}(B?9ke>aah~;qZY#+Hk77JA!O~LF0AF5tZ+#X
ztB@TeosGcg;YJ7(f?$|<H8LzHN(411Sd<hbv51nfSoSaUzI(rt?oL;Gw~C8$F(D9)
z_+`Py1be7S5Sb7P%LB6Sd~a9|1pm3y*B1$HdgQF{LU8j9W|3J$W)+!a6xk5_kG5VO
z3!rSe8T+5*D1ZA4S-)9e^)mcwk*Vfoqa)p6LBU*)s?Ry%ZfwxU-9{ArdfZWs(>uF{
zPTrrO#fvlacFzxro3)@+4V0J~A2Kf}W0<6Ygn{x<=u%UG61)yyS1O<!P$9aF!%|6+
z9wbMoZ|*7a6>5y7tFf?Jq+)_cHd%+oS_8&sr)YBU4Tb(_aqDI^p0EEVNh(3gW5oPv
zJGR^{g>qGm(c@JZ>DMFvlflz=2;8|d=(;k5?cZzh%BzD-ti-%Yhp^v>+>^sNvCEJA
zvW$JB1b3MTWxX5+A8Fuhv0-n*gSFuvv<{zwX^kPJ(jz35qyCc)nbIQ|<h^jcZ%6u=
z3q3P2a!)*_1+50xmrck{JCWVtM!e36uAQxT$a)=fuYI%;t%TI!KtJDxWW!P1n{7tJ
HH9P(SB-*a2

literal 0
HcmV?d00001

diff --git a/testdata/dnn/onnx/generate_onnx_models.py b/testdata/dnn/onnx/generate_onnx_models.py
index 6187bbe54..c5ed61a17 100644
--- a/testdata/dnn/onnx/generate_onnx_models.py
+++ b/testdata/dnn/onnx/generate_onnx_models.py
@@ -4,6 +4,7 @@
 import torch.nn.init as init
 import torch.nn as nn
 import torch.nn.functional as F
+import paddle # version 2.1.1
 import numpy as np
 import os.path
 import onnx
@@ -1356,3 +1357,26 @@ def forward(self, x):
 x = Variable(torch.randn([2, 3]))
 model = NormalizeFusion()
 save_data_and_model("normalize_fusion", x, model)
+
+#paddle2onnx model
+class Resize_HumanSeg(paddle.nn.Layer):
+    def __init__(self, ):
+        super(Resize_HumanSeg, self).__init__()
+
+    def forward(self, x0):
+        x1 = paddle.nn.functional.interpolate(x0,size=[6,8],mode='bilinear',align_corners=False)
+        return x1
+
+def save_data_and_paddle_model(model, name, input_data):
+    model.eval()
+    np.save(os.path.join("data", "input_" + name + ".npy"), input_data.numpy())
+    output = model(input_data)
+    np.save(os.path.join("data", "output_" + name + ".npy"), output.numpy())
+    inputs = [paddle.static.InputSpec(shape=input_data.shape, dtype="float32")]
+    paddle.onnx.export(model, "models/" + name,
+                       input_spec=inputs,
+                       opset_version=11)
+
+input_shape = [1, 2, 3, 4]
+x = paddle.rand(input_shape, dtype="float32")
+save_data_and_paddle_model(Resize_HumanSeg(), "resize_humanseg", x)
\ No newline at end of file
diff --git a/testdata/dnn/onnx/models/resize_humanseg.onnx b/testdata/dnn/onnx/models/resize_humanseg.onnx
new file mode 100644
index 0000000000000000000000000000000000000000..061aa65fa50f70c9d4247551341c6deaba7e8112
GIT binary patch
literal 834
zcmaiy%}c{D7{;5fcHy0e8i&a6iyjN=+6^2#OqeHcqTs<xiED;|E-h^w)02OO$6fs|
zO<Fqx!aO8Ayzu;<Cm*;?cJFACq^#b@UoJcnxXDB*sgQBs$Bhmqu(PD;D+?lwJ>;KR
z*2nd>H8n76<iOD2h6eYj;d<Eekl_lo>lo}+pR^xdXwKq(uMz%EHGwMw8X3^j2D*=t
z*B&Fw;6|Ej8V6g9wqYD-;~1I_@O!|>&;!*r<+HkNEmT`AU}Ur%8lh)R+b*_MTieA(
z>QJXnRBFvKl7>XT&Wx&e>TQ(o*0Z1k4qfr`&{`uKK9Rmh!)xjgHg3{;<|!A97BLr+
z6?wdj;_yN)a-DI{O8%}6=DW2DF5zUBWktdTl`NJ873DlD7F6;~#EUFpKD^L$9_M_;
z(lu%Yd*D=Kw+>MwxQ8v7<fNoarn<~oQ32D-az<0t;inVaCQL{!-}GN?H0k8kr#{bw
nSUnw8U+4h37!eO_tgZsvYPHmIo=5Oc1o`W9l@m`Lu)NMUw`l3<

literal 0
HcmV?d00001


From 0b9e7660a71c516c7380c50a2e9ed0b241d9f909 Mon Sep 17 00:00:00 2001
From: Dale Phurrough <dale@hidale.com>
Date: Wed, 1 Sep 2021 19:34:49 +0200
Subject: [PATCH 3/3] Merge pull request #901 from
 diablodale:fix20575-downloader

* another fix opencv/opencv#20575

* download_models: rename downloaded content for further investigation

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
---
 testdata/dnn/download_models.py | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/testdata/dnn/download_models.py b/testdata/dnn/download_models.py
index 6eca15c29..7cbbd4d40 100755
--- a/testdata/dnn/download_models.py
+++ b/testdata/dnn/download_models.py
@@ -51,7 +51,8 @@ def verify(self):
                         break
                     sha.update(buf)
             print('  actual {}'.format(sha.hexdigest()))
-            return self.sha == sha.hexdigest()
+            self.sha_actual = sha.hexdigest()
+            return self.sha == self.sha_actual
         except Exception as e:
             print('  catch {}'.format(e))
 
@@ -82,7 +83,10 @@ def get(self):
 
         print(' done')
         print(' file {}'.format(self.filename))
-        return self.verify()
+        candidate_verify = self.verify()
+        if not candidate_verify:
+            self.handle_bad_download()
+        return candidate_verify
 
     def download(self):
         try:
@@ -112,6 +116,27 @@ def save(self, r):
                 print('>', end='')
                 sys.stdout.flush()
 
+    def handle_bad_download(self):
+        if os.path.exists(self.filename):
+            # rename file for further investigation
+            try:
+                # NB: using `self.sha_actual` may create unbounded number of files
+                rename_target = self.filename + '.invalid'
+                # TODO: use os.replace (Python 3.3+)
+                try:
+                    if os.path.exists(rename_target):  # avoid FileExistsError on Windows from os.rename()
+                        os.remove(rename_target)
+                finally:
+                    os.rename(self.filename, rename_target)
+                    print('  renaming invalid file to ' + rename_target)
+            except:
+                import traceback
+                traceback.print_exc()
+            finally:
+                if os.path.exists(self.filename):
+                    print('  deleting invalid file')
+                    os.remove(self.filename)
+
 
 def GDrive(gid):
     def download_gdrive(dst):