Removed testdata repo usage

ilya-lavrenov · Sep 16, 2023 · fa58ee8 · fa58ee8
1 parent e059a31
commit fa58ee8
Show file tree

Hide file tree

Showing 26 changed files with 24 additions and 399 deletions.
diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -34,12 +34,6 @@ resources:
     name: openvinotoolkit/openvino_contrib
     ref: master
 
-  - repository: testdata
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/testdata
-    ref: master
-
 variables:
   - group: github
 
@@ -83,7 +77,6 @@ jobs:
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
-    MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     BUILD_SAMPLES_DIR: $(WORK_DIR)/build_samples
@@ -216,13 +209,6 @@ jobs:
       echo SourceBranch: $(Build.SourceBranch)
     displayName: 'System info'
 
-
-    # Should be after 'Install dependencies' because Git lfs is not installed
-  - checkout: testdata
-    clean: 'true'
-    lfs: 'true'
-    path: testdata
-
   - task: CMake@1
     inputs:
       # CMake must get Python 3.x version by default

diff --git a/.ci/azure/linux_cuda.yml b/.ci/azure/linux_cuda.yml
@@ -39,12 +39,6 @@ resources:
     name: openvinotoolkit/openvino_contrib
     ref: master
 
-  - repository: testdata
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/testdata
-    ref: master
-
 jobs:
 - job: CUDAPlugin_Lin
   timeoutInMinutes: '60'
@@ -60,7 +54,6 @@ jobs:
     HOME_DIR: $(Agent.HomeDirectory)
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_REPO_DIR: $(REPO_DIR)/../openvino
-    MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     BIN_DIR: $(OPENVINO_REPO_DIR)/bin/intel64/$(BUILD_TYPE)
@@ -137,7 +130,6 @@ jobs:
             -DENABLE_OV_ONNX_FRONTEND=OFF \
             -DENABLE_PYTHON=OFF \
             -DENABLE_TESTS=ON \
-            -DENABLE_DATA=OFF \
             -S /root/repos/openvino \
             -B /root/w/build &&
           cmake --build /root/w/build --parallel --config Release --verbose -- ov_nvidia_func_tests ov_nvidia_unit_tests"

diff --git a/.ci/azure/linux_debian.yml b/.ci/azure/linux_debian.yml
@@ -28,14 +28,6 @@ pr:
     - '*/conformance/*'
     - 'tests/layer_tests/*'
 
-resources:
-  repositories:
-  - repository: testdata
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/testdata
-    ref: master
-
 jobs:
 - job: Lin_Debian
   # About 150% of total time
@@ -50,7 +42,6 @@ jobs:
     VSTS_HTTP_TIMEOUT: 200
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
-    MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     BUILD_SAMPLES_DIR: $(WORK_DIR)/build_samples
@@ -149,12 +140,6 @@ jobs:
       git clone https://github.com/google/gtest-parallel.git
     displayName: 'Install build dependencies'
 
-    # Should be after 'Install dependencies' because Git lfs is not installed
-  - checkout: testdata
-    clean: 'true'
-    lfs: 'true'
-    path: testdata
-
   - task: CMake@1
     inputs:
       # CMake must get Python 3.x version by default
@@ -338,15 +323,9 @@ jobs:
     displayName: 'TEMPLATE FuncTests'
 
   - script: $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineCAPITests.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'IE CAPITests'
 
   - script: $(INSTALL_TEST_DIR)/ov_capi_test --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ov_capi_test.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'OV CAPITests'
 
     # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time

diff --git a/.ci/azure/linux_lohika.yml b/.ci/azure/linux_lohika.yml
@@ -20,7 +20,6 @@ jobs:
 #    VSTS_HTTP_TIMEOUT: 200
 #    BUILD_TYPE: Release
 #    REPO_DIR: $(Build.Repository.LocalPath)
-#    MODELS_PATH: $(REPO_DIR)/../testdata
 #    WORK_DIR: $(Pipeline.Workspace)/_w
 #    BUILD_DIR: $(WORK_DIR)/build
 

diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml
@@ -37,12 +37,6 @@ resources:
     name: openvinotoolkit/openvino_contrib
     ref: master
 
-  - repository: testdata
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/testdata
-    ref: master
-
 variables:
   - group: github
 
@@ -61,7 +55,6 @@ jobs:
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib
-    MODELS_PATH: $(REPO_DIR)/../testdata
     WORK_DIR: $(Pipeline.Workspace)/_w
     BUILD_DIR: $(WORK_DIR)/build
     INSTALL_DIR: $(WORK_DIR)/install_pkg
@@ -109,11 +102,6 @@ jobs:
     submodules: 'true'
     path: openvino_contrib
 
-  - checkout: testdata
-    clean: 'true'
-    lfs: 'true'
-    path: testdata
-
   - script: |
       set -e
       brew install cython automake
@@ -219,17 +207,11 @@ jobs:
 
   - script: |
       $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineCAPITests.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'IE CAPITests'
     enabled: 'false'
 
   - script: |
       $(SETUPVARS) && $(INSTALL_TEST_DIR)/ov_capi_test --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ov_capi_test.xml
-    env:
-      DATA_PATH: $(MODELS_PATH)
-      MODELS_PATH: $(MODELS_PATH)
     displayName: 'IE CAPITests'
     enabled: 'false'
 

diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml
@@ -34,12 +34,6 @@ resources:
     name: openvinotoolkit/openvino_contrib
     ref: master
 
-  - repository: testdata
-    type: github
-    endpoint: openvinotoolkit
-    name: openvinotoolkit/testdata
-    ref: master
-
 jobs:
 - job: Win
   strategy:
@@ -63,7 +57,6 @@ jobs:
     BUILD_TYPE: Release
     REPO_DIR: $(Build.Repository.LocalPath)
     OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)\..\openvino_contrib
-    MODELS_PATH: $(REPO_DIR)\..\testdata
     WORK_DIR: $(Pipeline.Workspace)\_w
     BUILD_DIR: $(WORK_DIR)\build
     BUILD_SAMPLES_DIR: $(WORK_DIR)\build_samples
@@ -130,11 +123,6 @@ jobs:
     submodules: 'true'
     path: openvino_contrib
 
-  - checkout: testdata
-    clean: 'true'
-    lfs: 'true'
-    path: testdata
-
   - script: |
       python -m pip install --upgrade pip
       rem For running Python API tests

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -108,7 +108,7 @@ jobs:
         run: ${{ github.workspace }}/bin/intel64/Release/ov_hetero_func_tests
 
       - name: Run IR frontend tests
-        run: ${{ github.workspace }}/bin/intel64/Release/ov_ir_frontend_tests # --gtest_print_time=1 --gtest_output=xml:${{ github.workspace }}/testdata/TEST-IRFrontend.xml
+        run: ${{ github.workspace }}/bin/intel64/Release/ov_ir_frontend_tests
 
       - name: Run ONNX frontend tests
         run: ${{ github.workspace }}/bin/intel64/Release/ov_onnx_frontend_tests --gtest_filter=-*IE_GPU*

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -46,8 +46,6 @@ jobs:
       LAYER_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/layer_tests
       MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests
       BUILD_DIR: ${{ github.workspace }}/build
-      DATA_PATH: ${{ github.workspace }}/testdata
-      MODELS_PATH: ${{ github.workspace }}/testdata
       OV_TEMP: ${{ github.workspace }}/openvino_temp
       PYTHON_STATIC_ARGS: -m "not dynamic_library"
     steps:
@@ -64,14 +62,6 @@ jobs:
           path: 'openvino_contrib'
           submodules: 'recursive'
 
-      - name: Clone testdata for C API tests
-        uses: actions/checkout@v4
-        with:
-          repository: 'openvinotoolkit/testdata'
-          path: 'testdata'
-          submodules: 'recursive'
-          lfs: 'true'
-
       #
       # Dependencies
       #
@@ -493,8 +483,6 @@ jobs:
       LAYER_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/layer_tests
       MODEL_HUB_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/model_hub_tests
       BUILD_DIR: ${{ github.workspace }}/build
-      DATA_PATH: ${{ github.workspace }}/testdata
-      MODELS_PATH: ${{ github.workspace }}/testdata
       OV_TEMP: ${{ github.workspace }}/openvino_temp
       PYTHON_STATIC_ARGS: -m "not dynamic_library"
 

diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml
@@ -44,8 +44,6 @@ jobs:
       OPENVINO_REPO: ${{ github.workspace }}/openvino
       BUILD_DIR: ${{ github.workspace }}/build
       INSTALL_DIR: ${{ github.workspace }}/install
-      DATA_PATH: ${{ github.workspace }}/testdata
-      MODELS_PATH: ${{ github.workspace }}/testdata
       OV_TEMP: ${{ github.workspace }}/openvino_temp
     steps:
       - name: Clone OpenVINO
@@ -152,7 +150,6 @@ jobs:
       - name: CMake configure
         run: |
           source ${{ env.BUILD_DIR }}/dependencies/conanbuild.sh
-          # TODO: return tests building once GPU plugin migrates to Plugin API 2.0
           cmake \
             -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -166,7 +163,7 @@ jobs:
             -DPYTHON_MODULE_EXTENSION=$(aarch64-linux-gnu-python3-config --extension-suffix) \
             -DPYTHON_LIBRARY=/usr/lib/aarch64-linux-gnu/libc-2.31.so \
             -DPYTHON_INCLUDE_DIR=$(python3 -c "import sysconfig; print(sysconfig.get_path('include'))") \
-            -DENABLE_DATA=OFF \
+            -DENABLE_TESTS=ON \
             -DENABLE_SYSTEM_TBB=ON \
             -DENABLE_SYSTEM_PROTOBUF=ON \
             -DENABLE_SYSTEM_SNAPPY=ON \

diff --git a/.github/workflows/linux_conditional_compilation.yml b/.github/workflows/linux_conditional_compilation.yml
@@ -43,7 +43,6 @@ jobs:
       OPENVINO_REPO: ${{ github.workspace }}/openvino
       OPENVINO_CONTRIB_REPO: ${{ github.workspace }}/openvino_contrib
       BUILD_DIR: ${{ github.workspace }}/build
-      DATA_PATH: ${{ github.workspace }}/testdata
       MODELS_PATH: ${{ github.workspace }}/testdata
       OV_TEMP: ${{ github.workspace }}/openvino_temp
       PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
@@ -54,7 +53,7 @@ jobs:
           path: 'openvino'
           submodules: 'recursive'
 
-      - name: Clone testdata for C API tests
+      - name: Clone test models
         uses: actions/checkout@v3
         with:
           repository: 'openvinotoolkit/testdata'

diff --git a/.github/workflows/linux_debian.yml b/.github/workflows/linux_debian.yml
@@ -48,8 +48,6 @@ jobs:
       INSTALL_DIR: ${{ github.workspace }}/install
       INSTALL_TEST_DIR: ${{ github.workspace }}/install/tests
       LAYER_TESTS_INSTALL_DIR: ${{ github.workspace }}/install/tests/layer_tests
-      DATA_PATH: ${{ github.workspace }}/testdata
-      MODELS_PATH: ${{ github.workspace }}/testdata
       OV_TEMP: ${{ github.workspace }}/openvino_temp
       SAMPLES_INSTALL_DIR: /usr/share/openvino/samples
       PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
@@ -60,14 +58,6 @@ jobs:
           path: 'openvino'
           submodules: 'recursive'
 
-      - name: Clone testdata for C API tests
-        uses: actions/checkout@v4
-        with:
-          repository: 'openvinotoolkit/testdata'
-          path: 'testdata'
-          submodules: 'recursive'
-          lfs: 'true'
-
       - name: Create Directories
         run: |
           mkdir -p ${{ env.BUILD_DIR }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -36,8 +36,6 @@ env:
   SAMPLES_INSTALL_DIR: "${{ github.workspace }}\\install\\samples"
   LAYER_TESTS_INSTALL_DIR: "${{ github.workspace }}\\install\\tests\\layer_tests"
   BUILD_DIR: "${{ github.workspace }}\\build"
-  DATA_PATH: "${{ github.workspace }}\\testdata"
-  MODELS_PATH: "${{ github.workspace }}\\testdata"
   OV_TEMP: "${{ github.workspace }}\\openvino_temp"
   PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
   VCVARSPATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
@@ -62,14 +60,6 @@ jobs:
           path: 'openvino_contrib'
           submodules: 'recursive'
 
-      - name: Clone testdata for C API tests
-        uses: actions/checkout@v4
-        with:
-          repository: 'openvinotoolkit/testdata'
-          path: 'testdata'
-          submodules: 'recursive'
-          lfs: 'true'
-
       #
       # Dependencies
       #
@@ -265,8 +255,6 @@ jobs:
       SAMPLES_INSTALL_DIR: "${{ github.workspace }}\\install\\samples"
       LAYER_TESTS_INSTALL_DIR: "${{ github.workspace }}\\install\\tests\\layer_tests"
       BUILD_DIR: "${{ github.workspace }}\\build"
-      DATA_PATH: "${{ github.workspace }}\\testdata"
-      MODELS_PATH: "${{ github.workspace }}\\testdata"
       PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin"
 
     steps:

diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml
@@ -40,7 +40,6 @@ env:
   LAYER_TESTS_INSTALL_DIR: "${{ github.workspace }}\\install\\tests\\layer_tests"
   BUILD_DIR: "${{ github.workspace }}\\build"
   BUILD_DIR_2: "${{ github.workspace }}\\build_s"
-  DATA_PATH: "${{ github.workspace }}\\testdata"
   MODELS_PATH: "${{ github.workspace }}\\testdata"
   OV_TEMP: "${{ github.workspace }}\\openvino_temp"
   BUILD_TYPE: "Release"
@@ -62,7 +61,7 @@ jobs:
           path: 'openvino'
           submodules: 'recursive'
 
-      - name: Clone testdata for sample test
+      - name: Clone test models
         uses: actions/checkout@v4
         with:
           repository: 'openvinotoolkit/testdata'

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -7,20 +7,6 @@ cmake_policy(SET CMP0054 NEW)
 # TODO: fix it, outside of source dir MO cannot find TBB dependency
 set_temp_directory(TEMP "${CMAKE_SOURCE_DIR}")
 
-if(ENABLE_SAME_BRANCH_FOR_MODELS)
-    branchName(MODELS_BRANCH)
-else()
-    set(MODELS_BRANCH "master")
-endif()
-
-if(ENABLE_DATA)
-    add_models_repo(${ENABLE_DATA} "data:https://github.com/openvinotoolkit/testdata.git")
-    set(MODELS_PATH "${TEMP}/models/src/data")
-    set(DATA_PATH "${MODELS_PATH}")
-endif()
-
-message(STATUS "MODELS_PATH=" ${MODELS_PATH})
-
 fetch_models_and_validation_set()
 
 ## Intel OMP package

diff --git a/cmake/features.cmake b/cmake/features.cmake
@@ -107,8 +107,6 @@ ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performan
 
 ie_dependent_option (ENABLE_FUNCTIONAL_TESTS "functional tests" ON "ENABLE_TESTS" OFF)
 
-ie_dependent_option (ENABLE_DATA "fetch models from testdata repo" ON "ENABLE_FUNCTIONAL_TESTS;NOT ANDROID" OFF)
-
 ie_option (ENABLE_SAMPLES "console samples are part of OpenVINO Runtime package" ON)
 
 set(OPENVINO_EXTRA_MODULES "" CACHE STRING "Extra paths for extra modules to include into OpenVINO build")