Skip to content

Commit

Permalink
[onert] Move gpu-cl backend into contrib (#13040)
Browse files Browse the repository at this point in the history
This commit moves gpu-cl backend into contrib and disable build as default.

ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
  • Loading branch information
hseok-oh committed May 23, 2024
1 parent e779dc4 commit b4b9349
Show file tree
Hide file tree
Showing 40 changed files with 16 additions and 61 deletions.
5 changes: 2 additions & 3 deletions infra/nnfw/cmake/CfgOptionFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ option(BUILD_WITH_HDF5 "Build test tool with HDF5 library" ON)
option(GENERATE_RUNTIME_NNAPI_TESTS "Generate NNAPI operation gtest" ON)
option(ENVVAR_ONERT_CONFIG "Use environment variable for onert configuration" ON)
option(INSTALL_TEST_SCRIPTS "Install test scripts" ON)
option(BUILD_GPU_CL "Build gpu_cl backend" OFF)
option(BUILD_NPUD "Build NPU daemon" OFF)
option(ENVVAR_NPUD_CONFIG "Use environment variable for npud configuration" OFF)
option(BUILD_MINMAX_H5DUMPER "Build minmax h5dumper" ON)
Expand All @@ -46,6 +45,8 @@ option(BUILD_TFLITE_TEST "Build tensorflow lite test" OFF)
option(BUILD_TFLITE_CLASSIFY_APP "Build tflite_classify app" OFF)
option(BUILD_UBEN "Build micro-benchmark (uben) suite" OFF)
option(BUILD_MLAPSE "Build mlapse benchmark toolkit" OFF)
option(BUILD_GPU_CL "Build gpu_cl backend" OFF)
option(BUILD_TENSORFLOW_LITE_GPU "Build TensorFlow Lite GPU delegate from the downloaded source" OFF)
#
# Default build configuration for tools
#
Expand All @@ -57,7 +58,6 @@ option(BUILD_TFLITE_ACCURACY "Build tflite accuracy tool" OFF)
#
option(DOWNLOAD_TENSORFLOW "Download Tensorflow source" ON)
option(DOWNLOAD_ABSEIL "Download Abseil source" ON)
option(DOWNLOAD_OPENCL_HEADERS "Download Opencl_headers source" OFF)
option(DOWNLOAD_EIGEN "Download Eigen source" ON)
option(DOWNLOAD_FARMHASH "Download farmhash source" ON)
option(DOWNLOAD_GEMMLOWP "Download GEMM low precesion library source" ON)
Expand All @@ -72,7 +72,6 @@ option(DOWNLOAD_OOURAFFT "Download Ooura FFT source" ON)
option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" ON)
option(BUILD_BOOST "Build boost source" OFF)
option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" ON)
option(BUILD_TENSORFLOW_LITE_GPU "Build TensorFlow Lite GPU delegate from the downloaded source" OFF)
option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON)
option(DEBUG_ARMCOMPUTE "Build ARM Compute as debug type" OFF)
option(BUILD_RUY "Build ruy library from the downloaded source" ON)
Expand Down
7 changes: 0 additions & 7 deletions infra/nnfw/cmake/options/options_aarch64-android.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,4 @@ option(DOWNLOAD_BOOST "Download boost source" ON)
option(BUILD_BOOST "Build boost source" ON)
option(BUILD_LOGGING "Build logging runtime" OFF)

option(DOWNLOAD_OPENGL_HEADERS "Download Opengl_headers source" ON)
option(DOWNLOAD_EGL_HEADERS "Download Egl_headers source" ON)
option(DOWNLOAD_VULKAN "Download vulkan source" ON)
option(DOWNLOAD_OPENCL_HEADERS "Download Opencl_headers source" ON)
option(BUILD_GPU_CL "Build gpu_cl backend" ON)
option(BUILD_TENSORFLOW_LITE_GPU "Build TensorFlow Lite GPU delegate from the downloaded source" ON)

option(BUILD_MINMAX_H5DUMPER "Build minmax h5dumper" OFF)
8 changes: 0 additions & 8 deletions infra/nnfw/cmake/options/options_armv7hl-tizen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ option(BUILD_LOGGING "Build logging runtime" OFF)
option(GENERATE_RUNTIME_NNAPI_TESTS "Generate NNAPI operation gtest" OFF)
option(ENVVAR_ONERT_CONFIG "Use environment variable for onert configuration" OFF)

option(DOWNLOAD_OPENCL_HEADERS "Download Opencl_headers source" ON)
option(DOWNLOAD_OPENGL_HEADERS "Download Opengl_headers source" ON)
option(DOWNLOAD_EGL_HEADERS "Download Egl_headers source" ON)
option(DOWNLOAD_VULKAN "Download vulkan source" ON)

option(BUILD_GPU_CL "Build gpu_cl backend" ON)
option(BUILD_TENSORFLOW_LITE_GPU "Build TensorFlow Lite GPU delegate from the downloaded source" ON)

option(BUILD_NPUD "Build NPU daemon" OFF)
# Do not allow to use CONFIG option on Tizen
option(ENVVAR_NPUD_CONFIG "Use environment variable for npud configuration" OFF)
Expand Down
6 changes: 0 additions & 6 deletions infra/nnfw/cmake/options/options_armv7l-linux.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF)
option(BUILD_OPENCL_TOOL "Build OpenCL tool" ON)

option(DOWNLOAD_OPENGL_HEADERS "Download Opengl_headers source" ON)
option(DOWNLOAD_EGL_HEADERS "Download Egl_headers source" ON)
option(DOWNLOAD_VULKAN "Download vulkan source" ON)
option(DOWNLOAD_OPENCL_HEADERS "Download Opencl_headers source" ON)
option(BUILD_GPU_CL "Build gpu_cl backend" ON)
option(BUILD_TENSORFLOW_LITE_GPU "Build TensorFlow Lite GPU delegate from the downloaded source" ON)
option(DOWNLOAD_PYBIND11 "Download Pybind11 source" ON)
option(BUILD_PYTHON_BINDING "Build python binding" ON)

Expand Down
8 changes: 0 additions & 8 deletions infra/nnfw/cmake/options/options_armv7l-tizen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ option(BUILD_LOGGING "Build logging runtime" OFF)
option(GENERATE_RUNTIME_NNAPI_TESTS "Generate NNAPI operation gtest" OFF)
option(ENVVAR_ONERT_CONFIG "Use environment variable for onert configuration" OFF)

option(DOWNLOAD_OPENCL_HEADERS "Download Opencl_headers source" ON)
option(DOWNLOAD_OPENGL_HEADERS "Download Opengl_headers source" ON)
option(DOWNLOAD_EGL_HEADERS "Download Egl_headers source" ON)
option(DOWNLOAD_VULKAN "Download vulkan source" ON)

option(BUILD_GPU_CL "Build gpu_cl backend" ON)
option(BUILD_TENSORFLOW_LITE_GPU "Build TensorFlow Lite GPU delegate from the downloaded source" ON)

option(BUILD_NPUD "Build NPU daemon" OFF)
# Do not allow to use CONFIG option on Tizen
option(ENVVAR_NPUD_CONFIG "Use environment variable for npud configuration" OFF)
Expand Down
1 change: 0 additions & 1 deletion infra/nnfw/cmake/options/options_i686-tizen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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" OFF)
# Do not allow to use CONFIG option on Tizen
Expand Down
1 change: 0 additions & 1 deletion infra/nnfw/cmake/options/options_riscv64-tizen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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" OFF)
# Do not allow to use CONFIG option on Tizen
Expand Down
1 change: 0 additions & 1 deletion infra/nnfw/cmake/options/options_x86_64-tizen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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" OFF)
# Do not allow to use CONFIG option on Tizen
Expand Down
Binary file removed packaging/EGL_HEADERS.tar.gz
Binary file not shown.
Binary file removed packaging/FLATBUFFERS-2.0.tar.gz
Binary file not shown.
Binary file removed packaging/OPENCL_HEADERS.tar.gz
Binary file not shown.
Binary file removed packaging/OPENGL_HEADERS.tar.gz
Binary file not shown.
Binary file removed packaging/VULKAN.tar.gz
Binary file not shown.
38 changes: 14 additions & 24 deletions packaging/nnfw.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,20 @@ Source2001: nnfw.pc.in
Source2002: nnfw-plugin.pc.in
Source3001: ABSEIL.tar.gz
Source3002: CPUINFO.tar.gz
Source3003: EGL_HEADERS.tar.gz
Source3004: FARMHASH.tar.gz
Source3005: FP16.tar.gz
Source3006: FXDIV.tar.gz
Source3007: GEMMLOWP.tar.gz
Source3008: OOURAFFT.tar.gz
Source3009: OPENCL_HEADERS.tar.gz
Source3010: OPENGL_HEADERS.tar.gz
Source3011: PSIMD.tar.gz
Source3012: PTHREADPOOL.tar.gz
Source3013: TENSORFLOW-2.8.0-EIGEN.tar.gz
Source3014: TENSORFLOW-2.8.0-GEMMLOWP.tar.gz
Source3015: TENSORFLOW-2.8.0-RUY.tar.gz
Source3016: TENSORFLOW-2.8.0.tar.gz
Source3017: VULKAN.tar.gz
Source3018: XNNPACK.tar.gz
Source3019: FLATBUFFERS-23.5.26.tar.gz
Source3020: NEON2SSE.tar.gz
Source3021: FLATBUFFERS-2.0.tar.gz
Source3003: FARMHASH.tar.gz
Source3004: FP16.tar.gz
Source3005: FXDIV.tar.gz
Source3006: GEMMLOWP.tar.gz
Source3007: OOURAFFT.tar.gz
Source3008: PSIMD.tar.gz
Source3009: PTHREADPOOL.tar.gz
Source3010: TENSORFLOW-2.8.0-EIGEN.tar.gz
Source3011: TENSORFLOW-2.8.0-GEMMLOWP.tar.gz
Source3012: TENSORFLOW-2.8.0-RUY.tar.gz
Source3013: TENSORFLOW-2.8.0.tar.gz
Source3014: XNNPACK.tar.gz
Source3015: FLATBUFFERS-23.5.26.tar.gz
Source3016: NEON2SSE.tar.gz

%{!?build_type: %define build_type Release}
%{!?npud_build: %define npud_build 0}
Expand Down Expand Up @@ -215,11 +210,6 @@ tar -xf %{SOURCE3013} -C ./externals
tar -xf %{SOURCE3014} -C ./externals
tar -xf %{SOURCE3015} -C ./externals
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
tar -xf %{SOURCE3021} -C ./externals

%build
%ifarch arm armv7l armv7hl aarch64 x86_64 %ix86 riscv64
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions runtime/onert/backend/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ add_subdirectory(cpu)
add_subdirectory(acl_cl)
add_subdirectory(acl_neon)
add_subdirectory(ruy)
add_subdirectory(gpu_cl)
add_subdirectory(xnnpack)
add_subdirectory(trix)

# Backend to train
add_subdirectory(train)

0 comments on commit b4b9349

Please sign in to comment.