few typo changes

rudi-helm · Mar 2, 2023 · 61e8f52 · 61e8f52
1 parent 2e23371
commit 61e8f52
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -12,9 +12,9 @@ endif()
 message(STATUS "Detected processor: ${CMAKE_SYSTEM_PROCESSOR}")
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
   set(HOST_CPU x86)
-  #defualt consider J7 config  on x86 
+  #defualt consider am68pa config  on x86 
   if(NOT DEFINED TARGET_DEVICE)
-    set(TARGET_DEVICE j7)
+    set(TARGET_DEVICE am68pa)
     message(STATUS "TARGET_DEVICE not specicfied using default: ${TARGET_DEVICE}")
   endif()
   if(NOT DEFINED TARGET_CPU)
@@ -24,7 +24,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
   set(HOST_CPU arm)
   if(NOT DEFINED TARGET_DEVICE)
-      set(TARGET_DEVICE j7)
+      set(TARGET_DEVICE am68pa)
       message(STATUS "TARGET_DEVICE not specicfied using default: ${TARGET_DEVICE}")
     endif()
     if(NOT DEFINED TARGET_CPU)

diff --git a/examples/cmake/common.cmake b/examples/cmake/common.cmake
@@ -30,7 +30,7 @@ elseif (EXISTS $ENV{TIDL_TOOLS_PATH}/osrt_deps/tflite_2.8_x86_u18/)
   message (STATUS  "setting TENSORFLOW_INSTALL_DIR path:${TENSORFLOW_INSTALL_DIR}")
 else()
   # avoid warning in case of hw accelerated device which have this in filesystem
-  if( NOT ((${TARGET_DEVICE} STREQUAL  "j7") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
+  if( NOT ( (NOT ${TARGET_DEVICE} STREQUAL  "am62") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
     message (WARNING  "TENSORFLOW_INSTALL_DIR is not set")
   endif()
 endif()
@@ -39,8 +39,8 @@ endif()
 if (EXISTS $ENV{TIDL_TOOLS_PATH}/osrt_deps/onnx_1.7.0_x86_u18/)
   set(ONNXRT_INSTALL_DIR $ENV{TIDL_TOOLS_PATH}/osrt_deps/onnx_1.7.0_x86_u18/)# check for PC
 else()
-  # avoid warning in case of j7 device which have this in filesystem
-  if( NOT ((${TARGET_DEVICE} STREQUAL  "j7") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
+  # avoid warning in case of  hw accelerated device which have this in filesystem
+  if( NOT ((NOT ${TARGET_DEVICE} STREQUAL  "am62") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
     message (WARNING  "ONNXRT_INSTALL_DIR is not set")
   endif()
 endif()
@@ -49,8 +49,8 @@ if (EXISTS $ENV{TIDL_TOOLS_PATH}/osrt_deps/dlr_1.10.0_x86_u18/)
   set(DLR_INSTALL_DIR $ENV{TIDL_TOOLS_PATH}/osrt_deps/dlr_1.10.0_x86_u18/)
   message (STATUS  "setting DLR_INSTALL_DIR path:${DLR_INSTALL_DIR}")
 else()
-  # avoid warning in case of j7 device which have this in filesystem
-  if( NOT ((${TARGET_DEVICE} STREQUAL  "j7") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
+  # avoid warning in case of hw accelerated device which have this in filesystem
+  if( NOT ((NOT ${TARGET_DEVICE} STREQUAL  "am62") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
     message (WARNING  "DLR_INSTALL_DIR is not set")
   endif()
 endif()
@@ -63,16 +63,16 @@ elseif (EXISTS $ENV{TIDL_TOOLS_PATH}/osrt_deps/opencv-4.1.0/)
   set(OPENCV_INSTALL_DIR $ENV{TIDL_TOOLS_PATH}/osrt_deps/opencv-4.1.0/)
   message (STATUS  "setting opencv path:${OPENCV_INSTALL_DIR}")
 else ()
-  # avoid warning in case of j7 device which have this in filesystem
-  if( NOT ((${TARGET_DEVICE} STREQUAL  "j7") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
+  # avoid warning in case of hw accelerated device which have this in filesystem
+  if( NOT ((NOT ${TARGET_DEVICE} STREQUAL  "am62") AND (${TARGET_CPU} STREQUAL  "arm" AND ${HOST_CPU} STREQUAL  "arm"))  )
     message (WARNING  "OPENCV_INSTALL_DIR is not set")
   endif()
 endif()
 
 
 if(ARMNN_ENABLE)
-  if( ${TARGET_CPU} STREQUAL  "x86" OR ${TARGET_DEVICE} STREQUAL "j7" )
-    message(WARNING "ARMNN NOT supported on X86 and j7")
+  if( ${TARGET_CPU} STREQUAL  "x86" OR (NOT ${TARGET_DEVICE} STREQUAL "am62") )
+    message(WARNING "ARMNN NOT supported on X86 and hw accelerated device")
     set(ARMNN_ENABLE 0)
     add_compile_options(-DARMNN_ENABLE=0)    
   else()
@@ -495,7 +495,7 @@ if((NOT ${TARGET_DEVICE} STREQUAL  "am62") AND (${TARGET_CPU} STREQUAL  "arm" AN
   set(CMAKE_CXX_COMPILER ${ARMCC_PREFIX}g++)
 
   link_directories(                
-    #J7 targetfs
+    #Device targetfs
     ${TARGET_FS_PATH}/usr/lib
     ${TARGET_FS_PATH}/usr/lib/glib-2.0
     ${TARGET_FS_PATH}/usr/lib/python3.8/site-packages  

diff --git a/setup.sh b/setup.sh
@@ -279,6 +279,7 @@ if [[ $arch == x86_64 && $skip_x86_python_install -eq 0 ]]; then
     echo 'Installing python packages...'
     pip3 install -r ./requirements_pc.txt
 fi
+sudo apt-get install libyaml-cpp-dev
 if [[ $arch == x86_64  ]]; then
     if [[ $use_local == 1 ]];then
         echo 'Installing python osrt packages from local...'