Merge branch 'master' into vkDeviceWaitIdle

Tencent · Apr 1, 2024 · f21ec97 · f21ec97
2 parents 6ffb1f8 + 6872cca
commit f21ec97
Show file tree

Hide file tree

Showing 1,410 changed files with 119,196 additions and 51,777 deletions.
diff --git a/.ci/linux-x64-cpu-gcc.yml b/.ci/linux-x64-cpu-gcc.yml
@@ -117,3 +117,11 @@ jobs:
         cmake --build . -j $(nproc)
     - name: test-simplestl-simpleomp
       run: cd build-simplestl-simpleomp && ctest --output-on-failure -j $(nproc)
+    - name: build-simplestl-simplemath
+      run: |
+        mkdir build-simplestl-simplemath && cd build-simplestl-simplemath
+        cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/host-c.gcc.toolchain.cmake -DNCNN_STDIO=ON -DNCNN_STRING=ON -DNCNN_SIMPLESTL=ON -DNCNN_SIMPLEMATH=ON -DNCNN_BUILD_TESTS=ON -DNCNN_BUILD_BENCHMARK=OFF -DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF ..
+        cmake --build . -j $(nproc)
+    - name: test-simplestl-simplemath
+      run: cd build-simplestl-simplemath && ctest --output-on-failure -j $(nproc)
+
diff --git a/.ci/pnnx.yml b/.ci/pnnx.yml
@@ -48,6 +48,14 @@ jobs:
             torchvision-version: 0.15.1
             torchvision-cache-key: '0_15_1'
 
+          - torch-version: 2.1.0
+            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:
@@ -118,8 +126,19 @@ 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
         cd tools/pnnx
         cd build && ctest --output-on-failure -j 16
+
+    - 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/python
+        cp ../build/src/pnnx pnnx/
+        python3 setup.py install --user
+        pytest tests