From d18e80b604b64e099a08368e49624901de92af29 Mon Sep 17 00:00:00 2001 From: Gleb Kazantaev Date: Thu, 9 Dec 2021 00:00:36 +0300 Subject: [PATCH] Move back temp frolder to the CMAKE_SOURCE_DIR (#9072) * Move back temp frolder to the CMAKE_SOURCE_DIR * Fix windows azure --- .ci/azure/linux.yml | 4 ++-- .ci/azure/linux_coverity.yml | 2 +- .ci/azure/linux_lohika.yml | 4 ++-- .ci/azure/mac.yml | 4 ++-- .ci/azure/windows.yml | 4 ++-- .ci/azure/windows_conditional_compilation.yml | 2 +- cmake/dependencies.cmake | 2 +- .../tools/mo/utils/find_ie_version.py | 20 ++----------------- 8 files changed, 13 insertions(+), 29 deletions(-) diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index 1d06800fc73..683515e8b29 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -162,7 +162,7 @@ jobs: $(REPO_DIR) workingDirectory: $(BUILD_DIR) - - script: ls -alR $(BUILD_DIR)/temp/ + - script: ls -alR $(REPO_DIR)/temp/ displayName: 'List temp SDKs' - script: ccache --zero-stats --max-size=1T --show-config @@ -207,7 +207,7 @@ jobs: set -e mkdir $(INSTALL_DIR)/opencv/ cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake - cp -R $(BUILD_DIR)/temp/opencv_4.5.2_ubuntu20/opencv/* $(INSTALL_DIR)/opencv/ + cp -R $(REPO_DIR)/temp/opencv_4.5.2_ubuntu20/opencv/* $(INSTALL_DIR)/opencv/ workingDirectory: $(BUILD_DIR) displayName: 'Install tests' diff --git a/.ci/azure/linux_coverity.yml b/.ci/azure/linux_coverity.yml index 8458b78763a..a5d94cf5f93 100644 --- a/.ci/azure/linux_coverity.yml +++ b/.ci/azure/linux_coverity.yml @@ -73,7 +73,7 @@ jobs: $(REPO_DIR) workingDirectory: $(BUILD_DIR) - - script: ls -alR $(BUILD_DIR)/temp/ + - script: ls -alR $(REPO_DIR)/temp/ displayName: 'List temp SDKs' - script: | diff --git a/.ci/azure/linux_lohika.yml b/.ci/azure/linux_lohika.yml index 5881e3dd1a3..83c9b17f404 100644 --- a/.ci/azure/linux_lohika.yml +++ b/.ci/azure/linux_lohika.yml @@ -126,7 +126,7 @@ jobs: $(REPO_DIR) workingDirectory: $(BUILD_DIR) - - script: ls -alR $(BUILD_DIR)/temp/ + - script: ls -alR $(REPO_DIR)/temp/ displayName: 'List temp SDKs' - script: ninja @@ -147,7 +147,7 @@ jobs: set -e mkdir $(INSTALL_DIR)/opencv/ cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake - cp -R $(BUILD_DIR)/temp/opencv_4.5.2_ubuntu20/opencv/* $(INSTALL_DIR)/opencv/ + cp -R $(REPO_DIR)/temp/opencv_4.5.2_ubuntu20/opencv/* $(INSTALL_DIR)/opencv/ workingDirectory: $(BUILD_DIR) displayName: 'Install tests' diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml index f6bd7a58e94..804ce171362 100644 --- a/.ci/azure/mac.yml +++ b/.ci/azure/mac.yml @@ -100,7 +100,7 @@ jobs: workingDirectory: $(BUILD_DIR) displayName: 'CMake' - - script: ls -alR $(BUILD_DIR)/temp/ + - script: ls -alR $(REPO_DIR)/temp/ displayName: 'List temp SDKs' - script: ninja @@ -121,7 +121,7 @@ jobs: set -e mkdir $(INSTALL_DIR)/opencv/ cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake - cp -R $(BUILD_DIR)/temp/opencv_4.5.2_osx/opencv/* $(INSTALL_DIR)/opencv/ + cp -R $(REPO_DIR)/temp/opencv_4.5.2_osx/opencv/* $(INSTALL_DIR)/opencv/ workingDirectory: $(BUILD_DIR) displayName: 'Install tests' diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 0718ac81d13..b9738b6a7bb 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -136,7 +136,7 @@ jobs: workingDirectory: $(BUILD_DIR) displayName: 'CMake' - - script: dir $(BUILD_DIR)\temp\ /s + - script: dir $(REPO_DIR)\temp\ /s displayName: 'List temp SDKs' - script: | @@ -163,7 +163,7 @@ jobs: workingDirectory: $(BUILD_SAMPLES_TESTS_DIR) displayName: 'Install Samples Tests' - - script: $(CMAKE_CMD) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake && xcopy $(BUILD_DIR)\temp\opencv_4.5.2\opencv\* $(INSTALL_DIR)\opencv\ /e /h /y + - script: $(CMAKE_CMD) -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake && xcopy $(REPO_DIR)\temp\opencv_4.5.2\opencv\* $(INSTALL_DIR)\opencv\ /e /h /y workingDirectory: $(BUILD_DIR) displayName: 'Install tests' diff --git a/.ci/azure/windows_conditional_compilation.yml b/.ci/azure/windows_conditional_compilation.yml index 9e4409bfef6..cc310068d11 100644 --- a/.ci/azure/windows_conditional_compilation.yml +++ b/.ci/azure/windows_conditional_compilation.yml @@ -70,7 +70,7 @@ jobs: workingDirectory: $(BUILD_DIR) displayName: 'CMake' - - script: dir $(BUILD_DIR)\temp\ /s + - script: dir $(REPO_DIR)\temp\ /s displayName: 'List temp SDKs' - script: call "$(MSVS_VARS_PATH)" && $(WORK_DIR)\ninja-win\ninja diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 67e8bcdb3ae..d1c9f5310cf 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -5,7 +5,7 @@ cmake_policy(SET CMP0054 NEW) # TODO: fix it -set_temp_directory(TEMP "${CMAKE_BINARY_DIR}") +set_temp_directory(TEMP "${CMAKE_SOURCE_DIR}") if(ENABLE_SAME_BRANCH_FOR_MODELS) branchName(MODELS_BRANCH) diff --git a/tools/mo/openvino/tools/mo/utils/find_ie_version.py b/tools/mo/openvino/tools/mo/utils/find_ie_version.py index 7ccf220ddf7..4d6a1defd7e 100644 --- a/tools/mo/openvino/tools/mo/utils/find_ie_version.py +++ b/tools/mo/openvino/tools/mo/utils/find_ie_version.py @@ -92,21 +92,13 @@ def find_ie_version(silent=False): # Windows bindings_paths_windows = [ - # Package - { - "module": os.path.join(script_path, '../../../../../../../python/', python_version), - "libs": [ - os.path.join(script_path, '../../../../../../../runtime/bin/intel64/Release'), - os.path.join(script_path, '../../../../../../../runtime/3rdparty/tbb/bin'), - ], - }, # Local builds { "module": os.path.join(script_path, '../../../../../../bin/intel64/Release/python_api/', python_version), "libs": [ os.path.join(script_path, '../../../../../../bin/intel64'), os.path.join(script_path, '../../../../../../bin/intel64/Release'), - os.path.join(script_path, '../../../../../../inference-engine/temp/tbb/bin'), + os.path.join(script_path, '../../../../../../temp/tbb/bin'), ] }, { @@ -114,21 +106,13 @@ def find_ie_version(silent=False): "libs": [ os.path.join(script_path, '../../../../../../bin/intel64'), os.path.join(script_path, '../../../../../../bin/intel64/Debug'), - os.path.join(script_path, '../../../../../../inference-engine/temp/tbb/bin'), + os.path.join(script_path, '../../../../../../temp/temp/tbb/bin'), ] }, ] # Linux / Darwin bindings_paths_linux = [ - # Package - { - "module": os.path.join(script_path, '../../../../../../../python/', python_version), - "libs": [ - os.path.join(script_path, '../../../../../../../runtime/lib/intel64'), - os.path.join(script_path, '../../../../../../../runtime/3rdparty/tbb/lib'), - ], - }, # Local builds { "module": os.path.join(script_path, '../../../../../../bin/intel64/Release/lib/python_api/', python_version),