diff options
author | Ajay Jayaraj | 2018-12-12 08:09:23 -0600 |
---|---|---|
committer | Ajay Jayaraj | 2018-12-12 08:09:23 -0600 |
commit | 139e105486ba7c7a8487cf237de37acbcbf80ed6 (patch) | |
tree | abdeb5ce8f65b582d6f6050cdb52e40f2f7a3efe | |
parent | 224a2377087f407491e98c1780ae38876bc9d65e (diff) | |
parent | 027905b0cc6016187c88619971f91166118cac8b (diff) | |
download | tidl-api-139e105486ba7c7a8487cf237de37acbcbf80ed6.tar.gz tidl-api-139e105486ba7c7a8487cf237de37acbcbf80ed6.tar.xz tidl-api-139e105486ba7c7a8487cf237de37acbcbf80ed6.zip |
Merge branch 'hotfix/v01.02.02'v01.02.02
-rw-r--r-- | docs/source/changelog.rst | 2 | ||||
-rw-r--r-- | examples/classification/main.cpp | 8 | ||||
-rw-r--r-- | tidl_api/make.buildid | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index d396f98..37f8b94 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst | |||
@@ -2,7 +2,7 @@ | |||
2 | Changelog | 2 | Changelog |
3 | ######### | 3 | ######### |
4 | 4 | ||
5 | 1.2.1 [Processor Linux SDK 5.2] | 5 | 1.2.2 [Processor Linux SDK 5.2] |
6 | =============================== | 6 | =============================== |
7 | **Added** | 7 | **Added** |
8 | 8 | ||
diff --git a/examples/classification/main.cpp b/examples/classification/main.cpp index ead0daf..2231606 100644 --- a/examples/classification/main.cpp +++ b/examples/classification/main.cpp | |||
@@ -194,6 +194,9 @@ bool RunConfiguration(const std::string& config_file, int num_layers_groups, uin | |||
194 | if (verbose) | 194 | if (verbose) |
195 | configuration.enableApiTrace = true; | 195 | configuration.enableApiTrace = true; |
196 | 196 | ||
197 | if (num_layers_groups == 1) | ||
198 | configuration.runFullNet = true; //Force all layers to be in the same group | ||
199 | |||
197 | try | 200 | try |
198 | { | 201 | { |
199 | // Create ExecutionObjectPipelines | 202 | // Create ExecutionObjectPipelines |
@@ -282,8 +285,6 @@ bool CreateExecutionObjectPipelines(uint32_t num_eves, uint32_t num_dsps, | |||
282 | e_dsp = num_dsps == 0 ? nullptr : | 285 | e_dsp = num_dsps == 0 ? nullptr : |
283 | new Executor(DeviceType::DSP, ids_dsp, configuration); | 286 | new Executor(DeviceType::DSP, ids_dsp, configuration); |
284 | 287 | ||
285 | configuration.runFullNet = true; //Force all layers to be in the same group | ||
286 | |||
287 | // Construct ExecutionObjectPipeline with single Execution Object to | 288 | // Construct ExecutionObjectPipeline with single Execution Object to |
288 | // process each frame. This is parallel processing of frames with | 289 | // process each frame. This is parallel processing of frames with |
289 | // as many DSP and EVE cores that we have on hand. | 290 | // as many DSP and EVE cores that we have on hand. |
@@ -503,8 +504,7 @@ bool ReadFrame(ExecutionObjectPipeline* eop, const Configuration& c, | |||
503 | } else { | 504 | } else { |
504 | if(live_input == -1) { | 505 | if(live_input == -1) { |
505 | //Rewind! | 506 | //Rewind! |
506 | cap.release(); | 507 | cap.set(CAP_PROP_POS_FRAMES, 0); |
507 | cap.open(std::string(video_clip)); | ||
508 | } | 508 | } |
509 | } | 509 | } |
510 | 510 | ||
diff --git a/tidl_api/make.buildid b/tidl_api/make.buildid index f753e47..00c5af3 100644 --- a/tidl_api/make.buildid +++ b/tidl_api/make.buildid | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | MAJOR_VER=1 | 27 | MAJOR_VER=1 |
28 | MINOR_VER=2 | 28 | MINOR_VER=2 |
29 | PATCH_VER=1 | 29 | PATCH_VER=2 |
30 | 30 | ||
31 | ifeq ($(shell git rev-parse --short HEAD 2>&1 1>/dev/null; echo $$?),0) | 31 | ifeq ($(shell git rev-parse --short HEAD 2>&1 1>/dev/null; echo $$?),0) |
32 | BUILD_SHA?=$(shell git rev-parse --short HEAD) | 32 | BUILD_SHA?=$(shell git rev-parse --short HEAD) |