Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
parrotsky authored Apr 4, 2024
2 parents 898fe16 + dee195d commit 5a1cf25
Show file tree
Hide file tree
Showing 816 changed files with 29,463 additions and 14,862 deletions.
15 changes: 15 additions & 0 deletions .ci/pnnx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -122,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
60 changes: 44 additions & 16 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,52 @@
cmake:
- cmake/**
- toolchains/**
- changed-files:
- any-glob-to-any-file: ['cmake/**', 'toolchains/**']

doc: docs/**
doc:
- changed-files:
- any-glob-to-any-file: docs/**

python: python/**
python:
- changed-files:
- any-glob-to-any-file: python/**

example: examples/**
example:
- changed-files:
- any-glob-to-any-file: examples/**

test: tests/**
test:
- changed-files:
- any-glob-to-any-file: tests/**

tool: tools/**
pnnx: tools/pnnx/**
tool:
- changed-files:
- any-glob-to-any-file: tools/**
pnnx:
- changed-files:
- any-glob-to-any-file: tools/pnnx/**

core: src/*
layer: src/layer/*
core:
- changed-files:
- any-glob-to-any-file: src/*
layer:
- changed-files:
- any-glob-to-any-file: src/layer/*

arm: src/layer/arm/**
loongarch: src/layer/loongarch/**
mips: src/layer/mips/**
riscv: src/layer/riscv/**
vulkan: src/layer/vulkan/**
x86: src/layer/x86/**
arm:
- changed-files:
- any-glob-to-any-file: src/layer/arm/**
loongarch:
- changed-files:
- any-glob-to-any-file: src/layer/loongarch/**
mips:
- changed-files:
- any-glob-to-any-file: src/layer/mips/**
riscv:
- changed-files:
- any-glob-to-any-file: src/layer/riscv/**
vulkan:
- changed-files:
- any-glob-to-any-file: src/layer/vulkan/**
x86:
- changed-files:
- any-glob-to-any-file: src/layer/x86/**
56 changes: 0 additions & 56 deletions .github/workflows/android-armv7-cpu.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/android-armv7-gpu.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/android-armv8-cpu.yml

This file was deleted.

75 changes: 0 additions & 75 deletions .github/workflows/android-armv8-gpu.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/android-x64-cpu.yml

This file was deleted.

Loading

0 comments on commit 5a1cf25

Please sign in to comment.