Merge branch 'Tencent:master' into master

whyb · May 9, 2024 · fe151a8 · fe151a8
2 parents e56cc3a + 08b7d99
commit fe151a8
Show file tree

Hide file tree

Showing 772 changed files with 35,030 additions and 16,737 deletions.
diff --git a/.ci/pnnx.yml b/.ci/pnnx.yml
@@ -52,6 +52,10 @@ jobs:
             torchvision-version: 0.16.0
             torchvision-cache-key: '0_16_0'
 
+          - torch-version: 2.2.1
+            torchvision-version: 0.17.1
+            torchvision-cache-key: '0_17_1'
+
     runs-on:
       pool-name: docker
       container:
@@ -122,6 +126,7 @@ jobs:
     - name: test
       run: |
         export PYTHONUSERBASE=${{ci.workspace}}/torch-${{matrix.torch-version}}
+        export LD_LIBRARY_PATH=${{ci.workspace}}/torchvision-${{matrix.torchvision-version}}-install/lib
         export OMP_NUM_THREADS=1
         export MKL_NUM_THREADS=1
         export MKL_ENABLE_INSTRUCTIONS=SSE4_2
@@ -131,8 +136,9 @@ jobs:
     - name: python-pnnx
       run: |
         export PYTHONUSERBASE=${{ci.workspace}}/torch-${{matrix.torch-version}}
+        export LD_LIBRARY_PATH=${{ci.workspace}}/torchvision-${{matrix.torchvision-version}}-install/lib
         export PNNX_WHEEL_WITHOUT_BUILD=ON
-        cd tools/pnnx
-        cp build/src/pnnx python/pnnx/
+        cd tools/pnnx/python
+        cp ../build/src/pnnx pnnx/
         python3 setup.py install --user
-        pytest python/tests/
+        pytest tests
diff --git a/.ci/test-coverage.yml b/.ci/test-coverage.yml
@@ -187,6 +187,7 @@ jobs:
           - { SSE2: 'ON',  AVX: 'OFF', XOP: 'OFF', F16C: 'OFF', FMA: 'OFF', AVX2: 'OFF', AVX512: 'OFF', AVX512VNNI: 'OFF', AVXVNNI: 'OFF', AVX512BF16: 'OFF', AVX512FP16: 'OFF'}
           - { SSE2: 'ON',  AVX: 'ON',  XOP: 'OFF', F16C: 'OFF', FMA: 'OFF', AVX2: 'OFF', AVX512: 'OFF', AVX512VNNI: 'OFF', AVXVNNI: 'OFF', AVX512BF16: 'OFF', AVX512FP16: 'OFF'}
           - { SSE2: 'ON',  AVX: 'ON',  XOP: 'OFF', F16C: 'ON',  FMA: 'ON',  AVX2: 'ON',  AVX512: 'OFF', AVX512VNNI: 'OFF', AVXVNNI: 'OFF', AVX512BF16: 'OFF', AVX512FP16: 'OFF'}
+          - { SSE2: 'ON',  AVX: 'ON',  XOP: 'OFF', F16C: 'ON',  FMA: 'ON',  AVX2: 'ON',  AVX512: 'ON',  AVX512VNNI: 'OFF', AVXVNNI: 'OFF', AVX512BF16: 'OFF', AVX512FP16: 'OFF'}
           - { SSE2: 'ON',  AVX: 'ON',  XOP: 'OFF', F16C: 'ON',  FMA: 'ON',  AVX2: 'ON',  AVX512: 'ON',  AVX512VNNI: 'ON',  AVXVNNI: 'OFF', AVX512BF16: 'OFF', AVX512FP16: 'OFF'}
 
     runs-on:

diff --git a/.github/workflows/android-armv7-cpu.yml b/.github/workflows/android-armv7-cpu.yml
diff --git a/.github/workflows/android-armv7-gpu.yml b/.github/workflows/android-armv7-gpu.yml
diff --git a/.github/workflows/android-armv8-cpu.yml b/.github/workflows/android-armv8-cpu.yml
diff --git a/.github/workflows/android-armv8-gpu.yml b/.github/workflows/android-armv8-gpu.yml
diff --git a/.github/workflows/android-x64-cpu.yml b/.github/workflows/android-x64-cpu.yml
diff --git a/.github/workflows/android-x64-gpu.yml b/.github/workflows/android-x64-gpu.yml
diff --git a/.github/workflows/android-x86-cpu.yml b/.github/workflows/android-x86-cpu.yml