Port cc 10126 (#13955)

* Add the second step of CC * Fixed linux path
2022-11-14 00:34:02 +04:00 · 2022-11-14 00:34:02 +04:00 · e4b21aa1ff
commit e4b21aa1ff
parent 9ebbfbbed0
2 changed files with 144 additions and 15 deletions
--- a/.ci/azure/linux_conditional_compilation.yml
+++ b/.ci/azure/linux_conditional_compilation.yml
@ -24,6 +24,13 @@ pr:
    - README.md
    - /**/layer_tests_summary/**

+resources:
+  repositories:
+  - repository: testdata
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/testdata
+
 jobs:
 - job: LinCC
  # About 150% of total time
@ -100,6 +107,11 @@ jobs:
    workingDirectory: $(WORK_DIR)
    displayName: 'Install dependencies'

+  - checkout: testdata
+    clean: true
+    lfs: true
+    path: testdata
+
  - task: CMake@1
    inputs:
      cmakeArgs: >
@ -111,19 +123,70 @@ jobs:
        -DENABLE_PROFILING_ITT=ON
        -DSELECTIVE_BUILD=COLLECT
        -DPYTHON_EXECUTABLE=$(WORK_DIR)/.venv/bin/python3.10
+        -DENABLE_CLDNN=OFF
+        -DENABLE_INTEL_GPU=OFF
+        -DENABLE_MULTI=OFF
+        -DENABLE_AUTO=OFF
+        -DENABLE_AUTO_BATCH=OFF
+        -DENABLE_HETERO=OFF
+        -DENABLE_TEMPLATE=OFF
+        -DENABLE_INTEL_MYRIAD=OFF
+        -DENABLE_INTEL_MYRIAD_COMMON=OFF
+        -DENABLE_TESTS=OFF
+        -DENABLE_OV_ONNX_FRONTEND=OFF
+        -DENABLE_OV_PADDLE_FRONTEND=OFF
+        -DENABLE_OV_TF_FRONTEND=OFF
        $(REPO_DIR)
      workingDirectory: $(BUILD_DIR)

-  - script: ninja
+  - script: |
+      ninja
+      cmake --build . --target sea_itt_lib
    workingDirectory: $(BUILD_DIR)
-    displayName: 'Build LinCC'
+    displayName: 'Build LinCC COLLECT'

  - script: ls -alR $(REPO_DIR)/bin/
    displayName: 'List bin files'

-  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Install'
+  - script: |
+      python3 thirdparty/itt_collector/runtool/sea_runtool.py --bindir $(REPO_DIR)/bin/intel64/Release -o $(BUILD_DIR)/itt_stat ! $(REPO_DIR)/bin/intel64/Release/benchmark_app -niter 1 -nireq 1 -m $(MODELS_PATH)/models/test_model/test_model_fp32.xml -d CPU
+    workingDirectory: $(REPO_DIR)
+    displayName: 'Code usage analysis'

-  - script: ls -alR $(INSTALL_DIR)
-    displayName: 'List install files'
+  - task: CMake@1
+    inputs:
+      cmakeArgs: >
+        -GNinja
+        -DVERBOSE_BUILD=ON
+        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
+        -DENABLE_FASTER_BUILD=ON
+        -DENABLE_PROFILING_ITT=OFF
+        -DENABLE_CLDNN=OFF
+        -DENABLE_INTEL_GPU=OFF
+        -DENABLE_MULTI=OFF
+        -DENABLE_AUTO=OFF
+        -DENABLE_AUTO_BATCH=OFF
+        -DENABLE_HETERO=OFF
+        -DENABLE_TEMPLATE=OFF
+        -DENABLE_INTEL_MYRIAD=OFF
+        -DENABLE_INTEL_MYRIAD_COMMON=OFF
+        -DENABLE_TESTS=OFF
+        -DENABLE_OV_ONNX_FRONTEND=OFF
+        -DENABLE_OV_PADDLE_FRONTEND=OFF
+        -DENABLE_OV_TF_FRONTEND=OFF
+        -DSELECTIVE_BUILD=ON
+        -DSELECTIVE_BUILD_STAT=$(BUILD_DIR)/*.csv
+        $(REPO_DIR)
+      workingDirectory: $(BUILD_DIR)
+
+  - script: cmake --build .
+    workingDirectory: $(BUILD_DIR)
+    displayName: 'Build LinCC ON'
+
+  - script: ls -alR $(REPO_DIR)/bin/
+    displayName: 'List bin files ON'
+  # TODO: ebable after the fix on CPU side
+  # - script: |
+  #     $(REPO_DIR)/bin/intel64/Release/benchmark_app -niter 1 -nireq 1 -m $(MODELS_PATH)/models/test_model/test_model_fp32.xml -d CPU
+  #   workingDirectory: $(REPO_DIR)
+  #   displayName: 'Use OpenVINO after CC'
--- a/.ci/azure/windows_conditional_compilation.yml
+++ b/.ci/azure/windows_conditional_compilation.yml
@ -24,10 +24,17 @@ pr:
    - README.md
    - /**/layer_tests_summary/**

+resources:
+  repositories:
+  - repository: testdata
+    type: github
+    endpoint: openvinotoolkit
+    name: openvinotoolkit/testdata
+
 jobs:
 - job: WinCC
  # About 150% of total time
-  timeoutInMinutes: 60
+  timeoutInMinutes: 120

  pool:
    name: WIN_VMSS_VENV_F8S_WU2
@ -41,6 +48,7 @@ jobs:
    MODELS_PATH: $(REPO_DIR)\..\testdata
    WORK_DIR: $(Pipeline.Workspace)\_w
    BUILD_DIR: $(WORK_DIR)\build
+    BUILD_DIR_2: $(WORK_DIR)\build_s
    MSVS_VARS_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
    MSVC_COMPILER_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx64\x64\cl.exe
    INSTALL_DIR: $(WORK_DIR)\install_pkg
@ -63,6 +71,7 @@ jobs:
  - script: |
      rd /Q /S $(WORK_DIR) & mkdir $(WORK_DIR)
      rd /Q /S $(BUILD_DIR) & mkdir $(BUILD_DIR)
+      rd /Q /S $(BUILD_DIR_2) & mkdir $(BUILD_DIR_2)
    displayName: 'Make dir'

  - checkout: self
@ -78,6 +87,11 @@ jobs:
    workingDirectory: $(WORK_DIR)
    displayName: 'Install dependencies'

+  - checkout: testdata
+    clean: true
+    lfs: true
+    path: testdata
+
  - script: |
      set PATH=$(WORK_DIR)\ninja-win;%PATH%
      call "$(MSVS_VARS_PATH)" && cmake -GNinja ^
@ -88,6 +102,19 @@ jobs:
        -DSELECTIVE_BUILD=COLLECT ^
        -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^
        -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^
+        -DENABLE_CLDNN=OFF ^
+        -DENABLE_INTEL_GPU=OFF ^
+        -DENABLE_MULTI=OFF ^
+        -DENABLE_AUTO=OFF ^
+        -DENABLE_AUTO_BATCH=OFF ^
+        -DENABLE_HETERO=OFF ^
+        -DENABLE_TEMPLATE=OFF ^
+        -DENABLE_INTEL_MYRIAD=OFF ^
+        -DENABLE_INTEL_MYRIAD_COMMON=OFF ^
+        -DENABLE_TESTS=OFF ^
+        -DENABLE_OV_ONNX_FRONTEND=OFF ^
+        -DENABLE_OV_PADDLE_FRONTEND=OFF ^
+        -DENABLE_OV_TF_FRONTEND=OFF ^
        $(REPO_DIR)
    workingDirectory: $(BUILD_DIR)
    displayName: 'CMake'
@ -95,16 +122,55 @@ jobs:
  - script: dir $(REPO_DIR)\temp\ /s
    displayName: 'List temp SDKs'

-  - script: call "$(MSVS_VARS_PATH)" && $(WORK_DIR)\ninja-win\ninja
+  - script: |
+      call "$(MSVS_VARS_PATH)" && cmake --build . --config $(BUILD_TYPE) && cmake --build . --config $(BUILD_TYPE) --target sea_itt_lib
    workingDirectory: $(BUILD_DIR)
-    displayName: 'Build Win CC'
+    displayName: 'Build Win CC COLLECT'

  - script: dir $(REPO_DIR)\bin\ /s
    displayName: 'List bin files'

-  - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P cmake_install.cmake
-    workingDirectory: $(BUILD_DIR)
-    displayName: 'Install'
+  - script: |
+      call "$(MSVS_VARS_PATH)" && python thirdparty\itt_collector\runtool\sea_runtool.py --bindir $(REPO_DIR)\bin\intel64\$(BUILD_TYPE) -o $(BUILD_DIR)\itt_stat ! $(REPO_DIR)\bin\intel64\$(BUILD_TYPE)\benchmark_app.exe -niter 1 -nireq 1 -m $(MODELS_PATH)\models\test_model\test_model_fp32.xml -d CPU
+    workingDirectory: $(REPO_DIR)
+    displayName: 'Code usage analysis'

-  - script: dir $(INSTALL_DIR) /s
-    displayName: 'List install files'
+  - script: |
+      call "$(MSVS_VARS_PATH)" && cmake -G"Visual Studio 16 2019" ^
+        -DVERBOSE_BUILD=ON ^
+        -DENABLE_FASTER_BUILD=ON ^
+        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^
+        -DENABLE_PROFILING_ITT=OFF ^
+        -DSELECTIVE_BUILD=ON ^
+        -DSELECTIVE_BUILD_STAT=$(BUILD_DIR)\*.csv ^
+        -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^
+        -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" ^
+        -DENABLE_CLDNN=OFF ^
+        -DENABLE_INTEL_GPU=OFF ^
+        -DENABLE_MULTI=OFF ^
+        -DENABLE_AUTO=OFF ^
+        -DENABLE_AUTO_BATCH=OFF ^
+        -DENABLE_HETERO=OFF ^
+        -DENABLE_TEMPLATE=OFF ^
+        -DENABLE_INTEL_MYRIAD=OFF ^
+        -DENABLE_INTEL_MYRIAD_COMMON=OFF ^
+        -DENABLE_TESTS=OFF ^
+        -DENABLE_OV_ONNX_FRONTEND=OFF ^
+        -DENABLE_OV_PADDLE_FRONTEND=OFF ^
+        -DENABLE_OV_TF_FRONTEND=OFF ^
+        $(REPO_DIR)
+    workingDirectory: $(BUILD_DIR_2)
+    displayName: 'CMake2'
+
+  - script: cmake --build . --config $(BUILD_TYPE)
+    workingDirectory: $(BUILD_DIR_2)
+    displayName: 'Build WinCC ON'
+
+  - script: dir $(REPO_DIR)\bin\ /s
+    displayName: 'List bin files ON'
+
+  # TODO: Enable after the fix on CPU side
+  # - script: |
+  #     $(REPO_DIR)\bin\intel64\$(BUILD_TYPE)\benchmark_app.exe -niter 1 -nireq 1 -m $(MODELS_PATH)\models\test_model\test_model_fp32.xml -d CPU
+  #   workingDirectory: $(REPO_DIR)
+  #   displayName: 'Use OpenVINO after CC'