From e07ac53300ea054bb7251eddf7a69c412fb0474c Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 1 Sep 2021 18:41:15 +0300 Subject: [PATCH] Removed speech demo (#7298) --- .ci/azure/linux_onnxruntime.yml | 1 - .ci/openvino-onnx/Dockerfile | 1 - cmake/dependencies.cmake | 41 --------------------------------- cmake/features.cmake | 2 -- inference-engine/CMakeLists.txt | 12 ---------- 5 files changed, 57 deletions(-) diff --git a/.ci/azure/linux_onnxruntime.yml b/.ci/azure/linux_onnxruntime.yml index 932fb76d5cc..dd9d8b44429 100644 --- a/.ci/azure/linux_onnxruntime.yml +++ b/.ci/azure/linux_onnxruntime.yml @@ -93,7 +93,6 @@ jobs: -DENABLE_CLDNN=OFF -DENABLE_PROFILING_ITT=OFF -DENABLE_SAMPLES=OFF - -DENABLE_SPEECH_DEMO=OFF -DNGRAPH_ONNX_FRONTEND_ENABLE=ON -DNGRAPH_DEBUG_ENABLE=OFF $(REPO_DIR) diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile index 314ab2c1037..3a190c42769 100644 --- a/.ci/openvino-onnx/Dockerfile +++ b/.ci/openvino-onnx/Dockerfile @@ -65,7 +65,6 @@ RUN cmake .. \ -DENABLE_CLDNN=OFF \ -DENABLE_PROFILING_ITT=OFF \ -DENABLE_SAMPLES=OFF \ - -DENABLE_SPEECH_DEMO=OFF \ -DENABLE_PYTHON=ON \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DNGRAPH_ONNX_FRONTEND_ENABLE=ON \ diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 82f98b4c515..046e9a83d57 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -298,44 +298,3 @@ if(ENABLE_GNA) update_deps_cache(GNA "${GNA}" "Path to GNA root folder") debug_message(STATUS "gna=" ${GNA}) endif() - -if(ENABLE_SPEECH_DEMO) - reset_deps_cache(SPEECH_LIBS_AND_DEMOS) - if(DEFINED ENV{THIRDPARTY_SERVER_PATH}) - set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}") - elseif(DEFINED THIRDPARTY_SERVER_PATH) - set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}") - else() - message(WARNING "Unable to locate Speech Demo") - endif() - if(DEFINED IE_PATH_TO_DEPS) - if(WIN32 AND X86_64) - RESOLVE_DEPENDENCY(SPEECH_LIBS_AND_DEMOS - ARCHIVE_WIN "speech_demo_1.0.0.780_windows.zip" - VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+.[0-9]+).*" - TARGET_PATH "${TEMP}/speech_demo_1.0.0.780" - SHA256 "957bd274a1f6dc1d83a46879c7ef3b3b06f17d11af85cc45c18919051d145abd") - debug_message(STATUS "speech_libs_and_demos=" ${SPEECH_LIBS_AND_DEMOS}) - elseif(LINUX AND X86_64) - if(LINUX_OS_NAME STREQUAL "CentOS 7" OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") - RESOLVE_DEPENDENCY(SPEECH_LIBS_AND_DEMOS - ARCHIVE_LIN "speech_demo_1.0.0.780_centos.tgz" - VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+.[0-9]+).*" - TARGET_PATH "${TEMP}/speech_demo_1.0.0.780" - SHA256 "6d8d1111d0e662fe71d71cd3debad2995f6fb6fe5df3b92196dae06ff7abdf44") - debug_message(STATUS "speech_libs_and_demos=" ${SPEECH_LIBS_AND_DEMOS}) - else() - RESOLVE_DEPENDENCY(SPEECH_LIBS_AND_DEMOS - ARCHIVE_LIN "speech_demo_1.0.0.780_linux.tgz" - VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+.[0-9]+).*" - TARGET_PATH "${TEMP}/speech_demo_1.0.0.780" - SHA256 "0ec6f1e47c00d781dc918af5d3055ab474ff47b9978dd6fe2add73e3339b0763") - debug_message(STATUS "speech_libs_and_demos=" ${SPEECH_LIBS_AND_DEMOS}) - endif() - else() - message(FATAL_ERROR "Speech Demo is not available on current platform") - endif() - unset(IE_PATH_TO_DEPS) - endif() - update_deps_cache(SPEECH_LIBS_AND_DEMOS "${SPEECH_LIBS_AND_DEMOS}" "Path to SPEECH_LIBS_AND_DEMOS root folder") -endif() diff --git a/cmake/features.cmake b/cmake/features.cmake index cf9fbebbe94..450b0d255cc 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -98,8 +98,6 @@ ie_dependent_option (ENABLE_FUNCTIONAL_TESTS "functional tests" ON "ENABLE_TESTS ie_dependent_option (ENABLE_SAMPLES "console samples are part of inference engine package" ON "NOT MINGW" OFF) -ie_dependent_option (ENABLE_SPEECH_DEMO "enable speech demo integration" ON "NOT APPLE;NOT ANDROID;X86_64" OFF) - ie_option (ENABLE_OPENCV "enables OpenCV" ON) ie_option (ENABLE_V7_SERIALIZE "enables serialization to IR v7" OFF) diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt index 5f2fb047ce6..69a71eb55b5 100644 --- a/inference-engine/CMakeLists.txt +++ b/inference-engine/CMakeLists.txt @@ -80,15 +80,3 @@ install(DIRECTORY ie_bridges/c/samples/ install(FILES samples/CMakeLists.txt DESTINATION ${IE_CPACK_IE_DIR}/samples/c COMPONENT c_samples) - -# install speech demo files - -if(SPEECH_LIBS_AND_DEMOS) - ie_cpack_add_component(speech_demo_files) - - install(DIRECTORY ${TEMP}/deployment_tools - ${TEMP}/data_processing - DESTINATION . - USE_SOURCE_PERMISSIONS - COMPONENT speech_demo_files) -endif()