diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7b9dc459c..b4c5ca60c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh index 16480056b..01dd9abc0 100755 --- a/scripts/all-tests.sh +++ b/scripts/all-tests.sh @@ -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 diff --git a/scripts/blas-integ-tests.sh b/scripts/blas-integ-tests.sh new file mode 100644 index 000000000..5192d67e3 --- /dev/null +++ b/scripts/blas-integ-tests.sh @@ -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