From: Hyeongseok Oh <hseok82.oh@samsung.com>
Date: Fri, 8 Sep 2023 13:23:10 +0000 (+0900)
Subject: Fix build fail
X-Git-Tag: accepted/tizen/8.0/unified/20231005.093405
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2F8.0%2Funified%2F20231005.093405;p=platform%2Fcore%2Fml%2Fnnfw.git

Fix build fail

This commit fixes build fail on x86_64, ix86, armv7hl tizen.

ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
---

diff --git a/compiler/luci-compute/CMakeLists.txt b/compiler/luci-compute/CMakeLists.txt
index b7ddb44..33a8573 100644
--- a/compiler/luci-compute/CMakeLists.txt
+++ b/compiler/luci-compute/CMakeLists.txt
@@ -1,6 +1,7 @@
 nnas_find_package(TensorFlowSource EXACT 2.8.0 QUIET)
 nnas_find_package(TensorFlowGEMMLowpSource EXACT 2.8.0 QUIET)
 nnas_find_package(TensorFlowRuySource EXACT 2.8.0 QUIET)
+nnas_find_package(NEON2SSESource QUIET)
 
 if(NOT TensorFlowSource_FOUND)
   message(STATUS "Build luci-compute: FAILED (missing TensorFlowSource 2.8.0)")
@@ -17,7 +18,13 @@ if(NOT TensorFlowRuySource_FOUND)
   return()
 endif(NOT TensorFlowRuySource_FOUND)
 
+if(NOT NEON2SSESource_FOUND)
+  message(STATUS "Build luci-compute: FAILED (missing NEON2SSESource)")
+  return()
+endif(NOT NEON2SSESource_FOUND)
+
 add_library(luci_compute INTERFACE)
 target_include_directories(luci_compute SYSTEM INTERFACE "${TensorFlowSource_DIR}")
 target_include_directories(luci_compute SYSTEM INTERFACE "${TensorFlowGEMMLowpSource_DIR}")
 target_include_directories(luci_compute SYSTEM INTERFACE "${TensorFlowRuySource_DIR}")
+target_include_directories(luci_compute SYSTEM INTERFACE "${NEON2SSESource_DIR}")
diff --git a/infra/nnfw/cmake/options/options_i686-tizen.cmake b/infra/nnfw/cmake/options/options_i686-tizen.cmake
index e51f5ed..bdeb2d9 100644
--- a/infra/nnfw/cmake/options/options_i686-tizen.cmake
+++ b/infra/nnfw/cmake/options/options_i686-tizen.cmake
@@ -11,6 +11,11 @@ option(GENERATE_RUNTIME_NNAPI_TESTS "Generate NNAPI operation gtest" OFF)
 option(ENVVAR_ONERT_CONFIG "Use environment variable for onert configuration" OFF)
 
 option(BUILD_XNNPACK "Build XNNPACK" OFF)
+option(DOWNLOAD_OPENCL_HEADERS "Download opencl headers" OFF)
+
+option(BUILD_NPUD "Build NPU daemon" ON)
+# Do not allow to use CONFIG option on Tizen
+option(ENVVAR_NPUD_CONFIG "Use environment variable for npud configuration" OFF)
 
 option(BUILD_MINMAX_H5DUMPER "Build minmax h5dumper" OFF)
 option(ENABLE_ONERT_TRAIN "Enable onert training feature" OFF)
diff --git a/packaging/NEON2SSE.tar.gz b/packaging/NEON2SSE.tar.gz
new file mode 100644
index 0000000..86410f8
Binary files /dev/null and b/packaging/NEON2SSE.tar.gz differ
diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec
index a972af3..2a4eb42 100644
--- a/packaging/nnfw.spec
+++ b/packaging/nnfw.spec
@@ -29,6 +29,7 @@ Source3016: TENSORFLOW-2.8.0.tar.gz
 Source3017: VULKAN.tar.gz
 Source3018: XNNPACK.tar.gz
 Source3019: FLATBUFFERS-2.0.tar.gz
+Source3020: NEON2SSE.tar.gz
 
 %{!?build_type:     %define build_type      Release}
 %{!?npud_build:     %define npud_build      1}
@@ -202,12 +203,13 @@ tar -xf %{SOURCE3016} -C ./externals
 tar -xf %{SOURCE3017} -C ./externals
 tar -xf %{SOURCE3018} -C ./externals
 tar -xf %{SOURCE3019} -C ./externals
+tar -xf %{SOURCE3020} -C ./externals
 
 %build
 %ifarch arm armv7l armv7hl aarch64 x86_64 %ix86
 # nncc build
 %if %{odc_build} == 1
-%{nncc_env} ./nncc configure -DBUILD_GTEST=OFF -DENABLE_TEST=OFF -DEXTERNALS_BUILD_THREADS=%{nproc} -DCMAKE_BUILD_TYPE=%{build_type} -DTARGET_OS=tizen \
+%{nncc_env} ./nncc configure -DBUILD_GTEST=OFF -DENABLE_TEST=OFF -DEXTERNALS_BUILD_THREADS=%{nproc} -DCMAKE_BUILD_TYPE=%{build_type} -DTARGET_ARCH=%{target_arch} -DTARGET_OS=tizen \
         -DCMAKE_INSTALL_PREFIX=$(pwd)/%{overlay_path} \
 	-DBUILD_WHITELIST="luci;foder;pepper-csv2vec;loco;locop;logo;logo-core;mio-circle06;luci-compute;oops;hermes;hermes-std;angkor;pp;pepper-strcast;pepper-str"
 %{nncc_env} ./nncc build %{build_jobs}