Skip to content

[IE CMAKE] FIX PATHS #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iefode merged 2 commits into from
May 26, 2020
+8 −11
Merged

[IE CMAKE] FIX PATHS #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c4c9f0
[IE CMAKE] FIX PATHS
iefode May 25, 2020
6bef5a5
Fix problems
iefode May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions inference-engine/cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]:openvinotoolkit/testdata.git")
set(MODELS_PATH "${TEMP}/models/src/data")
set(DATA_PATH "${MODELS_PATH}")
endif()

Expand Down
2 changes: 1 addition & 1 deletion inference-engine/cmake/features_ie.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,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)

Expand Down
13 changes: 5 additions & 8 deletions inference-engine/cmake/models.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
"[email protected]:${repo_name}"
"${TEMP}/models"
"${git_url}:${repo_name}"
"${branch_name}")
endforeach(loop_var)
endfunction()