aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuan Zhao2019-09-30 09:39:55 -0500
committerYuan Zhao2019-09-30 09:39:55 -0500
commit092a2ed047b02d9668fddebe61d4e5920bfbfb3f (patch)
tree1def3df2b1c91cf5a1b213dd1016cb38beea010f
parentb83df643de46c2ae198dfdac859e51f6b4acc1ea (diff)
parent9daf746d3faaf735d7a598c44185aa6a782dbc28 (diff)
downloadtidl-api-092a2ed047b02d9668fddebe61d4e5920bfbfb3f.tar.gz
tidl-api-092a2ed047b02d9668fddebe61d4e5920bfbfb3f.tar.xz
tidl-api-092a2ed047b02d9668fddebe61d4e5920bfbfb3f.zip
Merge branch 'hotfix/v01.03.03'v01.03.03
-rw-r--r--docs/source/changelog.rst4
-rw-r--r--docs/source/example.rst4
-rwxr-xr-xexamples/mcbench/scripts/all_5728.sh3
-rwxr-xr-xexamples/mcbench/scripts/all_5749.sh9
-rw-r--r--examples/one_eo_per_frame/main.cpp4
-rwxr-xr-xexamples/pybind/imagenet.py2
-rwxr-xr-xexamples/pybind/one_eo_per_frame.py5
-rwxr-xr-xexamples/pybind/two_eo_per_frame.py5
-rwxr-xr-xexamples/pybind/two_eo_per_frame_opt.py5
-rw-r--r--examples/ssd_multibox/main.cpp3
-rw-r--r--examples/two_eo_per_frame/main.cpp4
-rw-r--r--examples/two_eo_per_frame_opt/main.cpp4
-rw-r--r--tidl_api/make.buildid2
13 files changed, 19 insertions, 35 deletions
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index e170f5e..ed33397 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -2,12 +2,14 @@
2Changelog 2Changelog
3######### 3#########
4 4
51.3.1 [Processor Linux SDK 6.1] 51.3.3 [Processor Linux SDK 6.1]
6=============================== 6===============================
7**Added** 7**Added**
8 8
9#. Added imagenet python example. 9#. Added imagenet python example.
10 10
11#. Added MobileNet v2 support.
12
11**Changed** 13**Changed**
12 14
13#. Trace data now also include dataQ/minValue/maxValue info. 15#. Trace data now also include dataQ/minValue/maxValue info.
diff --git a/docs/source/example.rst b/docs/source/example.rst
index 669020f..9c696ad 100644
--- a/docs/source/example.rst
+++ b/docs/source/example.rst
@@ -276,10 +276,6 @@ versus ExecutionObject level.
276When there is a requirement to run the SSD networks non-partitioned, 276When there is a requirement to run the SSD networks non-partitioned,
277for example, the SoC only has C66x cores but not EVE cores, 277for example, the SoC only has C66x cores but not EVE cores,
278use ``-e 0`` to run the full network only on C66x cores, without partitioning. 278use ``-e 0`` to run the full network only on C66x cores, without partitioning.
279When running full network with C66x DSP cores, jdetnet works fine with default
280heap sizes. jdetnet_voc requires slightly larger heap size and can be run
281with environment variable, e.g.
282``TIDL_NETWORK_HEAP_SIZE_DSP=75000000 ./ssd_multibox -d 1 -e 0``.
283 279
284.. _mnist-example: 280.. _mnist-example:
285 281
diff --git a/examples/mcbench/scripts/all_5728.sh b/examples/mcbench/scripts/all_5728.sh
index 588971b..ed996be 100755
--- a/examples/mcbench/scripts/all_5728.sh
+++ b/examples/mcbench/scripts/all_5728.sh
@@ -1,4 +1,5 @@
1./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_mobileNet1.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y 1./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_mobileNet1.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
2./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_mobileNet2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
2./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_squeeze1_1.txt -f 50 -i ../test/testvecs/input/preproc_1_227x227_multi.y 3./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_squeeze1_1.txt -f 50 -i ../test/testvecs/input/preproc_1_227x227_multi.y
3./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_inceptionNetv1.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y 4./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_inceptionNetv1.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y
4./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_j11_v2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y 5./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_j11_v2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y
diff --git a/examples/mcbench/scripts/all_5749.sh b/examples/mcbench/scripts/all_5749.sh
index 98f1f24..8956373 100755
--- a/examples/mcbench/scripts/all_5749.sh
+++ b/examples/mcbench/scripts/all_5749.sh
@@ -1,6 +1,9 @@
1./mcbench -g 1 -d 0 -e 2 -c ../test/testvecs/config/infer/tidl_config_mobileNet1.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y 1./mcbench -g 1 -d 0 -e 2 -c ../test/testvecs/config/infer/tidl_config_mobileNet1.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
2./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_mobileNet1.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y 2./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_mobileNet1.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
3./mcbench -g 2 -d 1 -e 2 -c ../test/testvecs/config/infer/tidl_config_mobileNet1_lg2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y 3./mcbench -g 2 -d 1 -e 2 -c ../test/testvecs/config/infer/tidl_config_mobileNet1_lg2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
4./mcbench -g 1 -d 0 -e 2 -c ../test/testvecs/config/infer/tidl_config_mobileNet2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
5./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_mobileNet2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
6./mcbench -g 2 -d 1 -e 2 -c ../test/testvecs/config/infer/tidl_config_mobileNet2_lg2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y
4./mcbench -g 1 -d 0 -e 2 -c ../test/testvecs/config/infer/tidl_config_squeeze1_1.txt -f 50 -i ../test/testvecs/input/preproc_1_227x227_multi.y 7./mcbench -g 1 -d 0 -e 2 -c ../test/testvecs/config/infer/tidl_config_squeeze1_1.txt -f 50 -i ../test/testvecs/input/preproc_1_227x227_multi.y
5./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_squeeze1_1.txt -f 50 -i ../test/testvecs/input/preproc_1_227x227_multi.y 8./mcbench -g 1 -d 2 -e 0 -c ../test/testvecs/config/infer/tidl_config_squeeze1_1.txt -f 50 -i ../test/testvecs/input/preproc_1_227x227_multi.y
6./mcbench -g 1 -d 0 -e 2 -c ../test/testvecs/config/infer/tidl_config_inceptionNetv1.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y 9./mcbench -g 1 -d 0 -e 2 -c ../test/testvecs/config/infer/tidl_config_inceptionNetv1.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y
diff --git a/examples/one_eo_per_frame/main.cpp b/examples/one_eo_per_frame/main.cpp
index 2665bb6..8872c06 100644
--- a/examples/one_eo_per_frame/main.cpp
+++ b/examples/one_eo_per_frame/main.cpp
@@ -100,9 +100,7 @@ bool Run(const string& config_file, int num_eve, int num_dsp,
100 100
101 // Heap sizes for this network determined using Configuration::showHeapStats 101 // Heap sizes for this network determined using Configuration::showHeapStats
102 c.PARAM_HEAP_SIZE = (3 << 20); // 3MB 102 c.PARAM_HEAP_SIZE = (3 << 20); // 3MB
103 c.NETWORK_HEAP_SIZE = (34 << 20); // 34MB 103 c.NETWORK_HEAP_SIZE = (20 << 20); // 20MB
104 // AM572x default CMEM size is 160MB, 4 EVEs + 2DSPs won't fit
105 if (num_eve > 2) num_eve = 2;
106 104
107 c.numFrames = 16; 105 c.numFrames = 16;
108 106
diff --git a/examples/pybind/imagenet.py b/examples/pybind/imagenet.py
index 4d83bbe..f249c09 100755
--- a/examples/pybind/imagenet.py
+++ b/examples/pybind/imagenet.py
@@ -111,7 +111,7 @@ def run(num_eve, num_dsp, configuration, labels_file):
111 111
112 # Heap sizes for this network determined using Configuration.showHeapStats 112 # Heap sizes for this network determined using Configuration.showHeapStats
113 configuration.param_heap_size = (3 << 20) 113 configuration.param_heap_size = (3 << 20)
114 configuration.network_heap_size = (34 << 20) 114 configuration.network_heap_size = (20 << 20)
115 115
116 116
117 try: 117 try:
diff --git a/examples/pybind/one_eo_per_frame.py b/examples/pybind/one_eo_per_frame.py
index dda9712..81c9e22 100755
--- a/examples/pybind/one_eo_per_frame.py
+++ b/examples/pybind/one_eo_per_frame.py
@@ -54,9 +54,6 @@ def main():
54 54
55 num_dsp = Executor.get_num_devices(DeviceType.DSP) 55 num_dsp = Executor.get_num_devices(DeviceType.DSP)
56 num_eve = Executor.get_num_devices(DeviceType.EVE) 56 num_eve = Executor.get_num_devices(DeviceType.EVE)
57 # AM572x default CMEM size is 160MB, 4 EVEs + 2DSPs won't fit
58 if num_eve > 2:
59 num_eve = 2
60 57
61 if num_dsp == 0 and num_eve == 0: 58 if num_dsp == 0 and num_eve == 0:
62 print('No TIDL API capable devices available') 59 print('No TIDL API capable devices available')
@@ -96,7 +93,7 @@ def run(num_eve, num_dsp, configuration):
96 93
97 # Heap sizes for this network determined using Configuration.showHeapStats 94 # Heap sizes for this network determined using Configuration.showHeapStats
98 configuration.param_heap_size = (3 << 20) 95 configuration.param_heap_size = (3 << 20)
99 configuration.network_heap_size = (34 << 20) 96 configuration.network_heap_size = (20 << 20)
100 97
101 try: 98 try:
102 print('TIDL API: performing one time initialization ...') 99 print('TIDL API: performing one time initialization ...')
diff --git a/examples/pybind/two_eo_per_frame.py b/examples/pybind/two_eo_per_frame.py
index 6090d7b..953c691 100755
--- a/examples/pybind/two_eo_per_frame.py
+++ b/examples/pybind/two_eo_per_frame.py
@@ -55,13 +55,10 @@ def main():
55 55
56 # Heap sizes for this network determined using Configuration.showHeapStats 56 # Heap sizes for this network determined using Configuration.showHeapStats
57 configuration.param_heap_size = (3 << 20) 57 configuration.param_heap_size = (3 << 20)
58 configuration.network_heap_size = (34 << 20) 58 configuration.network_heap_size = (20 << 20)
59 59
60 num_dsp = Executor.get_num_devices(DeviceType.DSP) 60 num_dsp = Executor.get_num_devices(DeviceType.DSP)
61 num_eve = Executor.get_num_devices(DeviceType.EVE) 61 num_eve = Executor.get_num_devices(DeviceType.EVE)
62 # AM572x default CMEM size is 160MB, 4 EVEs + 2DSPs won't fit
63 if num_eve > 2:
64 num_eve = 2
65 62
66 if num_dsp == 0 or num_eve == 0: 63 if num_dsp == 0 or num_eve == 0:
67 print('This example requires EVEs and DSPs.') 64 print('This example requires EVEs and DSPs.')
diff --git a/examples/pybind/two_eo_per_frame_opt.py b/examples/pybind/two_eo_per_frame_opt.py
index 1202511..2819555 100755
--- a/examples/pybind/two_eo_per_frame_opt.py
+++ b/examples/pybind/two_eo_per_frame_opt.py
@@ -51,13 +51,10 @@ def main():
51 51
52 # Heap sizes for this network determined using Configuration.showHeapStats 52 # Heap sizes for this network determined using Configuration.showHeapStats
53 configuration.param_heap_size = (3 << 20) 53 configuration.param_heap_size = (3 << 20)
54 configuration.network_heap_size = (34 << 20) 54 configuration.network_heap_size = (20 << 20)
55 55
56 num_dsp = Executor.get_num_devices(DeviceType.DSP) 56 num_dsp = Executor.get_num_devices(DeviceType.DSP)
57 num_eve = Executor.get_num_devices(DeviceType.EVE) 57 num_eve = Executor.get_num_devices(DeviceType.EVE)
58 # AM572x default CMEM size is 160MB, 4 EVEs + 2DSPs won't fit
59 if num_eve > 2:
60 num_eve = 2
61 58
62 if num_dsp == 0 or num_eve == 0: 59 if num_dsp == 0 or num_eve == 0:
63 print('This example requires EVEs and DSPs.') 60 print('This example requires EVEs and DSPs.')
diff --git a/examples/ssd_multibox/main.cpp b/examples/ssd_multibox/main.cpp
index eaa61bd..93f4c89 100644
--- a/examples/ssd_multibox/main.cpp
+++ b/examples/ssd_multibox/main.cpp
@@ -166,9 +166,6 @@ bool RunConfiguration(const cmdline_opts_t& opts)
166 c.enableApiTrace = opts.verbose; 166 c.enableApiTrace = opts.verbose;
167 if (opts.num_eves == 0 || opts.num_dsps == 0) 167 if (opts.num_eves == 0 || opts.num_dsps == 0)
168 c.runFullNet = true; 168 c.runFullNet = true;
169 // DSP only execution requires larger NETWORK HEAP size
170 if (opts.num_eves == 0)
171 c.NETWORK_HEAP_SIZE = 75000000;
172 169
173 // setup camera/video input 170 // setup camera/video input
174 VideoCapture cap; 171 VideoCapture cap;
diff --git a/examples/two_eo_per_frame/main.cpp b/examples/two_eo_per_frame/main.cpp
index d746edc..d1aa6dc 100644
--- a/examples/two_eo_per_frame/main.cpp
+++ b/examples/two_eo_per_frame/main.cpp
@@ -91,9 +91,7 @@ bool Run(int num_eve, int num_dsp, const char* ref_output)
91 91
92 // Heap sizes for this network determined using Configuration::showHeapStats 92 // Heap sizes for this network determined using Configuration::showHeapStats
93 c.PARAM_HEAP_SIZE = (3 << 20); // 3MB 93 c.PARAM_HEAP_SIZE = (3 << 20); // 3MB
94 c.NETWORK_HEAP_SIZE = (34 << 20); // 34MB 94 c.NETWORK_HEAP_SIZE = (20 << 20); // 20MB
95 // AM572x default CMEM size is 160MB, 4 EVEs + 2DSPs won't fit
96 if (num_eve > 2) num_eve = 2;
97 95
98 // Run this example for 16 input frames 96 // Run this example for 16 input frames
99 c.numFrames = 16; 97 c.numFrames = 16;
diff --git a/examples/two_eo_per_frame_opt/main.cpp b/examples/two_eo_per_frame_opt/main.cpp
index c54b908..43310c0 100644
--- a/examples/two_eo_per_frame_opt/main.cpp
+++ b/examples/two_eo_per_frame_opt/main.cpp
@@ -96,9 +96,7 @@ bool Run(int num_eve, int num_dsp, const char* ref_output)
96 96
97 // Heap sizes for this network determined using Configuration::showHeapStats 97 // Heap sizes for this network determined using Configuration::showHeapStats
98 c.PARAM_HEAP_SIZE = (3 << 20); // 3MB 98 c.PARAM_HEAP_SIZE = (3 << 20); // 3MB
99 c.NETWORK_HEAP_SIZE = (34 << 20); // 34MB 99 c.NETWORK_HEAP_SIZE = (20 << 20); // 20MB
100 // AM572x default CMEM size is 160MB, 4 EVEs + 2DSPs won't fit
101 if (num_eve > 2) num_eve = 2;
102 100
103 // Run this example for 16 input frames 101 // Run this example for 16 input frames
104 c.numFrames = 16; 102 c.numFrames = 16;
diff --git a/tidl_api/make.buildid b/tidl_api/make.buildid
index 636278c..dbdfda4 100644
--- a/tidl_api/make.buildid
+++ b/tidl_api/make.buildid
@@ -26,7 +26,7 @@
26 26
27MAJOR_VER=1 27MAJOR_VER=1
28MINOR_VER=3 28MINOR_VER=3
29PATCH_VER=2 29PATCH_VER=3
30 30
31ifeq ($(shell git rev-parse --short HEAD 2>&1 1>/dev/null; echo $$?),0) 31ifeq ($(shell git rev-parse --short HEAD 2>&1 1>/dev/null; echo $$?),0)
32BUILD_SHA?=$(shell git rev-parse --short HEAD) 32BUILD_SHA?=$(shell git rev-parse --short HEAD)