diff options
author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2020-06-01 19:53:26 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-01 19:53:26 +0900 |
commit | 9b96a934b9b817f75cae71fa12a81464904143fe (patch) | |
tree | a14e0e04c758e74f517db0bedcf0cbf73a1565cc /infra | |
parent | aec770693f7ed8a99dce8a19db666488a584d183 (diff) | |
download | nnfw-9b96a934b9b817f75cae71fa12a81464904143fe.tar.gz nnfw-9b96a934b9b817f75cae71fa12a81464904143fe.tar.bz2 nnfw-9b96a934b9b817f75cae71fa12a81464904143fe.zip |
[onert] Remove experimental nnpack backend (#1716)
Remove experimental nnpack backend and related package managing scripts
High-performance cpu backend is handled by cker with optimized kernel(and ruy)
Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
Diffstat (limited to 'infra')
-rw-r--r-- | infra/cmake/packages/CpuinfoSourceConfig.cmake | 14 | ||||
-rw-r--r-- | infra/cmake/packages/Enum34SourceConfig.cmake | 14 | ||||
-rw-r--r-- | infra/cmake/packages/FP16SourceConfig.cmake | 14 | ||||
-rw-r--r-- | infra/cmake/packages/FXdivSourceConfig.cmake | 14 | ||||
-rw-r--r-- | infra/cmake/packages/NNPACKConfig.cmake | 51 | ||||
-rw-r--r-- | infra/cmake/packages/NNPACKSourceConfig.cmake | 20 | ||||
-rw-r--r-- | infra/cmake/packages/OpcodesSourceConfig.cmake | 13 | ||||
-rw-r--r-- | infra/cmake/packages/PSIMDSourceConfig.cmake | 14 | ||||
-rw-r--r-- | infra/cmake/packages/PeachpySourceConfig.cmake | 31 | ||||
-rw-r--r-- | infra/cmake/packages/PthreadpoolSourceConfig.cmake | 14 | ||||
-rw-r--r-- | infra/cmake/packages/SixSourceConfig.cmake | 14 | ||||
-rw-r--r-- | infra/nnfw/cmake/CfgOptionFlags.cmake | 1 | ||||
-rw-r--r-- | infra/nnfw/cmake/options/options_aarch64-tizen.cmake | 1 | ||||
-rw-r--r-- | infra/nnfw/cmake/options/options_armv7l-tizen.cmake | 1 |
14 files changed, 0 insertions, 216 deletions
diff --git a/infra/cmake/packages/CpuinfoSourceConfig.cmake b/infra/cmake/packages/CpuinfoSourceConfig.cmake deleted file mode 100644 index 1f3b4773e..000000000 --- a/infra/cmake/packages/CpuinfoSourceConfig.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(_cpuinfoSource_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(CPUINFO_URL ${EXTERNAL_DOWNLOAD_SERVER}/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz) - - ExternalSource_Get("CPUINFO" ${DOWNLOAD_NNPACK} ${CPUINFO_URL}) - - set(CPUINFO_SOURCE_DIR ${CPUINFO_SOURCE_DIR} PARENT_SCOPE) - set(CPUINFO_SOURCE_FOUND ${CPUINFO_SOURCE_GET} PARENT_SCOPE) -endfunction(_cpuinfoSource_import) - -_cpuinfoSource_import() diff --git a/infra/cmake/packages/Enum34SourceConfig.cmake b/infra/cmake/packages/Enum34SourceConfig.cmake deleted file mode 100644 index 04d22eb97..000000000 --- a/infra/cmake/packages/Enum34SourceConfig.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(_enum34Source_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://bitbucket.org") - set(ENUM34_URL ${EXTERNAL_DOWNLOAD_SERVER}/stoneleaf/enum34/get/1.1.6.tar.gz) - - ExternalSource_Get("PYTHON_ENUM" ${DOWNLOAD_NNPACK} ${ENUM34_URL}) - - set(PYTHON_ENUM_SOURCE_DIR ${PYTHON_ENUM_SOURCE_DIR} PARENT_SCOPE) - set(PYTHON_ENUM_SOURCE_FOUND ${PYTHON_ENUM_SOURCE_GET} PARENT_SCOPE) -endfunction(_enum34Source_import) - -_enum34Source_import() diff --git a/infra/cmake/packages/FP16SourceConfig.cmake b/infra/cmake/packages/FP16SourceConfig.cmake deleted file mode 100644 index c7e9db578..000000000 --- a/infra/cmake/packages/FP16SourceConfig.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(_FP16Source_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(FP16_URL ${EXTERNAL_DOWNLOAD_SERVER}/Maratyszcza/FP16/archive/febbb1c163726b5db24bed55cc9dc42529068997.tar.gz) - - ExternalSource_Get("FP16" ${DOWNLOAD_NNPACK} ${FP16_URL}) - - set(FP16_SOURCE_DIR ${FP16_SOURCE_DIR} PARENT_SCOPE) - set(FP16_SOURCE_FOUND ${FP16_SOURCE_GET} PARENT_SCOPE) -endfunction(_FP16Source_import) - -_FP16Source_import() diff --git a/infra/cmake/packages/FXdivSourceConfig.cmake b/infra/cmake/packages/FXdivSourceConfig.cmake deleted file mode 100644 index fa41adbc6..000000000 --- a/infra/cmake/packages/FXdivSourceConfig.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(_FXdivSource_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(FXDIV_URL ${EXTERNAL_DOWNLOAD_SERVER}/Maratyszcza/FXdiv/archive/f8c5354679ec2597792bc70a9e06eff50c508b9a.tar.gz) - - ExternalSource_Get("FXDIV" ${DOWNLOAD_NNPACK} ${FXDIV_URL}) - - set(FXDIV_SOURCE_DIR ${FXDIV_SOURCE_DIR} PARENT_SCOPE) - set(FXDIV_SOURCE_FOUND ${FXDIV_SOURCE_GET} PARENT_SCOPE) -endfunction(_FXdivSource_import) - -_FXdivSource_import() diff --git a/infra/cmake/packages/NNPACKConfig.cmake b/infra/cmake/packages/NNPACKConfig.cmake deleted file mode 100644 index 31a02a6b4..000000000 --- a/infra/cmake/packages/NNPACKConfig.cmake +++ /dev/null @@ -1,51 +0,0 @@ -function(_NNPACK_Import) - nnas_find_package(NNPACKSource QUIET) - - if(NOT NNPACK_SOURCE_FOUND) - set(NNPACK_FOUND FALSE PARENT_SCOPE) - message(STATUS "NNPACK not found") - return() - endif(NOT NNPACK_SOURCE_FOUND) - - nnas_find_package(CpuinfoSource REQUIRED) - nnas_find_package(FP16Source REQUIRED) - nnas_find_package(FXdivSource REQUIRED) - nnas_find_package(PSIMDSource REQUIRED) - nnas_find_package(PthreadpoolSource REQUIRED) - nnas_find_package(SixSource REQUIRED) - nnas_find_package(Enum34Source REQUIRED) - nnas_find_package(OpcodesSource REQUIRED) - nnas_find_package(PeachpySource QUIET) - - if(NOT PYTHON_PEACHPY_SOURCE_FOUND) - set(NNPACK_FOUND FALSE PARENT_SCOPE) - return() - endif(NOT PYTHON_PEACHPY_SOURCE_FOUND) - - # workaround for CI - set(THREADS_PTHREAD_ARG "2" CACHE STRING "Forcibly set by CMakeLists.txt." FORCE) - if(NOT TARGET nnpack) - # Allows us to build nnpack at build time - set(NNPACK_BUILD_TESTS OFF CACHE BOOL "") - set(NNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "") - set(NNPACK_LIBRARY_TYPE "static" CACHE STRING "") - set(PTHREADPOOL_LIBRARY_TYPE "static" CACHE STRING "") - set(CPUINFO_LIBRARY_TYPE "static" CACHE STRING "") - nnas_include(ExternalProjectTools) - add_extdirectory("${NNPACK_SOURCE_DIR}" nnpack EXCLUDE_FROM_ALL) - # We build static versions of nnpack and pthreadpool but link - # them into a shared library (high-perf-backend), so they need PIC. - set_property(TARGET nnpack PROPERTY POSITION_INDEPENDENT_CODE ON) - set_property(TARGET pthreadpool PROPERTY POSITION_INDEPENDENT_CODE ON) - set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON) - endif() - - set(NNPACK_FOUND TRUE PARENT_SCOPE) - set(NNPACK_INCLUDE_DIRS - $<TARGET_PROPERTY:nnpack,INCLUDE_DIRECTORIES> - $<TARGET_PROPERTY:pthreadpool,INCLUDE_DIRECTORIES> PARENT_SCOPE) - set(NNPACK_LIBRARIES $<TARGET_FILE:nnpack> $<TARGET_FILE:cpuinfo> PARENT_SCOPE) - -endfunction(_NNPACK_Import) - -_NNPACK_Import() diff --git a/infra/cmake/packages/NNPACKSourceConfig.cmake b/infra/cmake/packages/NNPACKSourceConfig.cmake deleted file mode 100644 index 10a08ea7c..000000000 --- a/infra/cmake/packages/NNPACKSourceConfig.cmake +++ /dev/null @@ -1,20 +0,0 @@ -function(_NNPACKSource_import) - if(NOT DOWNLOAD_NNPACK) - set(NNPACKSource_FOUND FALSE PARENT_SCOPE) - message(WARNING "NNPACK not downloaded") - return() - endif(NOT DOWNLOAD_NNPACK) - - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(NNPACK_URL ${EXTERNAL_DOWNLOAD_SERVER}/Maratyszcza/NNPACK/archive/c039579abe21f5756e0f0e45e8e767adccc11852.tar.gz) - ExternalSource_Get("NNPACK" ${DOWNLOAD_NNPACK} ${NNPACK_URL}) - - set(NNPACK_SOURCE_DIR ${NNPACK_SOURCE_DIR} PARENT_SCOPE) - set(NNPACK_INCLUDE_DIR ${NNPACK_SOURCE_DIR}/include PARENT_SCOPE) - set(NNPACK_SOURCE_FOUND ${NNPACK_SOURCE_GET} PARENT_SCOPE) -endfunction(_NNPACKSource_import) - -_NNPACKSource_import() diff --git a/infra/cmake/packages/OpcodesSourceConfig.cmake b/infra/cmake/packages/OpcodesSourceConfig.cmake deleted file mode 100644 index 8b324ea57..000000000 --- a/infra/cmake/packages/OpcodesSourceConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -function(_PeachpySource_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(PEACHPY_URL ${EXTERNAL_DOWNLOAD_SERVER}/Maratyszcza/Opcodes/archive/6e2b0cd9f1403ecaf164dea7019dd54db5aea252.tar.gz) - ExternalSource_Get("PYTHON_OPCODES" ${DOWNLOAD_NNPACK} ${PEACHPY_URL}) - - set(PYTHON_OPCODES_SOURCE_DIR ${PYTHON_OPCODES_SOURCE_DIR} PARENT_SCOPE) - set(PYTHON_OPCODES_SOURCE_FOUND ${PYTHON_OPCODES_SOURCE_GET} PARENT_SCOPE) -endfunction(_PeachpySource_import) - -_PeachpySource_import() diff --git a/infra/cmake/packages/PSIMDSourceConfig.cmake b/infra/cmake/packages/PSIMDSourceConfig.cmake deleted file mode 100644 index c14ad730d..000000000 --- a/infra/cmake/packages/PSIMDSourceConfig.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(_PSIMDSource_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(PSIMD_URL ${EXTERNAL_DOWNLOAD_SERVER}/Maratyszcza/psimd/archive/90a938f30ba414ada2f4b00674ee9631d7d85e19.tar.gz) - - ExternalSource_Get("PSIMD" ${DOWNLOAD_NNPACK} ${PSIMD_URL}) - - set(PSIMD_SOURCE_DIR ${PSIMD_SOURCE_DIR} PARENT_SCOPE) - set(PSIMD_SOURCE_FOUND ${PSIMD_SOURCE_GET} PARENT_SCOPE) -endfunction(_PSIMDSource_import) - -_PSIMDSource_import() diff --git a/infra/cmake/packages/PeachpySourceConfig.cmake b/infra/cmake/packages/PeachpySourceConfig.cmake deleted file mode 100644 index fea8d14a7..000000000 --- a/infra/cmake/packages/PeachpySourceConfig.cmake +++ /dev/null @@ -1,31 +0,0 @@ -function(_PeachpySource_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(PEACHPY_URL ${EXTERNAL_DOWNLOAD_SERVER}/Maratyszcza/PeachPy/archive/01d15157a973a4ae16b8046313ddab371ea582db.tar.gz) - - ExternalSource_Get("PYTHON_PEACHPY" ${DOWNLOAD_NNPACK} ${PEACHPY_URL}) - FIND_PACKAGE(PythonInterp) - - nnfw_find_package(SixSource REQUIRED) - nnfw_find_package(Enum34Source REQUIRED) - nnfw_find_package(OpcodesSource REQUIRED) - - # Generate opcodes: - SET(ENV{PYTHONPATH} ${PYTHON_PEACHPY_SOURCE_DIR}:${PYTHON_SIX_SOURCE_DIR}:${PYTHON_ENUM_SOURCE_DIR}:${PYTHON_OPCODES_SOURCE_DIR}) - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ./codegen/x86_64.py - WORKING_DIRECTORY ${PYTHON_PEACHPY_SOURCE_DIR} - RESULT_VARIABLE BUILT_PP) - - if(NOT BUILT_PP EQUAL 0) - # Mark PYTHON_PEACHPY_SOURCE_FOUND as FALSE if source generation fails - set(PYTHON_PEACHPY_SOURCE_FOUND FALSE PARENT_SCOPE) - return() - endif(NOT BUILT_PP EQUAL 0) - - set(PYTHON_PEACHPY_SOURCE_DIR ${PYTHON_PEACHPY_SOURCE_DIR} PARENT_SCOPE) - set(PYTHON_PEACHPY_SOURCE_FOUND ${PYTHON_PEACHPY_SOURCE_GET} PARENT_SCOPE) -endfunction(_PeachpySource_import) - -_PeachpySource_import() diff --git a/infra/cmake/packages/PthreadpoolSourceConfig.cmake b/infra/cmake/packages/PthreadpoolSourceConfig.cmake deleted file mode 100644 index a570a9957..000000000 --- a/infra/cmake/packages/PthreadpoolSourceConfig.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(_pthreadpoolSource_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(PTHREADPOOL_URL ${EXTERNAL_DOWNLOAD_SERVER}/Maratyszcza/pthreadpool/archive/6673a4c71fe35e077c6843a74017d9c25610c537.tar.gz) - - ExternalSource_Get("PTHREADPOOL" ${DOWNLOAD_NNPACK} ${PTHREADPOOL_URL}) - - set(PTHREADPOOL_SOURCE_DIR ${PTHREADPOOL_SOURCE_DIR} PARENT_SCOPE) - set(PTHREADPOOL_SOURCE_FOUND ${PTHREADPOOL_SOURCE_GET} PARENT_SCOPE) -endfunction(_pthreadpoolSource_import) - -_pthreadpoolSource_import() diff --git a/infra/cmake/packages/SixSourceConfig.cmake b/infra/cmake/packages/SixSourceConfig.cmake deleted file mode 100644 index f6f85ca7a..000000000 --- a/infra/cmake/packages/SixSourceConfig.cmake +++ /dev/null @@ -1,14 +0,0 @@ -function(_SIXSource_import) - nnas_include(ExternalSourceTools) - nnas_include(OptionTools) - - envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com") - set(six_URL ${EXTERNAL_DOWNLOAD_SERVER}/benjaminp/six/archive/1.11.0.tar.gz) - - ExternalSource_Get("PYTHON_SIX" ${DOWNLOAD_NNPACK} ${six_URL}) - - set(PYTHON_SIX_SOURCE_DIR ${PYTHON_SIX_SOURCE_DIR} PARENT_SCOPE) - set(PYTHON_SIX_SOURCE_FOUND ${PYTHON_SIX_SOURCE_GET} PARENT_SCOPE) -endfunction(_SIXSource_import) - -_SIXSource_import() diff --git a/infra/nnfw/cmake/CfgOptionFlags.cmake b/infra/nnfw/cmake/CfgOptionFlags.cmake index 5031954b2..32a7d6060 100644 --- a/infra/nnfw/cmake/CfgOptionFlags.cmake +++ b/infra/nnfw/cmake/CfgOptionFlags.cmake @@ -61,7 +61,6 @@ option(DOWNLOAD_EIGEN "Download Eigen source" ON) option(DOWNLOAD_FARMHASH "Download farmhash source" ON) option(DOWNLOAD_GEMMLOWP "Download GEMM low precesion library source" ON) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" ON) -option(DOWNLOAD_NNPACK "Download NNPACK source" OFF) option(DOWNLOAD_FLATBUFFERS "Download FlatBuffers source" ON) option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) option(DOWNLOAD_NONIUS "Download nonius source" ON) diff --git a/infra/nnfw/cmake/options/options_aarch64-tizen.cmake b/infra/nnfw/cmake/options/options_aarch64-tizen.cmake index fa625fcad..21aa8a9a9 100644 --- a/infra/nnfw/cmake/options/options_aarch64-tizen.cmake +++ b/infra/nnfw/cmake/options/options_aarch64-tizen.cmake @@ -5,7 +5,6 @@ option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) option(DOWNLOAD_EIGEN "Download Eigen source" OFF) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) -option(DOWNLOAD_NNPACK "Download NNPACK source" OFF) option(BUILD_LOGGING "Build logging runtime" OFF) option(BUILD_TFLITE_RUN "Build tflite-run" OFF) diff --git a/infra/nnfw/cmake/options/options_armv7l-tizen.cmake b/infra/nnfw/cmake/options/options_armv7l-tizen.cmake index 85f9c0aa2..25c848f95 100644 --- a/infra/nnfw/cmake/options/options_armv7l-tizen.cmake +++ b/infra/nnfw/cmake/options/options_armv7l-tizen.cmake @@ -4,7 +4,6 @@ option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) -option(DOWNLOAD_NNPACK "Download NNPACK source" OFF) option(BUILD_LOGGING "Build logging runtime" OFF) option(BUILD_TFLITE_RUN "Build tflite-run" OFF) |