Skip to content

Commit e99108c

Browse files
alalekalalek
committed
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2 parents a3e4431 + 338ae84 commit e99108c

9 files changed

+40
-23
lines changed

‎testdata/dnn/onnx/data/input_normalize_fusion.npy

152 Bytes
Binary file not shown.

‎testdata/dnn/onnx/data/output_normalize_fusion.npy

152 Bytes
Binary file not shown.

‎testdata/dnn/onnx/generate_onnx_models.py

+13
Original file line numberDiff line numberDiff line change
@@ -1245,3 +1245,16 @@ def forward(self, x):
12451245
x = Variable(torch.randn([1, 1, 3, 4]))
12461246
model = PadCalculation()
12471247
save_data_and_model("calc_pads", x, model, version=11)
1248+
1249+
class NormalizeFusion(nn.Module):
1250+
def forward(self, x):
1251+
mul = x * x
1252+
sum = torch.sum(mul, dim=(1), keepdim=True)
1253+
maximum = torch.clamp(sum, min=1e-8)
1254+
sqrt = torch.sqrt(maximum)
1255+
reciprocal = torch.reciprocal(sqrt)
1256+
return x * reciprocal
1257+
1258+
x = Variable(torch.randn([2, 3]))
1259+
model = NormalizeFusion()
1260+
save_data_and_model("normalize_fusion", x, model)

‎testdata/dnn/onnx/models/normalize_fusion.onnx

322 Bytes
Binary file not shown.

‎testdata/dnn/tensorflow/generate_tf_models.py

+4
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,10 @@ def my_dropout(x):
497497
save(inp, flatten, 'unfused_flatten_unknown_batch', optimize=False)
498498
################################################################################
499499
inp = tf.placeholder(tf.float32, [1, 2, 3, 4], 'input')
500+
leakyRelu = tf.nn.leaky_relu(inp, alpha=0.1)
501+
save(inp, leakyRelu, 'leaky_relu', optimize=False)
502+
################################################################################
503+
inp = tf.placeholder(tf.float32, [1, 2, 3, 4], 'input')
500504
relu = tf.maximum(inp, 0.01 * inp, name='leaky_relu') * 2
501505
save(inp, relu, 'leaky_relu_order1', optimize=False)
502506
################################################################################

‎testdata/dnn/tensorflow/leaky_relu_in.npy

224 Bytes
Binary file not shown.

‎testdata/dnn/tensorflow/leaky_relu_net.pb

149 Bytes
Binary file not shown.

‎testdata/dnn/tensorflow/leaky_relu_out.npy

224 Bytes
Binary file not shown.

‎testdata/perf/objdetect.xml

+23-23
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@
696696
97 81 113 100 113 101 99 113 37 104 114 101 51 63 74 88</data></val></decoded_info_uint8_t>
697697
<straight_barcode>
698698
<kind>65536</kind>
699-
<type>5</type>
699+
<type>0</type>
700700
<min>0.</min>
701701
<max>255.</max>
702702
<last>
@@ -723,7 +723,7 @@
723723
97 81 113 100 113 101 99 113 37 104 114 101 51 63 74 88</data></val></decoded_info_uint8_t>
724724
<straight_barcode>
725725
<kind>65536</kind>
726-
<type>5</type>
726+
<type>0</type>
727727
<min>0.</min>
728728
<max>255.</max>
729729
<last>
@@ -750,7 +750,7 @@
750750
97 81 113 100 113 101 99 113 37 104 114 101 51 63 74 88</data></val></decoded_info_uint8_t>
751751
<straight_barcode>
752752
<kind>65536</kind>
753-
<type>5</type>
753+
<type>0</type>
754754
<min>0.</min>
755755
<max>255.</max>
756756
<last>
@@ -777,7 +777,7 @@
777777
97 81 113 100 113 101 99 113 37 104 114 101 51 63 74 88</data></val></decoded_info_uint8_t>
778778
<straight_barcode>
779779
<kind>65536</kind>
780-
<type>5</type>
780+
<type>0</type>
781781
<min>0.</min>
782782
<max>255.</max>
783783
<last>
@@ -804,7 +804,7 @@
804804
97 81 113 100 113 101 99 113 37 104 114 101 51 63 74 88</data></val></decoded_info_uint8_t>
805805
<straight_barcode>
806806
<kind>65536</kind>
807-
<type>5</type>
807+
<type>0</type>
808808
<min>0.</min>
809809
<max>255.</max>
810810
<last>
@@ -839,7 +839,7 @@
839839
<val>94.</val></rng2></decoded_info_uint8_t>
840840
<straight_barcode>
841841
<kind>65536</kind>
842-
<type>5</type>
842+
<type>0</type>
843843
<min>0.</min>
844844
<max>255.</max>
845845
<last>
@@ -874,7 +874,7 @@
874874
<val>56.</val></rng2></decoded_info_uint8_t>
875875
<straight_barcode>
876876
<kind>65536</kind>
877-
<type>5</type>
877+
<type>0</type>
878878
<min>0.</min>
879879
<max>255.</max>
880880
<last>
@@ -909,7 +909,7 @@
909909
<val>51.</val></rng2></decoded_info_uint8_t>
910910
<straight_barcode>
911911
<kind>65536</kind>
912-
<type>5</type>
912+
<type>0</type>
913913
<min>0.</min>
914914
<max>255.</max>
915915
<last>
@@ -944,7 +944,7 @@
944944
<val>85.</val></rng2></decoded_info_uint8_t>
945945
<straight_barcode>
946946
<kind>65536</kind>
947-
<type>5</type>
947+
<type>0</type>
948948
<min>0.</min>
949949
<max>255.</max>
950950
<last>
@@ -979,7 +979,7 @@
979979
<val>67.</val></rng2></decoded_info_uint8_t>
980980
<straight_barcode>
981981
<kind>65536</kind>
982-
<type>5</type>
982+
<type>0</type>
983983
<min>0.</min>
984984
<max>255.</max>
985985
<last>
@@ -1014,7 +1014,7 @@
10141014
<val>32.</val></rng2></decoded_info_uint8_t>
10151015
<straight_barcode>
10161016
<kind>65536</kind>
1017-
<type>5</type>
1017+
<type>0</type>
10181018
<min>0.</min>
10191019
<max>255.</max>
10201020
<last>
@@ -1049,7 +1049,7 @@
10491049
<val>134.</val></rng2></decoded_info_uint8_t>
10501050
<straight_barcode>
10511051
<kind>65536</kind>
1052-
<type>5</type>
1052+
<type>0</type>
10531053
<min>0.</min>
10541054
<max>255.</max>
10551055
<last>
@@ -1084,7 +1084,7 @@
10841084
<val>47.</val></rng2></decoded_info_uint8_t>
10851085
<straight_barcode>
10861086
<kind>65536</kind>
1087-
<type>5</type>
1087+
<type>0</type>
10881088
<min>0.</min>
10891089
<max>255.</max>
10901090
<last>
@@ -1112,7 +1112,7 @@
11121112
103 47</data></val></decoded_info_uint8_t>
11131113
<straight_barcode>
11141114
<kind>65536</kind>
1115-
<type>5</type>
1115+
<type>0</type>
11161116
<min>0.</min>
11171117
<max>255.</max>
11181118
<last>
@@ -1147,7 +1147,7 @@
11471147
<val>112.</val></rng2></decoded_info_uint8_t>
11481148
<straight_barcode>
11491149
<kind>65536</kind>
1150-
<type>5</type>
1150+
<type>0</type>
11511151
<min>0.</min>
11521152
<max>255.</max>
11531153
<last>
@@ -1321,7 +1321,7 @@
13211321
<val>105.</val></rng2></decoded_info_uint8_t>
13221322
<straight_barcode>
13231323
<kind>327680</kind>
1324-
<type>5</type>
1324+
<type>0</type>
13251325
<len>2</len>
13261326
<idx>1</idx>
13271327
<min>0.</min>
@@ -1352,7 +1352,7 @@
13521352
73 32 76 111 118 101 32 79 112 101 110 67 86</data></val></decoded_info_uint8_t>
13531353
<straight_barcode>
13541354
<kind>327680</kind>
1355-
<type>5</type>
1355+
<type>0</type>
13561356
<len>2</len>
13571357
<idx>0</idx>
13581358
<min>0.</min>
@@ -1383,7 +1383,7 @@
13831383
73 32 76 111 118 101 32 79 112 101 110 67 86</data></val></decoded_info_uint8_t>
13841384
<straight_barcode>
13851385
<kind>327680</kind>
1386-
<type>5</type>
1386+
<type>0</type>
13871387
<len>3</len>
13881388
<idx>1</idx>
13891389
<min>0.</min>
@@ -1422,7 +1422,7 @@
14221422
<val>110.</val></rng2></decoded_info_uint8_t>
14231423
<straight_barcode>
14241424
<kind>327680</kind>
1425-
<type>5</type>
1425+
<type>0</type>
14261426
<len>4</len>
14271427
<idx>1</idx>
14281428
<min>0.</min>
@@ -1461,7 +1461,7 @@
14611461
<val>112.</val></rng2></decoded_info_uint8_t>
14621462
<straight_barcode>
14631463
<kind>327680</kind>
1464-
<type>5</type>
1464+
<type>0</type>
14651465
<len>5</len>
14661466
<idx>4</idx>
14671467
<min>0.</min>
@@ -1492,7 +1492,7 @@
14921492
69 88 84 82 65</data></val></decoded_info_uint8_t>
14931493
<straight_barcode>
14941494
<kind>327680</kind>
1495-
<type>5</type>
1495+
<type>0</type>
14961496
<len>6</len>
14971497
<idx>4</idx>
14981498
<min>0.</min>
@@ -1531,7 +1531,7 @@
15311531
<val>103.</val></rng2></decoded_info_uint8_t>
15321532
<straight_barcode>
15331533
<kind>327680</kind>
1534-
<type>5</type>
1534+
<type>0</type>
15351535
<len>7</len>
15361536
<idx>1</idx>
15371537
<min>0.</min>
@@ -1562,7 +1562,7 @@
15621562
80 111 108 105 110 97</data></val></decoded_info_uint8_t>
15631563
<straight_barcode>
15641564
<kind>327680</kind>
1565-
<type>5</type>
1565+
<type>0</type>
15661566
<len>8</len>
15671567
<idx>5</idx>
15681568
<min>0.</min>

0 commit comments

Comments
 (0)