IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move back temp frolder to the CMAKE_SOURCE_DIR (#9072)

Browse Source 
* Move back temp frolder to the CMAKE_SOURCE_DIR

* Fix windows azure
This commit is contained in:
Gleb Kazantaev 2021-12-09 00:00:36 +03:00 committed by GitHub
parent 32d3dade40
commit d18e80b604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/azure/linux.yml
View File

@ -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'

2
.ci/azure/linux_coverity.yml
View File

@ -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: |

4
.ci/azure/linux_lohika.yml
View File

@ -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'

4
.ci/azure/mac.yml
View File

@ -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'

4
.ci/azure/windows.yml
View File

@ -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'

2
.ci/azure/windows_conditional_compilation.yml
View File

@ -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

2
cmake/dependencies.cmake
View File

@ -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)

20
tools/mo/openvino/tools/mo/utils/find_ie_version.py
View File

@ -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),