Removed testdata repo usage

ilya-lavrenov · Sep 16, 2023 · 2af7590 · 2af7590
1 parent 11016a9
commit 2af7590
Show file tree

Hide file tree

Showing 34 changed files with 64 additions and 452 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_arm64.yml b/.ci/azure/linux_arm64.yml
@@ -195,7 +195,6 @@ 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=$(Agent.ToolsDirectory)/Python/$(OV_PYTHON_VERSION)/x64/include/python$(OV_PYTHON_VERSION_MAJOR_MINOR) \
-        -DENABLE_DATA=OFF \
         -DENABLE_TESTS=ON \
         -DENABLE_SYSTEM_TBB=ON \
         -DENABLE_SYSTEM_PROTOBUF=ON \

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
 
@@ -38,13 +37,6 @@ jobs:
   - script: git -C ~/work/openvino checkout -m $(Build.SourceVersion) && git -C ~/work/openvino submodule update --init --recursive
     displayName: checkout
 
-    # Should be after 'Install dependencies' because Git lfs is not installed
-#  - checkout: testdata
-#    clean: 'true'
-#    submodules: 'true'
-#    lfs: 'true'
-#    path: testdata
-
   - script: env -C ~/work ./configreleasenolto.sh
     displayName: CMake
 

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/labeler.yml b/.github/labeler.yml
@@ -17,6 +17,9 @@
 - '.ci/**/*'
 - 'Jenkinsfile'
 
+'github_actions':
+- '.github/workflows/*'
+
 'category: Core':
 - 'src/core/**/*'
 - 'src/common/itt/**/*'

diff --git a/.github/workflows/code_snippets.yml b/.github/workflows/code_snippets.yml
@@ -27,8 +27,7 @@ jobs:
       - name: Clone OpenVINO
         uses: actions/checkout@v4
         with:
-          submodules: recursive
-          lfs: true
+          submodules: 'true'
 
       - name: Install OpenCL
         uses: awalsh128/[email protected]
@@ -38,7 +37,7 @@ jobs:
           version: 3.0
 
       - name: CMake configure
-        run: cmake -DCMAKE_BUILD_TYPE=Release -B build
+        run: cmake -DCMAKE_BUILD_TYPE=Release -DTHREADING=SEQ -B build
 
       - name: Get number of CPU cores
         uses: SimenB/github-actions-cpu-cores@v2

diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: 'true'
 
       - name: Install clang-format-9
         run: |
@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: 'true'
 
       - name: Install ShellCheck
         run: |
@@ -80,7 +80,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: 'true'
 
       - name: Install Clang dependency
         run: |

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Clone OpenVINO
         uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: 'true'
 
       - name: Install dependencies
         run: |
@@ -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,31 +46,20 @@ 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:
       - name: Clone OpenVINO
         uses: actions/checkout@v4
         with:
           path: 'openvino'
-          submodules: 'recursive'
+          submodules: 'true'
 
       - name: Clone OpenVINO Contrib
         uses: actions/checkout@v4
         with:
           repository: 'openvinotoolkit/openvino_contrib'
           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 +482,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"
 
@@ -507,7 +494,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: 'openvino'
-          submodules: 'recursive'
 
       #
       # Dependencies

diff --git a/.github/workflows/linux_android_arm64.yml b/.github/workflows/linux_android_arm64.yml
@@ -55,15 +55,21 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: 'openvino'
-          submodules: 'recursive'
+
+      - name: Init submodules for non vcpkg dependencies
+        run: |
+          pushd ${{ env.OPENVINO_REPO }}
+            git submodule update --init -- ${{ env.OPENVINO_REPO }}/src/plugins
+            git submodule update --init -- ${{ env.OPENVINO_REPO }}/thirdparty/gtest
+            git submodule update --init -- ${{ env.OPENVINO_REPO }}/thirdparty/open_model_zoo
+          popd
 
       - name: Clone VCPKG
         uses: actions/checkout@v4
         with:
           repository: 'microsoft/vcpkg'
           path: 'vcpkg'
           fetch-depth: '0'
-          submodules: 'recursive'
 
       - name: Setup Python 3.11
         uses: actions/setup-python@v4