aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristofer Jonsson <kristofer.jonsson@arm.com>2021-02-10 11:29:52 +0100
committerJens Elofsson <jens.elofsson@arm.com>2021-02-24 09:13:53 +0100
commit91f600c9b55c0476cc64c7252638c83b47ea4654 (patch)
tree2d1df2f1d34e1f55e3aa5cf30d8a6bd5ab8d6f60
parent1efcc3f957e7f64dc8b2b9d7061c0ef7050466cd (diff)
downloadethos-u-core-software-91f600c9b55c0476cc64c7252638c83b47ea4654.tar.gz
Tensorflow rebase
The interface to the MicroProfiler has changed in the latest revision of TFLu. Updating core software to fix the compilation errors. Change-Id: Ief8cc17859c9abcb9455110c660c0de56d938fe5
-rw-r--r--applications/inference_process/src/inference_process.cpp6
-rw-r--r--tensorflow.cmake4
2 files changed, 7 insertions, 3 deletions
diff --git a/applications/inference_process/src/inference_process.cpp b/applications/inference_process/src/inference_process.cpp
index cc2b378..3b26469 100644
--- a/applications/inference_process/src/inference_process.cpp
+++ b/applications/inference_process/src/inference_process.cpp
@@ -200,7 +200,7 @@ bool InferenceProcess::runJob(InferenceJob &job) {
// Create the TFL micro interpreter
tflite::AllOpsResolver resolver;
- tflite::MicroProfiler profiler(reporter);
+ tflite::MicroProfiler profiler;
#if defined(INFERENCE_PROC_TFLU_PROFILER) && defined(ETHOSU)
profiler.MonitorEthosuPMUEvents(ethosu_pmu_event_type(job.pmuEventConfig[0]),
@@ -260,10 +260,10 @@ bool InferenceProcess::runJob(InferenceJob &job) {
printf("%s : %zu\r\n", "arena_used_bytes", interpreter.arena_used_bytes());
#ifdef INFERENCE_PROC_TFLU_PROFILER
- printf("Inference runtime: %u cycles\r\n", (unsigned int)profiler.TotalInferenceTime());
+ printf("Inference runtime: %u cycles\r\n", (unsigned int)profiler.GetTotalTicks());
if (job.pmuCycleCounterEnable != 0) {
- job.pmuCycleCounterCount = profiler.TotalInferenceTime();
+ job.pmuCycleCounterCount = profiler.GetTotalTicks();
}
#ifdef ETHOSU
diff --git a/tensorflow.cmake b/tensorflow.cmake
index 10523e9..ac53bb6 100644
--- a/tensorflow.cmake
+++ b/tensorflow.cmake
@@ -73,6 +73,10 @@ add_dependencies(tflu tflu_gen)
target_include_directories(tflu INTERFACE ${TENSORFLOW_PATH})
target_compile_definitions(tflu INTERFACE TF_LITE_MICRO TF_LITE_STATIC_MEMORY)
+if(${TFLU_BUILD_TYPE} STREQUAL "release")
+ target_compile_definitions(tflu INTERFACE TF_LITE_STRIP_ERROR_STRINGS)
+endif()
+
if(CORE_SOFTWARE_ACCELERATOR STREQUAL NPU)
target_link_libraries(tflu INTERFACE ethosu_core_driver)
endif()