From cef2e589d11830a16dc311767aba764d6146eecc Mon Sep 17 00:00:00 2001 From: james Date: Tue, 19 May 2026 16:55:34 +0800 Subject: [PATCH 1/3] use cann image Signed-off-by: james --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f693d56..ee65a7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,8 @@ jobs: build-vnpu: runs-on: ubuntu-22.04-arm container: - image: ghcr.io/dsfans2014/ascend-device-plugin/ascend-lib:0.2 + image: ascendai/cann:8.3.rc2 + steps: - uses: actions/checkout@v4 with: From 393a8223ff345ef494836974b5b22df0daa5a153 Mon Sep 17 00:00:00 2001 From: james Date: Tue, 19 May 2026 17:30:15 +0800 Subject: [PATCH 2/3] support x86 Signed-off-by: james --- .github/workflows/ci.yml | 25 ++++++++++++++++++------- Dockerfile | 3 ++- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee65a7c..221f46b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,14 @@ env: jobs: build-vnpu: - runs-on: ubuntu-22.04-arm + strategy: + matrix: + platform: + - { runner: "ubuntu-22.04-arm", arch: "arm64"} + - { runner: "ubuntu-22.04", arch: "amd64"} + runs-on: ${{ matrix.platform.runner }} container: - image: ascendai/cann:8.3.rc2 + image: ascendai/cann:8.5.1 steps: - uses: actions/checkout@v4 @@ -38,11 +43,11 @@ jobs: mkdir -p ./artifacts cp libvnpu/target/release/limiter ./artifacts/ cp libvnpu/target/release/libvnpu.so ./artifacts/ - echo "/hami-vnpu-core/libvnpu.so" > ./artifacts/ld.so.preload + echo "/usr/local/hami-vnpu-core-assets/libvnpu.so" > ./artifacts/ld.so.preload - name: upload artifacts uses: actions/upload-artifact@v4 with: - name: build-artifacts + name: build-artifacts-${{ matrix.platform.arch }} if-no-files-found: error path: ./artifacts/* @@ -61,11 +66,17 @@ jobs: id: branch-names uses: tj-actions/branch-names@v8 - - name: Download Artifacts + - name: Download ARM64 Artifacts uses: actions/download-artifact@v4 with: - name: build-artifacts - path: ./lib/hami-vnpu-core/ + name: build-artifacts-arm64 + path: ./lib/hami-vnpu-core/arm64/ + + - name: Download AMD64 Artifacts + uses: actions/download-artifact@v4 + with: + name: build-artifacts-amd64 + path: ./lib/hami-vnpu-core/amd64/ - name: Docker Login if: ${{ github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main') }} diff --git a/Dockerfile b/Dockerfile index 5295ce8..356efd7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,10 @@ RUN go get huawei.com/npu-exporter/utils/logger@v0.0.0-00010101000000-0000000000 RUN make all FROM $BASE_IMAGE +ARG TARGETARCH ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64:/usr/local/Ascend/driver/lib64/driver:/usr/local/Ascend/driver/lib64/common COPY --from=build /build/ascend-device-plugin /usr/local/bin/ascend-device-plugin -COPY --from=build /build/lib/hami-vnpu-core/* /usr/local/hami-vnpu-core-assets/ +COPY --from=build /build/lib/hami-vnpu-core/${TARGETARCH}/* /usr/local/hami-vnpu-core-assets/ RUN chmod +x /usr/local/hami-vnpu-core-assets/limiter ENTRYPOINT ["ascend-device-plugin"] From e9438c0385feafe149ff2879d0350fe9716377ce Mon Sep 17 00:00:00 2001 From: james Date: Fri, 22 May 2026 14:05:51 +0800 Subject: [PATCH 3/3] update libvnpu Signed-off-by: james --- libvnpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvnpu b/libvnpu index 32b3bd8..ddd0ae0 160000 --- a/libvnpu +++ b/libvnpu @@ -1 +1 @@ -Subproject commit 32b3bd821e0c513185e8b8657adb4feec9af825b +Subproject commit ddd0ae003800c884c7a6f718dfad5e9d0dc3393e