[onert/test] Strict test tool build (#16081)

This commit adds nnfw_common library to target_link_libraries for tflite, onert_train, and tflite_run test executables for strict build.

ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <[email protected]>

Author: hseok-oh

runtime/tests/tools/libs/tflite/CMakeLists.txt

@@ -22,3 +22,4 @@ endif(NOT ENABLE_TEST)
 
 add_executable(nnfw_lib_tflite_test_TensorView src/TensorView.test.cpp)
 target_link_libraries(nnfw_lib_tflite_test_TensorView nnfw_lib_tflite)
+target_link_libraries(nnfw_lib_tflite_test_TensorView nnfw_common)

runtime/tests/tools/libs/tflite/src/TensorView.test.cpp

@@ -33,7 +33,7 @@ void int_test(void)
   assert(view.at(nnfw::misc::tensor::Index{1, 2}) == 6);
 }
 
-int main(int argc, char **argv)
+int main()
 {
   float value[6] = {1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f};
 

runtime/tests/tools/onert_train/CMakeLists.txt

@@ -50,6 +50,7 @@ list(APPEND ONERT_TRAIN_TEST_SRCS "src/nnfw_util.cc")
 add_executable(${TEST_ONERT_TRAIN} ${ONERT_TRAIN_TEST_SRCS})
 
 target_link_libraries(${TEST_ONERT_TRAIN} nnfw-dev)
+target_link_libraries(${TEST_ONERT_TRAIN} nnfw_common)
 target_link_libraries(${TEST_ONERT_TRAIN} gtest gtest_main dl ${LIB_PTHREAD})
 
 add_test(${TEST_ONERT_TRAIN} ${TEST_ONERT_TRAIN})

runtime/tests/tools/onert_train/test/rawdataloader.test.cc

@@ -134,7 +134,7 @@ TEST_F(RawDataLoaderTest, loadDatas_1)
   for (uint32_t i = 0; i < num_input; ++i)
   {
     in[i].resize(num_elems(&in_infos[i]) / batch_size);
-    std::generate(in[i].begin(), in[i].end(), [this] {
+    std::generate(in[i].begin(), in[i].end(), [] {
       static uint32_t i = 0;
       return i++;
     });
@@ -196,7 +196,7 @@ TEST_F(RawDataLoaderTest, loadDatas_1)
   uint32_t num_sample = data_length / batch_size;
   for (uint32_t i = 0; i < num_sample; ++i)
   {
-    auto data = generator(i, inputs, expecteds);
+    ASSERT_TRUE(generator(i, inputs, expecteds));
 
     std::vector<std::vector<uint32_t>> gen_in(num_input);
     for (uint32_t h = 0; h < num_input; ++h)

runtime/tests/tools/tflite_run/CMakeLists.txt

@@ -9,13 +9,15 @@ list(APPEND TFLITE_RUN_SRCS "src/tensor_loader.cc")
 
 add_executable(tflite_run ${TFLITE_RUN_SRCS})
 
+target_link_libraries(tflite_run nnfw_common)
 target_link_libraries(tflite_run nnfw_lib_tflite nnfw_lib_benchmark)
 target_link_libraries(tflite_run arser)
 
 install(TARGETS tflite_run DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 ## Add test cpp file
 add_executable(tflite_test src/tflite_test.cc)
+target_link_libraries(tflite_test nnfw_common)
 ## Link test executable against gtest & gtest_main
 target_link_libraries(tflite_test gtest gtest_main ${LIB_PTHREAD})
 ## install test binary for packaging

runtime/tests/tools/tflite_run/src/args.h

@@ -34,13 +34,13 @@ class Args
   const std::string &getCompareFilename(void) const { return _compare_filename; }
   const std::string &getInputFilename(void) const { return _input_filename; }
   const std::vector<int> &getInputShapes(void) const { return _input_shapes; }
-  const int getNumRuns(void) const { return _num_runs; }
-  const int getWarmupRuns(void) const { return _warmup_runs; }
-  const int getRunDelay(void) const { return _run_delay; }
-  const bool getGpuMemoryPoll(void) const { return _gpumem_poll; }
-  const bool getMemoryPoll(void) const { return _mem_poll; }
-  const bool getWriteReport(void) const { return _write_report; }
-  const int getVerboseLevel(void) const { return _verbose_level; }
+  int getNumRuns(void) const { return _num_runs; }
+  int getWarmupRuns(void) const { return _warmup_runs; }
+  int getRunDelay(void) const { return _run_delay; }
+  bool getGpuMemoryPoll(void) const { return _gpumem_poll; }
+  bool getMemoryPoll(void) const { return _mem_poll; }
+  bool getWriteReport(void) const { return _write_report; }
+  int getVerboseLevel(void) const { return _verbose_level; }
 
 private:
   void Initialize();

runtime/tests/tools/tflite_run/src/tensor_loader.cc

@@ -48,8 +48,8 @@ void TensorLoader::loadDumpedTensors(const std::string &filename)
   file.read(reinterpret_cast<char *>(_raw_data.get()), file_size);
   file.close();
 
-  size_t read_bytes = loadInputTensorsFromRawData();
-  read_bytes += loadOutputTensorsFromRawData();
+  [[maybe_unused]] size_t read_bytes =
+    loadInputTensorsFromRawData() + loadOutputTensorsFromRawData();
 
   // The file size and total output tensor size must match
   assert(file_size ==
@@ -67,7 +67,7 @@ void TensorLoader::loadRawInputTensors(const std::string &filename)
   file.read(reinterpret_cast<char *>(_raw_data.get()), file_size);
   file.close();
 
-  size_t read_bytes = loadInputTensorsFromRawData();
+  [[maybe_unused]] size_t read_bytes = loadInputTensorsFromRawData();
 
   // The file size and total output tensor size must match
   assert(file_size == read_bytes * sizeof(float));

runtime/tests/tools/tflite_run/src/tflite_run.cc

@@ -56,8 +56,6 @@ int main(const int argc, char **argv)
 {
   TFLiteRun::Args args(argc, argv);
 
-  std::chrono::milliseconds t_model_load(0), t_prepare(0);
-
   // TODO Apply verbose level to phases
   const int verbose = args.getVerboseLevel();
   benchmark::Phases phases(
@@ -100,7 +98,7 @@ int main(const int argc, char **argv)
   if (args.getInputShapes().size() != 0)
   {
     const auto dim_values = args.getInputShapes().size();
-    int32_t offset = 0;
+    uint32_t offset = 0;
 
     auto const input_count = TfLiteInterpreterGetInputTensorCount(interpreter);
     for (int32_t id = 0; id < input_count; id++)