Skip to content

Commit

Permalink
Merge branch 'master' into pnnx-convert-diag
Browse files Browse the repository at this point in the history
  • Loading branch information
nihui committed Sep 8, 2023
2 parents 04e0f6f + 695f770 commit 9f9040b
Show file tree
Hide file tree
Showing 162 changed files with 9,767 additions and 5,063 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android-armv7-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
android-armv7:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build
run: |
mkdir build && cd build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-armv7-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
android-armv7-gpu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-armv8-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
android-aarch64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build
run: |
mkdir build && cd build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android-armv8-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
android-aarch64-gpu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
android-aarch64-gpu-ndk-r16b:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: ndk-r16b
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-x64-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
android-x86_64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build
run: |
mkdir build && cd build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-x64-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
android-x86_64-gpu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-x86-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
android-x86:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: build
run: |
mkdir build && cd build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-x86-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
android-x86-gpu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
contents: write # for stefanzweifel/git-auto-commit-action to push code in repo
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-clang-format
id: cache-clang-format
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/elf-riscv32-cpu-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
newlib-rv32imc-gcc:
runs-on: [self-hosted, linux, centos]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

#- name: cache-riscv
#id: cache-riscv
Expand All @@ -49,7 +49,7 @@ jobs:

#- name: checkout-riscv-gnu-toolchain
#if: steps.cache-riscv.outputs.cache-hit != 'true'
#uses: actions/checkout@v3
#uses: actions/checkout@v4
#with:
#repository: riscv/riscv-gnu-toolchain
#path: riscv-gnu-toolchain
Expand All @@ -73,7 +73,7 @@ jobs:

#- name: checkout-riscv-pk
#if: steps.cache-riscv.outputs.cache-hit != 'true'
#uses: actions/checkout@v3
#uses: actions/checkout@v4
#with:
#repository: riscv/riscv-pk
#path: riscv-pk
Expand All @@ -91,7 +91,7 @@ jobs:

#- name: checkout-riscv-isa-sim
#if: steps.cache-riscv.outputs.cache-hit != 'true'
#uses: actions/checkout@v3
#uses: actions/checkout@v4
#with:
#repository: riscv/riscv-isa-sim
#path: riscv-isa-sim
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/elf-riscv64-cpu-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
newlib-rv64gc-gcc:
runs-on: [self-hosted, linux, centos]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

#- name: cache-riscv
#id: cache-riscv
Expand All @@ -49,7 +49,7 @@ jobs:

#- name: checkout-riscv-gnu-toolchain
#if: steps.cache-riscv.outputs.cache-hit != 'true'
#uses: actions/checkout@v3
#uses: actions/checkout@v4
#with:
#repository: riscv/riscv-gnu-toolchain
#path: riscv-gnu-toolchain
Expand All @@ -74,7 +74,7 @@ jobs:

#- name: checkout-riscv-pk
#if: steps.cache-riscv.outputs.cache-hit != 'true'
#uses: actions/checkout@v3
#uses: actions/checkout@v4
#with:
#repository: riscv/riscv-pk
#path: riscv-pk
Expand All @@ -92,7 +92,7 @@ jobs:

#- name: checkout-riscv-isa-sim
#if: steps.cache-riscv.outputs.cache-hit != 'true'
#uses: actions/checkout@v3
#uses: actions/checkout@v4
#with:
#repository: riscv/riscv-isa-sim
#path: riscv-isa-sim
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-arm64-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
ios-iphone-os-gpu:
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
ios-iphone-os:
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-openmp
id: cache-openmp
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-simulator-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
ios-iphone-simulator-gpu:
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-simulator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
ios-iphone-simulator:
runs-on: macos-12
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-openmp
id: cache-openmp
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linux-aarch64-cpu-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
linux-gcc:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -47,7 +47,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
linux-gcc-arm82:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -105,7 +105,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
linux-gcc-arm86:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -163,7 +163,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linux-arm-cpu-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
linux-gcc-arm:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -49,7 +49,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
linux-gcc-armhf:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -107,7 +107,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
linux-gcc-armhf-vfpv3-d16:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -165,7 +165,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux-loongarch64-cpu-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: [self-hosted, linux, centos]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# - name: cache-qemu
# id: cache-qemu
Expand All @@ -45,7 +45,7 @@ jobs:
# key: qemu-loongarch64-install-20230524
# - name: checkout-qemu
# if: steps.cache-qemu.outputs.cache-hit != 'true'
# uses: actions/checkout@v3
# uses: actions/checkout@v4
# with:
# repository: qemu/qemu
# path: qemu
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux-mips-cpu-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
linux-gcc-mipsel:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -49,7 +49,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
linux-gcc-mipsisa32r6el:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: cache-qemu
id: cache-qemu
Expand All @@ -96,7 +96,7 @@ jobs:
sudo apt-get install autoconf automake autotools-dev ninja-build
- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: qemu/qemu
path: qemu
Expand Down
Loading

0 comments on commit 9f9040b

Please sign in to comment.