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

[IE CMAKE] FIX PATHS (#553)

Browse Source 
* [IE CMAKE] FIX PATHS

* Fix problems
This commit is contained in:
Irina Efode 2020-05-26 11:57:02 +03:00 committed by GitHub
parent 42a8364cb6
commit c3aa866a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inference-engine/cmake/dependencies.cmake
View File

@ -23,8 +23,8 @@ endif()
if (ENABLE_DATA)
add_models_repo(${ENABLE_DATA} "data:inference-engine/open-source-data.git")
set(MODELS_PATH "${TEMP}/data/src/data")
add_models_repo(${ENABLE_DATA} "data:git@github.com:openvinotoolkit/testdata.git")
set(MODELS_PATH "${TEMP}/models/src/data")
set(DATA_PATH "${MODELS_PATH}")
endif()

2
inference-engine/cmake/features_ie.cmake
View File

@ -74,7 +74,7 @@ ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performan
ie_dependent_option (ENABLE_MYRIAD_MVNC_TESTS "functional and behavior tests for mvnc api" OFF "ENABLE_TESTS;ENABLE_MYRIAD" OFF)
ie_dependent_option (ENABLE_DATA "fetch models from open-source-data repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF)
ie_dependent_option (ENABLE_DATA "fetch models from testdata repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF)
ie_dependent_option (ENABLE_SAME_BRANCH_FOR_MODELS "uses same branch for models and for inference engine, if not enabled models are taken from master" OFF "ENABLE_TESTS" OFF)

13
inference-engine/cmake/models.cmake
View File

@ -68,17 +68,14 @@ function (fetch_models_and_validation_set)
string(REPLACE ":" ";" MODEL_CONFIG_LST ${loop_var})
list(GET MODEL_CONFIG_LST 0 folder_name)
list(GET MODEL_CONFIG_LST 1 repo_name)
list(GET MODEL_CONFIG_LST 2 branch_name)
list(GET MODEL_CONFIG_LST 1 git_url)
list(GET MODEL_CONFIG_LST 2 repo_name)
list(GET MODEL_CONFIG_LST 3 branch_name)
string(FIND ${folder_name} "model" IS_MODEL)
if(${folder_name} MATCHES "model*")
set(FOLDER_NAME "/models/src")
endif()
add_lfs_repo(
"${folder_name}"
${TEMP}${FOLDER_NAME}/${folder_name}
"git@gitlab-icv.inn.intel.com:${repo_name}"
"${TEMP}/models"
"${git_url}:${repo_name}"
"${branch_name}")
endforeach(loop_var)
endfunction()