Skip to content

Commit 84750c7

Browse files
committed
BLAS still needs 1.71.0, whoops
1 parent b06e190 commit 84750c7

File tree

4 files changed

+37
-4
lines changed

4 files changed

+37
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,20 @@ env:
1313
FEATURES: "approx,serde,rayon"
1414
RUSTFLAGS: "-D warnings"
1515
MSRV: 1.64.0
16+
BLAS_MSRV: 1.71.0
1617

1718
jobs:
1819
pass-msrv:
1920
runs-on: ubuntu-latest
21+
name: Pass MSRV values to other jobs
2022
outputs:
2123
MSRV: ${{ env.MSRV }}
24+
BLAS_MSRV: ${{ env.BLAS_MSRV }}
2225
steps:
2326
- name: Pass MSRV
24-
run: echo "MSRV=${{ env.MSRV }}" >> $GITHUB_OUTPUT
27+
run: |
28+
echo "MSRV=${{ env.MSRV }}" >> $GITHUB_OUTPUT
29+
echo "BLAS_MSRV=${{ env.BLAS_MSRV }}" >> $GITHUB_OUTPUT
2530
2631
clippy:
2732
runs-on: ubuntu-latest
@@ -97,6 +102,23 @@ jobs:
97102
- name: Install openblas
98103
run: sudo apt-get install libopenblas-dev gfortran
99104
- run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}
105+
106+
blas-msrv:
107+
runs-on: ubuntu-latest
108+
name: blas-msrv
109+
needs: pass-msrv
110+
steps:
111+
- uses: actions/checkout@v4
112+
- uses: dtolnay/rust-toolchain@master
113+
with:
114+
toolchain: ${{ needs.pass-msrv.outputs.BLAS_MSRV }}
115+
- uses: rui314/setup-mold@v1
116+
- uses: Swatinem/rust-cache@v2
117+
- name: Install openblas
118+
run: sudo apt-get install libopenblas-dev gfortran
119+
- run: cargo tree -p blas-tests -i openblas-src -F blas-tests/openblas-system
120+
- run: cargo tree -p blas-tests -i openblas-build -F blas-tests/openblas-system
121+
- run: ./scripts/blas-integ-tests.sh $BLAS_MSRV
100122

101123
miri:
102124
runs-on: ubuntu-latest

.github/workflows/latest-deps.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
name: Check Latest Dependencies
22
on:
33
schedule:
4-
# Chosen so that anyone it runs right before the international date line experiences the weekend.
4+
# Chosen so that it runs right before the international date line experiences the weekend.
55
# Since we're open source, that means globally we should be aware of it right when we have the most
66
# time to fix it.
77
#
88
# Sorry if this ruins your weekend, future maintainer...
99
- cron: '0 12 * * FRI'
10+
workflow_dispatch: # For running manually
1011

1112
env:
1213
CARGO_TERM_COLOR: always
1314
HOST: x86_64-unknown-linux-gnu
1415
FEATURES: "approx,serde,rayon"
1516
RUSTFLAGS: "-D warnings"
1617
MSRV: 1.64.0
18+
BLAS_MSRV: 1.71.0
1719

1820
jobs:
1921
latest_deps_stable:

scripts/all-tests.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ 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-
cargo test -p blas-tests -v --features blas-tests/openblas-system
27-
cargo test -p numeric-tests -v --features numeric-tests/test_blas
26+
if [[ -z "${MSRV}" ]] && [ "$CHANNEL" != "$MSRV" ]; then
27+
./scripts/blas-integ-tests.sh "$FEATURES" $CHANNEL
28+
fi
2829

2930
# Examples
3031
cargo test --examples

scripts/blas-integ-tests.sh

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

0 commit comments

Comments
 (0)