[fix] Clean cmake script and spec file

Signed-off-by: Yongjoo Ahn <yongjoo1.ahn@samsung.com>

Author: anyj0527

README.md

@@ -235,9 +235,9 @@ To build with GTest support, ensure the following dependencies are installed:
 
 **On Tizen systems:**
 
-You should set `build_test` as `1` in gbs to enable test:
+You should set `build_tests` as `1` in gbs to enable test:
 ```bash
-gbs build {your_gbs_options} --define "build_test 1"
+gbs build {your_gbs_options} --define "build_tests 1"
 ```
 
 The build system automatically includes GTest support when building test executables via the CMake configuration in [`test/CMakeLists.txt`](./test/CMakeLists.txt).

packaging/hal-backend-ml-accelerator.spec

@@ -31,9 +31,7 @@ BuildRequires:  pkgconfig(hal-rootstrap)
 
 %endif # For DA
 
-%if 0%{?build_test}
-%define build_tests 1
-%define _testdir %{_hal_bindir}/ml-accelerator/
+%if 0%{?build_tests}
 BuildRequires: gtest-devel
 %endif
 
@@ -67,13 +65,14 @@ Summary:  hal-backend-ml-accelerator for snpe
 %endif
 
 %if 0%{?build_tests}
+%define _testdir %{_hal_bindir}/ml-accelerator/
+%define enable_tests -DBUILD_TESTS=ON -DTEST_DIR=%{_testdir}
 
 %package halbackendtest
 Summary:    Test Binary for Hal backend
 Requires: %{name} = %{version}-%{release}
 %description halbackendtest
 Test Binary for hal-backend
-%define enable_tests -DBUILD_TESTS=ON
 
 %files halbackendtest
 %manifest packaging/hal-backend-ml-accelerator.manifest
@@ -86,7 +85,8 @@ Test Binary for hal-backend
 %if 0%{?snpe_support}
 %{_testdir}%{_module_name_snpe}-test
 %endif
-
+%else
+%define enable_tests -DBUILD_TESTS=OFF
 %endif
 
 %prep
@@ -96,9 +96,6 @@ Test Binary for hal-backend
 %cmake \
   -DCMAKE_HAL_LIBDIR_PREFIX=%{_hal_libdir} \
   -DCMAKE_HAL_LICENSEDIR_PREFIX=%{_hal_licensedir} \
-  %if 0%{?build_tests}
-    -DTEST_DIR=%{_testdir} \
-  %endif
   %{?enable_dummy} \
   %{?enable_vivante} \
   %{?enable_snpe} \
@@ -109,7 +106,6 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-
 %post
 /sbin/ldconfig
 
@@ -131,7 +127,6 @@ make %{?_smp_mflags}
 %endif
 
 %if 0%{?snpe_support}
-
 %files snpe
 %manifest packaging/hal-backend-ml-accelerator.manifest
 %license LICENSE

test/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Check if we're in TEST mode
 IF(NOT DEFINED TEST_DIR)
-    SET(TEST_DIR "/hal/bin/ml-accelerator/")
+  SET(TEST_DIR "/hal/bin/ml-accelerator/")
 ENDIF()
 
 # Test installation directory
@@ -13,56 +13,42 @@ SET(PROJECT_NAME_FULL "hal-backend-ml-accelerator")
 SET(PROJECT_NAME_SNPE "hal-backend-ml-snpe")
 SET(PROJECT_NAME_VIVANTE "hal-backend-ml-vivante")
 SET(PROJECT_NAME_DUMMY "hal-backend-ml-dummy-passthrough")
-SET(UTIL_SRCS
-  ${PROJECT_SOURCE_DIR}/src/hal-backend-ml-util.cc
-)
+
 # Common test sources
 SET(COMMON_TEST_SRCS
-    main.cpp
-    hal_backend_ml_test_util.cc
+  main.cpp
+  hal_backend_ml_test_util.cc
 )
 
-IF(BUILD_TESTS)
 # Vivante tests
 IF(ENABLE_VIVANTE)
-
-ADD_EXECUTABLE(${VIVANTE_LIBRARY_NAME}-test 
-    ${COMMON_TEST_SRCS}
-    hal_backend_ml_vivante_test.cc
+ADD_EXECUTABLE(${VIVANTE_LIBRARY_NAME}-test
+  ${COMMON_TEST_SRCS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/hal_backend_ml_vivante_test.cc
 )
 TARGET_LINK_LIBRARIES(${PROJECT_NAME_VIVANTE}-test libgtest.so libgtest_main.so -pthread)
-TARGET_LINK_LIBRARIES(${VIVANTE_LIBRARY_NAME}-test 
-    ${VIVANTE_LIBRARY_NAME}
-    ${TEST_PKGS_LDFLAGS} 
-    -lpthread
-)
+TARGET_LINK_LIBRARIES(${VIVANTE_LIBRARY_NAME}-test ${VIVANTE_LIBRARY_NAME} ${TEST_PKGS_LDFLAGS} -lpthread)
 INSTALL(TARGETS ${PROJECT_NAME_VIVANTE}-test RUNTIME DESTINATION ${TEST_INSTALL_DIR})
-
 ENDIF()
 
-
 # SNPE tests
 IF(ENABLE_SNPE)
-
-ADD_EXECUTABLE(${SNPE_LIBRARY_NAME}-test 
-    ${COMMON_TEST_SRCS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/hal_backend_ml_snpe_test.cc
+ADD_EXECUTABLE(${SNPE_LIBRARY_NAME}-test
+  ${COMMON_TEST_SRCS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/hal_backend_ml_snpe_test.cc
 )
 TARGET_LINK_LIBRARIES(${PROJECT_NAME_SNPE}-test libgtest.so libgtest_main.so -pthread)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME_SNPE}-test ${SNPE_LIBRARY_NAME} ${TEST_PKGS_LDFLAGS} -lpthread)
 INSTALL(TARGETS ${PROJECT_NAME_SNPE}-test RUNTIME DESTINATION ${TEST_INSTALL_DIR})
-
 ENDIF()
 
 # Dummy Passthrough tests
 IF(ENABLE_DUMMY)
-ADD_EXECUTABLE(${PROJECT_NAME_DUMMY}-test 
-    ${COMMON_TEST_SRCS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/hal_backend_ml_dummy_passthrough_test.cc
+ADD_EXECUTABLE(${PROJECT_NAME_DUMMY}-test
+  ${COMMON_TEST_SRCS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/hal_backend_ml_dummy_passthrough_test.cc
 )
 TARGET_LINK_LIBRARIES(${PROJECT_NAME_DUMMY}-test libgtest.so libgtest_main.so -pthread)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME_DUMMY}-test ${DUMMY_PASSTHROUGH_LIBRARY_NAME} ${TEST_PKGS_LDFLAGS} -lpthread)
 INSTALL(TARGETS ${PROJECT_NAME_DUMMY}-test RUNTIME DESTINATION ${TEST_INSTALL_DIR})
 ENDIF()
-
-ENDIF()

test/res/sample_snpe_test_config.json

@@ -1,18 +1,16 @@
 {
-
-    "metadata": {
-      "configParameters": [
-        {
-	  "fwname": "tizen-hal",
-	  "fw_opened": 0,
-	  "num_models": 1,
-	  "model_files": ["yolov8m_416_quantized.dlc"],
-	  "input_file": ["bus_416x416_float.raw"],
-	  "input_configured": 0,
-	  "output_configured": 0,
-	  "custom_properties": "backend:snpe,Runtime:DSP,InputType:TF8,OutputType:FLOAT32;FLOAT32,OutputTensor:/model.22/Sigmoid_output_0;/model.22/Mul_output_0"
-        }
-    
-      ]
-    }
-    }
+  "metadata": {
+    "configParameters": [
+      {
+        "fwname": "tizen-hal",
+        "fw_opened": 0,
+        "num_models": 1,
+        "model_files": ["yolov8m_416_quantized.dlc"],
+        "input_file": ["bus_416x416_float.raw"],
+        "input_configured": 0,
+        "output_configured": 0,
+        "custom_properties": "backend:snpe,Runtime:DSP,InputType:TF8,OutputType:FLOAT32;FLOAT32,OutputTensor:/model.22/Sigmoid_output_0;/model.22/Mul_output_0"
+      }
+    ]
+  }
+}

test/res/sample_vivante_test_config.json

@@ -1,17 +1,16 @@
 {
-    "metadata": {
-      "configParameters": [
-        {
-	  "fwname": "tizen-hal",
-	  "fw_opened": 0,
-	  "num_models": 1,
-	  "model_files": ["inception-v3.nb"],
-	  "input_file": ["pizza_3x299x299_uint8.raw"],
-	  "input_configured": 0,
-	  "output_configured": 0,
-	  "custom_properties": "backend:vivante,json:inception-v3.json"
-        }
-      ]
-    }
-    
-    }
+  "metadata": {
+    "configParameters": [
+      {
+        "fwname": "tizen-hal",
+        "fw_opened": 0,
+        "num_models": 1,
+        "model_files": ["inception-v3.nb"],
+        "input_file": ["pizza_3x299x299_uint8.raw"],
+        "input_configured": 0,
+        "output_configured": 0,
+        "custom_properties": "backend:vivante,json:inception-v3.json"
+      }
+    ]
+  }
+}