Skip to content

Commit 677a993

Browse files
committed
Refactoring to test BLAS MSRV separately
1 parent aac2283 commit 677a993

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,22 @@ jobs:
8585
- uses: rui314/setup-mold@v1
8686
- uses: Swatinem/rust-cache@v2
8787
- name: Install openblas
88-
run: sudo apt-get install libopenblas-dev gfortran libblis-dev
88+
run: sudo apt-get install libopenblas-dev gfortran
8989
- run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}
9090

91+
test-blas-msrv:
92+
name: tests/blas-msrv
93+
steps:
94+
- uses: actions/checkout@v4
95+
- uses: dtolnay/rust-toolchain@master
96+
with:
97+
toolchain: 1.67.0 # BLAS MSRV
98+
- uses: rui314/setup-mold@v1
99+
- uses: Swatinem/rust-cache@v2
100+
- name: Install openblas
101+
run: sudo apt-get install libopenblas-dev gfortran
102+
- run: ./scripts/blas-integ-tests.sh "$FEATURES" 1.67.0
103+
91104
miri:
92105
runs-on: ubuntu-latest
93106
name: miri

scripts/all-tests.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ cargo test -v -p ndarray -p ndarray-rand --release --features "$FEATURES" $QC_FE
2323
# BLAS tests
2424
cargo test -p ndarray --lib -v --features blas
2525
cargo test -p blas-mock-tests -v
26-
if [ "$CHANNEL" = "1.64.0" ]; then
27-
cargo +1.67.0 test -p blas-tests -v --features blas-tests/openblas-system
28-
fi
29-
if [ "$CHANNEL" = "1.64.0" ]; then
30-
cargo +1.67.0 test -p numeric-tests -v --features numeric-tests/test_blas
26+
if [ "$CHANNEL" != "1.64.0" ]; then
27+
./blas-integ-tests "$FEATURES" $CHANNEL
3128
fi
3229

3330
# Examples

scripts/blas-integ-tests.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
set -x
4+
set -e
5+
6+
FEATURES=$1
7+
CHANNEL=$2
8+
9+
# BLAS tests
10+
cargo test -p blas-tests -v --features blas-tests/openblas-system
11+
cargo test -p numeric-tests -v --features numeric-tests/test_blas

0 commit comments

Comments
 (0)