merge from feature/3.3

Author: sdcb

.github/workflows/build-native-nuget.yml

@@ -2,7 +2,7 @@
 on:
   push:
     branches:
-      - master
+      - feature/3.3
     paths:
       - .github/workflows/build-native-nuget.yml
   workflow_dispatch:
@@ -11,48 +11,50 @@ permissions:
   packages: write
 
 env:
-  PADDLE_VERSION: "3.3.0"
+  PADDLE_VERSION: "3.3.1"
 
 jobs:
   build-all:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
-          - { title: win64.mkl,                  rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_mkldnn }
-          - { title: win64.openblas,             rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_openblas }
-          - { title: win64.openblas-noavx,       rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_openblas_noavx }
-          - { title: win64.cu129_cudnn910_sm61,  rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_cu129_cudnn910_sm61 }
-          - { title: win64.cu129_cudnn910_sm75,  rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_cu129_cudnn910_sm75 }
-          - { title: win64.cu129_cudnn910_sm86,  rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_cu129_cudnn910_sm86 }
-          - { title: win64.cu129_cudnn910_sm89,  rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_cu129_cudnn910_sm89 }
-          - { title: win64.cu129_cudnn910_sm120, rid: win-x64, action: paddle-build.yml, artifact: windows-2022_c_cu129_cudnn910_sm120 }
+          - { title: win64.mkl,                  rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_mkldnn }
+          - { title: win64.openblas,             rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_openblas }
+          - { title: win64.openblas-noavx,       rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_openblas_noavx }  
+          - { title: win64.cu118_cudnn89_sm61,   rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu118_cudnn89_sm61 }
+          - { title: win64.cu118_cudnn89_sm75,   rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu118_cudnn89_sm75 }
+          - { title: win64.cu118_cudnn89_sm86,   rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu118_cudnn89_sm86 }
+          - { title: win64.cu118_cudnn89_sm89,   rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu118_cudnn89_sm89 }
+          - { title: win64.cu129_cudnn910_sm61,  rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu129_cudnn910_sm61 }
+          - { title: win64.cu129_cudnn910_sm75,  rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu129_cudnn910_sm75 }
+          - { title: win64.cu129_cudnn910_sm86,  rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu129_cudnn910_sm86 }
+          - { title: win64.cu129_cudnn910_sm89,  rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu129_cudnn910_sm89 }
+          - { title: win64.cu129_cudnn910_sm120, rid: win-x64,     action: paddle-build.yml, artifact: windows-2025_c_cu129_cudnn910_sm120 }
           - { title: linux-x64.openblas,         rid: linux-x64,   action: paddle-build.yml, artifact: ubuntu-22.04_c_openblas }
           - { title: linux-x64.mkl,              rid: linux-x64,   action: paddle-build.yml, artifact: ubuntu-22.04_c_mkldnn }
           - { title: linux-x64,                  rid: linux-x64,   action: paddle-build.yml, artifact: ubuntu-22.04_c_openvino }
           - { title: linux-arm64,                rid: linux-arm64, action: paddle-build.yml, artifact: ubuntu-22.04-arm_c_openblas }
+          - { title: osx-x64,                    rid: osx-x64,     action: paddle-build.yml, artifact: macos-15-intel_c_openblas }
           - { title: osx-arm64,                  rid: osx-arm64,   action: paddle-build.yml, artifact: macos-15_c_openblas }
 
 
     steps:
     - name: Download Artifacts
       env:
-        # NOTE: downloading artifacts from a different repo may require a PAT.
-        # If `github.token` can't access the upstream repo artifacts, create a secret `PADDLE_GH_TOKEN`.
         GH_TOKEN: ${{ github.token }}
       run: |
-        UPSTREAM_REPO="sdcb/Paddle"
-        UPSTREAM_WORKFLOW="build.yml"
         echo "arch=$(echo '${{ matrix.rid }}' | awk -F'-' '{print $NF}')" >> $GITHUB_ENV
-        echo "Fetching latest successful $UPSTREAM_WORKFLOW run of repo $UPSTREAM_REPO (all branches)"
-        RUN_ID=$(gh run list -R "$UPSTREAM_REPO" \
-                  --workflow="$UPSTREAM_WORKFLOW" \
+        echo "Fetching latest successful ${{ matrix.action }} run of branch ${{ github.ref_name }}"
+        RUN_ID=$(gh run list -R ${{ github.repository }} \
+                  --workflow=${{ matrix.action }} \
+                  --branch=${{ github.ref_name }} \
                   --status=success --limit=1 \
                   --json databaseId | jq -r '.[0].databaseId')
         echo "Run id = $RUN_ID"
         
         echo "Download artifact ${{ matrix.artifact }}"
-        gh run download -R "$UPSTREAM_REPO" "$RUN_ID" --name "${{ matrix.artifact }}" --dir paddle_inference_c
+        gh run download -R ${{ github.repository }} $RUN_ID --name ${{ matrix.artifact }} --dir paddle_inference_c
 
         echo "::group::Artifact tree"
         ls -lR paddle_inference_c
@@ -196,12 +198,16 @@ jobs:
         echo NUPKG_PATH="${{ github.workspace }}/nupkgs/${PKG_ID}.${{ env.PADDLE_VERSION }}.${{ github.run_number }}.nupkg" >> $GITHUB_ENV
         
     - name: Upload nupkg artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: nuget-${{ matrix.title }}
         path: ${{ env.NUPKG_PATH }}
         if-no-files-found: error
 
     - name: Push nupkg to Github Packages
       run: |
-        dotnet nuget push ${{ env.NUPKG_PATH }} --source "https://nuget.pkg.github.com/${{ github.repository_owner }}" --api-key "${{ secrets.GITHUB_TOKEN }}" --skip-duplicate
+        dotnet nuget push ${{ env.NUPKG_PATH }} --source "https://nuget.pkg.github.com/${{ github.repository_owner }}" --api-key "${{ secrets.GITHUB_TOKEN }}" --skip-duplicate
+
+    - name: Push nupkg to ProGet
+      run: |
+        dotnet nuget push ${{ env.NUPKG_PATH }} --source "https://proget.starworks.cc:88/nuget/test/v3/index.json" --api-key "${{ secrets.PROGET_API_KEY }}" --skip-duplicate --timeout 21600

.github/workflows/main.yml

@@ -1,75 +1,35 @@
 name: main
 on:
   push:
-    branches: [master]
-    paths: [src/**, tests/**, .github/workflows/main.yml]
+    branches:
+      - master
+      - feature/3.3
+    paths:
+      - src/**
+      - tests/**
+      - .github/workflows/main.yml
   workflow_dispatch:
-
-env:
-  TEST_PROJECTS: "Sdcb.PaddleInference.Tests \
-                  Sdcb.PaddleNLP.Lac.Tests \
-                  Sdcb.PaddleOCR.Tests \
-                  Sdcb.RotationDetector.Tests"
-
+  
 jobs:
-  build:
-    runs-on: macos-15
+  run:
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      matrix:
+        runs-on: [windows-2022, ubuntu-22.04, ubuntu-22.04-arm, macos-15]
+        # runs-on: [windows-2022, ubuntu-22.04, ubuntu-22.04-arm, macos-15, macos-15-intel]
+      fail-fast: false
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Setup NuGet Source
       run: |
         dotnet nuget add source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" --name github --username ${{ github.repository_owner }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text
-        dotnet nuget list source 
+        dotnet nuget list source
 
     - name: Build code
       run: dotnet build -c Debug -p:Optimize=true
 
-    - name: Create test artifacts
-      run: |
-        for proj in ${{ env.TEST_PROJECTS }}; do
-          echo "::group::Create artifacts for $proj"
-          mkdir -p test-artifacts/$proj
-          mv tests/$proj/bin/Debug/net10.0/* test-artifacts/$proj/
-          echo "::endgroup::"
-        done
-
-    - name: Compress test artifacts
-      run: |
-        7z a -t7z -mx=1 -ms=on -mmt=on test-artifacts.7z test-artifacts
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: test-artifacts
-        compression-level: 0
-        path: test-artifacts.7z
-
-  run:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-2022, windows-2025,
-             ubuntu-22.04, ubuntu-24.04,
-             ubuntu-22.04-arm, ubuntu-24.04-arm,
-             macos-14, macos-15]
-    needs: build
-    steps:
-    - uses: actions/download-artifact@v4
-      with:
-        name: test-artifacts
-
-    - name: Extract test artifacts
-      shell: bash
-      run: |
-        7z x test-artifacts.7z
-        ls -lR test-artifacts
-
     - name: Test
       shell: bash
       run: |
-        for proj in ${{ env.TEST_PROJECTS }}; do
-          echo "::group::Run $proj"
-          dotnet test --verbosity detailed ./test-artifacts/$proj/$proj.dll
-          echo "::endgroup::"
-        done
+        dotnet test -c Debug --no-build --verbosity normal -p:Optimize=true --filter 'Category!=WindowsOnly'
+        # dotnet test ./tests/Sdcb.PaddleOCR.Tests/Sdcb.PaddleOCR.Tests.csproj -c Debug --no-build --verbosity normal --filter 'FullyQualifiedName~OnlineModelsTest'