diff --git a/infra/nnfw/cmake/CfgOptionFlags.cmake b/infra/nnfw/cmake/CfgOptionFlags.cmake index 592762457dc..7b27f718567 100644 --- a/infra/nnfw/cmake/CfgOptionFlags.cmake +++ b/infra/nnfw/cmake/CfgOptionFlags.cmake @@ -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) @@ -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 # @@ -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) @@ -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) diff --git a/infra/nnfw/cmake/options/options_aarch64-android.cmake b/infra/nnfw/cmake/options/options_aarch64-android.cmake index d82ad93fc31..8e98dc8cbd3 100644 --- a/infra/nnfw/cmake/options/options_aarch64-android.cmake +++ b/infra/nnfw/cmake/options/options_aarch64-android.cmake @@ -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) diff --git a/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake b/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake index 07ef3e18f69..0c214337ce2 100644 --- a/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake +++ b/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake @@ -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) diff --git a/infra/nnfw/cmake/options/options_armv7l-linux.cmake b/infra/nnfw/cmake/options/options_armv7l-linux.cmake index 5fc6a0cf9f4..59fbb8a3c43 100644 --- a/infra/nnfw/cmake/options/options_armv7l-linux.cmake +++ b/infra/nnfw/cmake/options/options_armv7l-linux.cmake @@ -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) diff --git a/infra/nnfw/cmake/options/options_armv7l-tizen.cmake b/infra/nnfw/cmake/options/options_armv7l-tizen.cmake index b8344e11ecb..f315148c203 100644 --- a/infra/nnfw/cmake/options/options_armv7l-tizen.cmake +++ b/infra/nnfw/cmake/options/options_armv7l-tizen.cmake @@ -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) diff --git a/infra/nnfw/cmake/options/options_i686-tizen.cmake b/infra/nnfw/cmake/options/options_i686-tizen.cmake index 8f6b0908955..e7ca30af991 100644 --- a/infra/nnfw/cmake/options/options_i686-tizen.cmake +++ b/infra/nnfw/cmake/options/options_i686-tizen.cmake @@ -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 diff --git a/infra/nnfw/cmake/options/options_riscv64-tizen.cmake b/infra/nnfw/cmake/options/options_riscv64-tizen.cmake index c2f8c79f163..4aa1444b16c 100644 --- a/infra/nnfw/cmake/options/options_riscv64-tizen.cmake +++ b/infra/nnfw/cmake/options/options_riscv64-tizen.cmake @@ -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 diff --git a/infra/nnfw/cmake/options/options_x86_64-tizen.cmake b/infra/nnfw/cmake/options/options_x86_64-tizen.cmake index 613a48b3430..6d26c63fb6c 100644 --- a/infra/nnfw/cmake/options/options_x86_64-tizen.cmake +++ b/infra/nnfw/cmake/options/options_x86_64-tizen.cmake @@ -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 diff --git a/packaging/EGL_HEADERS.tar.gz b/packaging/EGL_HEADERS.tar.gz deleted file mode 100644 index 80222056cbe..00000000000 Binary files a/packaging/EGL_HEADERS.tar.gz and /dev/null differ diff --git a/packaging/FLATBUFFERS-2.0.tar.gz b/packaging/FLATBUFFERS-2.0.tar.gz deleted file mode 100644 index 809aca01aa9..00000000000 Binary files a/packaging/FLATBUFFERS-2.0.tar.gz and /dev/null differ diff --git a/packaging/OPENCL_HEADERS.tar.gz b/packaging/OPENCL_HEADERS.tar.gz deleted file mode 100644 index 7bc3656e8a2..00000000000 Binary files a/packaging/OPENCL_HEADERS.tar.gz and /dev/null differ diff --git a/packaging/OPENGL_HEADERS.tar.gz b/packaging/OPENGL_HEADERS.tar.gz deleted file mode 100644 index 53a395a941c..00000000000 Binary files a/packaging/OPENGL_HEADERS.tar.gz and /dev/null differ diff --git a/packaging/VULKAN.tar.gz b/packaging/VULKAN.tar.gz deleted file mode 100644 index 64ae0bdc46b..00000000000 Binary files a/packaging/VULKAN.tar.gz and /dev/null differ diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec index 7a421c74e6c..80f0b80b4d1 100644 --- a/packaging/nnfw.spec +++ b/packaging/nnfw.spec @@ -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} @@ -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 diff --git a/runtime/onert/backend/gpu_cl/Backend.h b/runtime/contrib/gpu_cl/Backend.h similarity index 100% rename from runtime/onert/backend/gpu_cl/Backend.h rename to runtime/contrib/gpu_cl/Backend.h diff --git a/runtime/onert/backend/gpu_cl/BackendContext.cc b/runtime/contrib/gpu_cl/BackendContext.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/BackendContext.cc rename to runtime/contrib/gpu_cl/BackendContext.cc diff --git a/runtime/onert/backend/gpu_cl/BackendContext.h b/runtime/contrib/gpu_cl/BackendContext.h similarity index 100% rename from runtime/onert/backend/gpu_cl/BackendContext.h rename to runtime/contrib/gpu_cl/BackendContext.h diff --git a/runtime/onert/backend/gpu_cl/CMakeLists.txt b/runtime/contrib/gpu_cl/CMakeLists.txt similarity index 100% rename from runtime/onert/backend/gpu_cl/CMakeLists.txt rename to runtime/contrib/gpu_cl/CMakeLists.txt diff --git a/runtime/onert/backend/gpu_cl/ClConstantInitializer.cc b/runtime/contrib/gpu_cl/ClConstantInitializer.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/ClConstantInitializer.cc rename to runtime/contrib/gpu_cl/ClConstantInitializer.cc diff --git a/runtime/onert/backend/gpu_cl/ClConstantInitializer.h b/runtime/contrib/gpu_cl/ClConstantInitializer.h similarity index 100% rename from runtime/onert/backend/gpu_cl/ClConstantInitializer.h rename to runtime/contrib/gpu_cl/ClConstantInitializer.h diff --git a/runtime/onert/backend/gpu_cl/ClFunction.h b/runtime/contrib/gpu_cl/ClFunction.h similarity index 100% rename from runtime/onert/backend/gpu_cl/ClFunction.h rename to runtime/contrib/gpu_cl/ClFunction.h diff --git a/runtime/onert/backend/gpu_cl/Config.cc b/runtime/contrib/gpu_cl/Config.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/Config.cc rename to runtime/contrib/gpu_cl/Config.cc diff --git a/runtime/onert/backend/gpu_cl/Config.h b/runtime/contrib/gpu_cl/Config.h similarity index 100% rename from runtime/onert/backend/gpu_cl/Config.h rename to runtime/contrib/gpu_cl/Config.h diff --git a/runtime/onert/backend/gpu_cl/ConstantInitializer.cc b/runtime/contrib/gpu_cl/ConstantInitializer.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/ConstantInitializer.cc rename to runtime/contrib/gpu_cl/ConstantInitializer.cc diff --git a/runtime/onert/backend/gpu_cl/ConstantInitializer.h b/runtime/contrib/gpu_cl/ConstantInitializer.h similarity index 100% rename from runtime/onert/backend/gpu_cl/ConstantInitializer.h rename to runtime/contrib/gpu_cl/ConstantInitializer.h diff --git a/runtime/onert/backend/gpu_cl/KernelGenerator.cc b/runtime/contrib/gpu_cl/KernelGenerator.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/KernelGenerator.cc rename to runtime/contrib/gpu_cl/KernelGenerator.cc diff --git a/runtime/onert/backend/gpu_cl/KernelGenerator.h b/runtime/contrib/gpu_cl/KernelGenerator.h similarity index 100% rename from runtime/onert/backend/gpu_cl/KernelGenerator.h rename to runtime/contrib/gpu_cl/KernelGenerator.h diff --git a/runtime/onert/backend/gpu_cl/MemoryManager.h b/runtime/contrib/gpu_cl/MemoryManager.h similarity index 100% rename from runtime/onert/backend/gpu_cl/MemoryManager.h rename to runtime/contrib/gpu_cl/MemoryManager.h diff --git a/runtime/onert/backend/gpu_cl/TensorBuilder.cc b/runtime/contrib/gpu_cl/TensorBuilder.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/TensorBuilder.cc rename to runtime/contrib/gpu_cl/TensorBuilder.cc diff --git a/runtime/onert/backend/gpu_cl/TensorBuilder.h b/runtime/contrib/gpu_cl/TensorBuilder.h similarity index 100% rename from runtime/onert/backend/gpu_cl/TensorBuilder.h rename to runtime/contrib/gpu_cl/TensorBuilder.h diff --git a/runtime/onert/backend/gpu_cl/TensorManager.cc b/runtime/contrib/gpu_cl/TensorManager.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/TensorManager.cc rename to runtime/contrib/gpu_cl/TensorManager.cc diff --git a/runtime/onert/backend/gpu_cl/TensorManager.h b/runtime/contrib/gpu_cl/TensorManager.h similarity index 100% rename from runtime/onert/backend/gpu_cl/TensorManager.h rename to runtime/contrib/gpu_cl/TensorManager.h diff --git a/runtime/onert/backend/gpu_cl/TensorRegistry.h b/runtime/contrib/gpu_cl/TensorRegistry.h similarity index 100% rename from runtime/onert/backend/gpu_cl/TensorRegistry.h rename to runtime/contrib/gpu_cl/TensorRegistry.h diff --git a/runtime/onert/backend/gpu_cl/Utils.h b/runtime/contrib/gpu_cl/Utils.h similarity index 100% rename from runtime/onert/backend/gpu_cl/Utils.h rename to runtime/contrib/gpu_cl/Utils.h diff --git a/runtime/onert/backend/gpu_cl/gpu_cl.cc b/runtime/contrib/gpu_cl/gpu_cl.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/gpu_cl.cc rename to runtime/contrib/gpu_cl/gpu_cl.cc diff --git a/runtime/onert/backend/gpu_cl/operand/CLTensor.cc b/runtime/contrib/gpu_cl/operand/CLTensor.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/operand/CLTensor.cc rename to runtime/contrib/gpu_cl/operand/CLTensor.cc diff --git a/runtime/onert/backend/gpu_cl/operand/CLTensor.h b/runtime/contrib/gpu_cl/operand/CLTensor.h similarity index 100% rename from runtime/onert/backend/gpu_cl/operand/CLTensor.h rename to runtime/contrib/gpu_cl/operand/CLTensor.h diff --git a/runtime/onert/backend/gpu_cl/operand/ICLTensor.cc b/runtime/contrib/gpu_cl/operand/ICLTensor.cc similarity index 100% rename from runtime/onert/backend/gpu_cl/operand/ICLTensor.cc rename to runtime/contrib/gpu_cl/operand/ICLTensor.cc diff --git a/runtime/onert/backend/gpu_cl/operand/ICLTensor.h b/runtime/contrib/gpu_cl/operand/ICLTensor.h similarity index 100% rename from runtime/onert/backend/gpu_cl/operand/ICLTensor.h rename to runtime/contrib/gpu_cl/operand/ICLTensor.h diff --git a/runtime/onert/backend/CMakeLists.txt b/runtime/onert/backend/CMakeLists.txt index de0555f2a01..0721881eca4 100644 --- a/runtime/onert/backend/CMakeLists.txt +++ b/runtime/onert/backend/CMakeLists.txt @@ -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) -