Skip to content

Commit

Permalink
Refactoring to test BLAS MSRV separately
Browse files Browse the repository at this point in the history
  • Loading branch information
akern40 committed Nov 29, 2024
1 parent b96c541 commit 4296b7c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 6 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,21 @@ jobs:
- uses: rui314/setup-mold@v1
- uses: Swatinem/rust-cache@v2
- name: Install openblas
run: sudo apt-get install libopenblas-dev gfortran libblis-dev
run: sudo apt-get install libopenblas-dev gfortran
- run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}

name: tests/blas-msrv
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.67.0 # BLAS MSRV
- uses: rui314/setup-mold@v1
- uses: Swatinem/rust-cache@v2
- name: Install openblas
run: sudo apt-get install libopenblas-dev gfortran
- run: ./scripts/blas-integ-tests.sh "$FEATURES" 1.67.0

cross_test:
#if: ${{ github.event_name == 'merge_group' }}
runs-on: ubuntu-latest
Expand Down
7 changes: 2 additions & 5 deletions scripts/all-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,8 @@ cargo test -v -p ndarray -p ndarray-rand --release --features "$FEATURES" $QC_FE
# BLAS tests
cargo test -p ndarray --lib -v --features blas
cargo test -p blas-mock-tests -v
if [ "$CHANNEL" = "1.64.0" ]; then
cargo +1.67.0 test -p blas-tests -v --features blas-tests/openblas-system
fi
if [ "$CHANNEL" = "1.64.0" ]; then
cargo +1.67.0 test -p numeric-tests -v --features numeric-tests/test_blas
if [ "$CHANNEL" != "1.64.0" ]; then
./blas-integ-tests "$FEATURES" $CHANNEL
fi

# Examples
Expand Down
11 changes: 11 additions & 0 deletions scripts/blas-integ-tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

set -x
set -e

FEATURES=$1
CHANNEL=$2

# BLAS tests
cargo test -p blas-tests -v --features blas-tests/openblas-system
cargo test -p numeric-tests -v --features numeric-tests/test_blas

0 comments on commit 4296b7c

Please sign in to comment.