Skip to content

Commit 4296b7c

Browse files
committed
Refactoring to test BLAS MSRV separately
1 parent b96c541 commit 4296b7c

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,21 @@ 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+
name: tests/blas-msrv
92+
steps:
93+
- uses: actions/checkout@v4
94+
- uses: dtolnay/rust-toolchain@master
95+
with:
96+
toolchain: 1.67.0 # BLAS MSRV
97+
- uses: rui314/setup-mold@v1
98+
- uses: Swatinem/rust-cache@v2
99+
- name: Install openblas
100+
run: sudo apt-get install libopenblas-dev gfortran
101+
- run: ./scripts/blas-integ-tests.sh "$FEATURES" 1.67.0
102+
91103
cross_test:
92104
#if: ${{ github.event_name == 'merge_group' }}
93105
runs-on: ubuntu-latest

scripts/all-tests.sh

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

3128
# 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)