Skip to content

Commit 2abbe1a

Browse files
authored
Merge branch 'master' into master
2 parents 9817335 + 5afd26c commit 2abbe1a

File tree

11 files changed

+12
-24
lines changed

11 files changed

+12
-24
lines changed

.github/workflows/benching.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,5 @@ jobs:
1414
- name: Install toolchain
1515
uses: dtolnay/rust-toolchain@stable
1616

17-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
18-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
19-
2017
- name: Run cargo bench iai
2118
run: cargo bench iai --all

.github/workflows/checking.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ jobs:
3131
- name: Log active toolchain
3232
run: rustup show
3333

34-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
35-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
36-
3734
# Check if linfa compiles by itself without uniting dependency features with other crates
3835
- name: Run cargo check on linfa
3936
run: cargo check

.github/workflows/codequality.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ jobs:
2222
toolchain: ${{ matrix.toolchain }}
2323
components: rustfmt, clippy
2424

25-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
26-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
25+
2726

2827
- name: Run cargo fmt
2928
run: cargo fmt --all -- --check
@@ -44,8 +43,7 @@ jobs:
4443
- name: Install toolchain
4544
uses: dtolnay/rust-toolchain@stable
4645

47-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
48-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
46+
4947

5048
- name: Get rustc version
5149
id: rustc-version

.github/workflows/docs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ jobs:
1515
- name: 'Checkout'
1616
uses: actions/checkout@master
1717

18-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
19-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
18+
2019

2120
- name: 'Build only'
2221
uses: shalzz/zola-deploy-action@master
@@ -42,8 +41,7 @@ jobs:
4241
with:
4342
components: rustfmt, rust-src
4443

45-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
46-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
44+
4745

4846
- name: Build Documentation
4947
run: cargo doc --workspace --no-deps

.github/workflows/testing.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ jobs:
2525
with:
2626
toolchain: ${{ matrix.toolchain }}
2727

28-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
29-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
28+
3029

3130
- name: Run cargo test
3231
run: cargo test --release --workspace
@@ -53,8 +52,7 @@ jobs:
5352
with:
5453
toolchain: ${{ matrix.toolchain }}
5554

56-
- name: Update ndarray to 0.16.1 (temporary workaround to avoid pulling ndarray 0.17.1)
57-
run: cargo update -p ndarray:0.17.1 --precise 0.16.1
55+
5856

5957
- name: Run cargo test with BLAS enabled
6058
run: cargo test --release --workspace --features intel-mkl-static,linfa-ica/blas,linfa-reduction/blas,linfa-linear/blas,linfa-preprocessing/blas,linfa-pls/blas,linfa-elasticnet/blas

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ approx = "0.5"
4242

4343
ndarray = { version = "0.16", features = ["approx"] }
4444
ndarray-linalg = { version = "0.17", optional = true }
45-
sprs = { version = "0.11", default-features = false }
45+
sprs = { version = "=0.11.2", default-features = false }
4646

4747
thiserror = "2.0"
4848

algorithms/linfa-clustering/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ linfa-datasets = { version = "0.8.0", path = "../../datasets", features = [
5656
criterion = "0.5"
5757
serde_json = "1"
5858
approx = "0.5"
59-
lax = "0.17.0"
59+
lax = "=0.17.0"
6060
linfa = { version = "0.8.0", path = "../..", features = ["benchmarks"] }
6161

6262
[[bench]]

algorithms/linfa-kernel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ features = ["std", "derive"]
2626
[dependencies]
2727
ndarray = "0.16"
2828
num-traits = "0.2"
29-
sprs = { version = "0.11", default-features = false }
29+
sprs = { version = "=0.11.2", default-features = false }
3030

3131
linfa = { version = "0.8.0", path = "../.." }
3232
linfa-nn = { version = "0.8.0", path = "../linfa-nn" }

algorithms/linfa-preprocessing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ndarray-rand = "0.15"
2929
unicode-normalization = "0.1.8"
3030
regex = "1.4.5"
3131
encoding = "0.2"
32-
sprs = { version = "0.11", default-features = false }
32+
sprs = { version = "=0.11.2", default-features = false }
3333

3434
serde_regex = { version = "1.1", optional = true }
3535
itertools = "0.14.0"

algorithms/linfa-reduction/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ rand = { version = "0.8", features = ["small_rng"] }
4444

4545
linfa = { version = "0.8.0", path = "../.." }
4646
linfa-kernel = { version = "0.8.0", path = "../linfa-kernel" }
47-
sprs = { version = "0.11" }
47+
sprs = { version = "=0.11.2" }
4848
rand_xoshiro = "0.6.0"
4949

5050
[dev-dependencies]

0 commit comments

Comments
 (0)