aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuan Zhao2019-09-27 15:36:58 -0500
committerYuan Zhao2019-09-27 16:36:20 -0500
commitdaab76f080acf265349a574e4cc825368dd803aa (patch)
treec04dbc7a929f6e1341fe9419ca996cf19f332375
parente93d1653c3fe754fcf058b59567eccb7047f01de (diff)
downloadtidl-api-daab76f080acf265349a574e4cc825368dd803aa.tar.gz
tidl-api-daab76f080acf265349a574e4cc825368dd803aa.tar.xz
tidl-api-daab76f080acf265349a574e4cc825368dd803aa.zip
Revert "More example sizes adjustment with new TIDL lib"
This reverts commit 268aecd993dec4faec1a414d6aac4c43b0c059ed.
-rw-r--r--examples/one_eo_per_frame/main.cpp2
-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.cpp2
-rw-r--r--examples/two_eo_per_frame_opt/main.cpp2
8 files changed, 4 insertions, 22 deletions
diff --git a/examples/one_eo_per_frame/main.cpp b/examples/one_eo_per_frame/main.cpp
index 2665bb6..c8000d1 100644
--- a/examples/one_eo_per_frame/main.cpp
+++ b/examples/one_eo_per_frame/main.cpp
@@ -101,8 +101,6 @@ bool Run(const string& config_file, int num_eve, int num_dsp,
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 = (34 << 20); // 34MB
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..f309d4e 100644
--- a/examples/two_eo_per_frame/main.cpp
+++ b/examples/two_eo_per_frame/main.cpp
@@ -92,8 +92,6 @@ bool Run(int num_eve, int num_dsp, const char* ref_output)
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 = (34 << 20); // 34MB
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..68d9221 100644
--- a/examples/two_eo_per_frame_opt/main.cpp
+++ b/examples/two_eo_per_frame_opt/main.cpp
@@ -97,8 +97,6 @@ bool Run(int num_eve, int num_dsp, const char* ref_output)
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 = (34 << 20); // 34MB
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;