apply comments - 1

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

Hide file tree

Showing 3 changed files with 8 additions and 333 deletions.
diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
@@ -11,13 +11,13 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf && \
 
 ENV DEBIAN_FRONTEND="noninteractive" \
     TZ="Europe/London" \
-    CCACHE_MAXSIZE=2G \
-    CMAKE_GENERATOR='Ninja Multi-Config' \
-    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' \
-    OPENVINO_REPO=/__w/openvino/openvino/openvino \
-    BUILD_DIR=/__w/openvino/openvino/openvino_build
+    CCACHE_MAXSIZE=2G
+    CMAKE_GENERATOR: 'Ninja Multi-Config'
+    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'
+    OPENVINO_REPO: /__w/openvino/openvino/openvino
+    BUILD_DIR: /__w/openvino/openvino/openvino_build
 
 RUN apt-get update && \
     apt-get install software-properties-common && \

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:
@@ -96,16 +96,6 @@ jobs:
     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:
@@ -137,12 +127,9 @@ 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
@@ -229,67 +216,6 @@ jobs:
 
       - 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 +269,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

diff --git a/.github/workflows/linux_riscv.yml b/.github/workflows/linux_riscv.yml