apply comments - 1

openvinotoolkit · Dec 17, 2024 · f1a8cc5 · f1a8cc5
1 parent 9306714
commit f1a8cc5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 353 deletions.
diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
@@ -11,11 +11,29 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf && \
 
 ENV DEBIAN_FRONTEND="noninteractive" \
     TZ="Europe/London" \
+    # CCACHE PARAMETERS
+    SCCACHE_IGNORE_SERVER_IO_ERROR=1 \
+    SCCACHE_SERVER_PORT=35555 \
+    SCCACHE_ERROR_LOG=/__w/openvino/sccache_log.txt \
+    SCCACHE_LOG=warn \
     CCACHE_MAXSIZE=2G \
+    SCCACHE_AZURE_KEY_PREFIX=ubuntu20_x86_64_Release \
+    CCACHE_DIR=/__w/openvino/openvino/ccache \
+    CCACHE_TEMPDIR=/__w/openvino/openvino/ccache_temp \
+    # DEFAULT CMAKE PARAMETERS
     CMAKE_GENERATOR='Ninja Multi-Config' \
+    CMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    CMAKE_C_COMPILER_LAUNCHER=ccache \
+    # XUANTIE VARS
     XUANTIE_DIR=/__w/openvino/xuantie \
     XUANTIE_BIN_PATH=/mount/testdata1/ \
     XUANTIE_TAR_NAME='Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1' \
+    # OV. DIRECTORIES
+    GITHUB_WORKSPACE='/__w/openvino/openvino' \
+    OPENVINO_REPO=/__w/openvino/openvino/openvino \
+    INSTALL_DIR=/__w/openvino/openvino/openvino_install \
+    INSTALL_TEST_DIR=/__w/openvino/openvino/tests_install \
+    BUILD_DIR=/__w/openvino/openvino/openvino_build \
     OPENVINO_REPO=/__w/openvino/openvino/openvino \
     BUILD_DIR=/__w/openvino/openvino/openvino_build
 

diff --git a/.github/workflows/dev_cpu_linux_riscv.yml b/.github/workflows/dev_cpu_linux_riscv.yml
@@ -1,4 +1,4 @@
-name: Linux developer RISC-V workflow for CPU plugin (Ubuntu 22.04, Python 3.10)
+name: Linux RISC-V CPU workflow with Xuantie (Ubuntu 22.04, Python 3.10)
 on:
   workflow_dispatch:
   pull_request:
@@ -74,42 +74,14 @@ jobs:
         - /mount:/mount
     env:
       CMAKE_BUILD_TYPE: 'Release'
-      CMAKE_GENERATOR: 'Ninja Multi-Config'
-      CMAKE_CXX_COMPILER_LAUNCHER: ccache
-      CMAKE_C_COMPILER_LAUNCHER: ccache
-      SCCACHE_IGNORE_SERVER_IO_ERROR: 1
-      SCCACHE_SERVER_PORT: 35555
-      SCCACHE_ERROR_LOG: /__w/openvino/sccache_log.txt
-      SCCACHE_LOG: warn
-      GITHUB_WORKSPACE: '/__w/openvino/openvino'
-      OPENVINO_REPO: /__w/openvino/openvino/openvino
-      INSTALL_DIR: /__w/openvino/openvino/openvino_install
-      INSTALL_TEST_DIR: /__w/openvino/openvino/tests_install
-      BUILD_DIR: /__w/openvino/openvino/openvino_build
-      SCCACHE_AZURE_KEY_PREFIX: ubuntu20_x86_64_Release
-      XUANTIE_DIR: /__w/openvino/xuantie
       CCACHE_REMOTE_DIR: /mount/caches/ccache/ubuntu22_riscv64/${{ github.base_ref || github.ref_name }}
-      CCACHE_DIR: /__w/openvino/openvino/ccache
-      CCACHE_TEMPDIR: /__w/openvino/openvino/ccache_temp
-      XUANTIE_BIN_PATH: /mount/testdata1/
-      XUANTIE_TAR_NAME: 'Xuantie-900-gcc-linux-5.15.0-glibc-x86_64-V2.8.1'
     if: "!needs.smart_ci.outputs.skip_workflow"
 
     steps:
-      - name: Check docker env
-        run: |
-          echo 'check env'
-          echo ${CCACHE_MAXSIZE}
-          echo ${DEBIAN_FRONTEND}
-          echo ${OPENVINO_REPO}
-          echo ${BUILD_DIR}
-          echo ${XUANTIE_DIR}
-          echo ${CMAKE_GENERATOR}
-
       - name: Clone OpenVINO
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
-          path: ${{ env.OPENVINO_REPO }}
+          path: ${OPENVINO_REPO}
           submodules: 'true'
 
       #
@@ -128,7 +100,7 @@ jobs:
           cache-size: 10
           max-cache-size: 50
           cache-path: ${{ env.CCACHE_REMOTE_DIR }}
-          path: ${{ env.CCACHE_DIR }}
+          path: ${CCACHE_DIR}
           key: ${{ runner.os }}-${{ runner.arch }}-ccache-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-${{ runner.arch }}-ccache
@@ -137,20 +109,17 @@ jobs:
         run: |
           mkdir ${XUANTIE_DIR}
           pushd ${XUANTIE_DIR}
-            ls -la ${XUANTIE_BIN_PATH}
             cp ${XUANTIE_BIN_PATH}${XUANTIE_TAR_NAME}.tar ${XUANTIE_DIR}
-            ls -la ${XUANTIE_DIR}
             tar -xf ${XUANTIE_TAR_NAME}.tar
             chmod -R 777 ${XUANTIE_TAR_NAME}
-            ls -la ${XUANTIE_TAR_NAME}/libexec/gcc/riscv64-unknown-linux-gnu/10.4.0/
             python3 -m pip install --upgrade pip setuptools wheel
             ln -s /usr/include/riscv64-linux-gnu/ /usr/include/python3.10/
           popd
 
       - name: CMake configure - OpenVINO - 2
         run: |
           cmake \
-            -G "${{ env.CMAKE_GENERATOR }}" \
+            -G "${CMAKE_GENERATOR}" \
             -DENABLE_CPPLINT=OFF \
             -DENABLE_NCC_STYLE=OFF \
             -DENABLE_TESTS=ON \
@@ -167,8 +136,8 @@ jobs:
             -DCMAKE_VERBOSE_MAKEFILE=ON \
             -DCPACK_GENERATOR=TGZ \
             -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=${{ env.CMAKE_CXX_COMPILER_LAUNCHER }} \
-            -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CMAKE_C_COMPILER_LAUNCHER }} \
+            -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} \
+            -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} \
             -S ${OPENVINO_REPO} \
             -B ${BUILD_DIR}
 
@@ -200,96 +169,35 @@ jobs:
         if: always()
         with:
           name: xuantie
-          path: ${{ env.XUANTIE_DIR }}
+          path: ${XUANTIE_DIR}
           if-no-files-found: 'ignore'
 
       - name: Upload build logs
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         if: always()
         with:
           name: build_logs
-          path: ${{ env.SCCACHE_ERROR_LOG }}
+          path: ${SCCACHE_ERROR_LOG}
           if-no-files-found: 'ignore'
 
       - name: Upload openvino package
         if: ${{ always() }}
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: openvino_package
-          path: ${{ env.BUILD_DIR }}/openvino_package.tar.gz
+          path: ${BUILD_DIR}/openvino_package.tar.gz
           if-no-files-found: 'error'
 
       - name: Upload openvino tests package
         if: ${{ always() }}
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: openvino_tests
-          path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
+          path: ${BUILD_DIR}/openvino_tests.tar.gz
           if-no-files-found: 'error'
 
       - name: Clean ccache
         run: ccache --cleanup
-  # Pre_Build_2:
-  #   needs: [Docker, Smart_CI, Build]
-  #   runs-on: aks-linux-8-cores-32gb
-  #   container:
-  #     image: ${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_22_04_riscv }}
-  #     volumes:
-  #       - /mount:/mount
-  #   steps:
-  #     - name: smth
-  #       run: |
-  #           echo ${OPENVINO_REPO}/cmake/toolchains/riscv64-071-xuantie-gnu.toolchain.cmake
-  #           echo ${XUANTIE_DIR}/${XUANTIE_TAR_NAME}
-  # Build_2:
-    # needs: [Docker, Smart_CI, Build]
-    # uses: ./.github/workflows/job_build_linux.yml
-    # with:
-    #   runner: 'aks-linux-16-cores-32gb'
-    #   container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_22_04_riscv }}", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
-    #   affected-components: ${{ needs.smart_ci.outputs.affected_components }}
-    #   event-name: ${{ github.event_name }}
-    #   os: 'ubuntu_22_04'
-    #   build-js: false
-    #   build-contrib: false
-    #   build-debian-packages: true
-    #   build-rpm-packages: false
-    #   cmake-options: |-
-    #         -G ${CMAKE_GENERATOR} \
-    #         -DENABLE_CPPLINT=OFF \
-    #         -DENABLE_NCC_STYLE=OFF \
-    #         -DENABLE_TESTS=ON \
-    #         -DENABLE_INTEL_CPU=ON \
-    #         -DENABLE_INTEL_GPU=OFF \
-    #         -DENABLE_INTEL_NPU=OFF \
-    #         -DENABLE_SAMPLES=ON \
-    #         -DCMAKE_TOOLCHAIN_FILE=${OPENVINO_REPO}/cmake/toolchains/riscv64-071-xuantie-gnu.toolchain.cmake \
-    #         -DRISCV_TOOLCHAIN_ROOT=${XUANTIE_DIR}/${XUANTIE_TAR_NAME} \
-    #         -DENABLE_PYTHON=ON \
-    #         -DENABLE_PYTHON_PACKAGING=ON \
-    #         -DENABLE_WHEEL=ON \
-    #         -DENABLE_STRICT_DEPENDENCIES=OFF \
-    #         -DCMAKE_VERBOSE_MAKEFILE=ON \
-    #         -DCPACK_GENERATOR=TGZ \
-    #         -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
-    #         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-    #         -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-    #         -S ${OPENVINO_REPO} \
-    #         -B ${BUILD_DIR}
-  # Build_2:
-  #   needs: [Docker, Smart_CI, Build]
-  #   runs-on: aks-linux-8-cores-32gb
-  #   container:
-  #     image: ${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_22_04_riscv }}
-  #     volumes:
-  #       - /mount:/mount
-  #   steps:
-  #     - name: smth
-  #       run: |
-  #           echo ${OPENVINO_REPO} && \
-  #           echo ${BUILD_DIR} && \
-  #           echo ${XUANTIE_DIR} && \
-  #           echo ${CMAKE_GENERATOR}
 
   CPU_Functional_Tests:
     name: CPU functional tests
@@ -343,7 +251,6 @@ jobs:
 
           pushd $INSTALL_TEST_DIR
             tar -xzf openvino_tests.tar.gz -C $INSTALL_TEST_DIR
-            ls -la $INSTALL_TEST_DIR/tests
           popd
 
       - name: Intel CPU plugin func tests