diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake index dd76476a1ff27b..368adc85a43d7a 100644 --- a/inference-engine/cmake/dependencies.cmake +++ b/inference-engine/cmake/dependencies.cmake @@ -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() diff --git a/inference-engine/cmake/features_ie.cmake b/inference-engine/cmake/features_ie.cmake index bfdfdd69e6702c..cd8fc8f612cdb0 100644 --- a/inference-engine/cmake/features_ie.cmake +++ b/inference-engine/cmake/features_ie.cmake @@ -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) diff --git a/inference-engine/cmake/models.cmake b/inference-engine/cmake/models.cmake index cb705dc1e1aa7a..0f55d6a5a3148f 100644 --- a/inference-engine/cmake/models.cmake +++ b/inference-engine/cmake/models.cmake @@ -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()