Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused and broken strategy matrix #725

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove unused and broken strategy matrix #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a064963
Remove unused strategy matrix
matthiasgoergens Dec 10, 2024
05ab8b6
Merge remote-tracking branch 'origin/master' into matthias/remove-tar…
matthiasgoergens Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ jobs:
timeout-minutes: 30
runs-on: [self-hosted, Linux, X64]

strategy:
matrix:
target: [x86_64-unknown-linux-gnu, riscv32im-unknown-none-elf]
# Exclude the riscv32im-unknown-none-elf target
exclude:
- target: riscv32im-unknown-none-elf

steps:
- uses: actions/checkout@v2
- name: Cargo cache
Expand All @@ -57,11 +50,11 @@ jobs:
env:
RAYON_NUM_THREADS: 2
RUSTFLAGS: "-C opt-level=3"
run: cargo run --package ceno_zkvm --example riscv_opcodes --target ${{ matrix.target }} -- --start 10 --end 11
run: cargo run --package ceno_zkvm --example riscv_opcodes -- --start 10 --end 11

- name: Run fibonacci
env:
RAYON_NUM_THREADS: 8
RUST_LOG: debug
RUSTFLAGS: "-C opt-level=3"
run: cargo run --package ceno_zkvm --bin e2e --target ${{ matrix.target }} -- --platform=sp1 ceno_zkvm/examples/fibonacci.elf
run: cargo run --package ceno_zkvm --bin e2e -- --platform=sp1 ceno_zkvm/examples/fibonacci.elf
8 changes: 0 additions & 8 deletions .github/workflows/lints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ jobs:
timeout-minutes: 30
runs-on: [self-hosted, Linux, X64]

strategy:
matrix:
target: [x86_64-unknown-linux-gnu, riscv32im-unknown-none-elf]
# Exclude the riscv32im-unknown-none-elf target
exclude:
- target: riscv32im-unknown-none-elf

steps:
- uses: actions/checkout@v2
- uses: dtolnay/rust-toolchain@master
Expand Down Expand Up @@ -67,7 +60,6 @@ jobs:

- name: Run clippy
env:
TARGET: ${{ matrix.target }}
RUSTFLAGS: "-Dwarnings"
run: |
cargo check --workspace --all-targets --exclude ceno_rt
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ jobs:
timeout-minutes: 30
runs-on: [self-hosted, Linux, X64]

strategy:
matrix:
target: [x86_64-unknown-linux-gnu, riscv32im-unknown-none-elf]
# Exclude the riscv32im-unknown-none-elf target
exclude:
- target: riscv32im-unknown-none-elf

steps:
- uses: actions/checkout@v2
- uses: dtolnay/rust-toolchain@master
Expand All @@ -61,6 +54,4 @@ jobs:
run: |
cargo make --version || cargo install cargo-make
- name: run test
env:
TARGET: ${{ matrix.target }}
run: cargo make tests
12 changes: 0 additions & 12 deletions Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
[env]
CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
CORE = { script = ["nproc"] }
CUR_TARGET = { script = ['''
if [ -z "${TARGET}" ]; then
TARGET=$(rustc -vV | grep "host" | awk '{print $2}')
echo "${TARGET}"
else
echo "${TARGET}"
fi
'''] }
RAYON_NUM_THREADS = "${CORE}"

[tasks.build]
Expand All @@ -24,8 +16,6 @@ args = [
"--tests",
"--examples",
"--release",
"--target",
"${CUR_TARGET}",
"--workspace",
"--exclude",
"ceno_rt",
Expand Down Expand Up @@ -65,8 +55,6 @@ args = [
"--all-targets",
"--exclude",
"ceno_rt",
"--target",
"${CUR_TARGET}",
"--",
"-D",
"warnings",
Expand Down