Skip to content

Commit 6728e1d

Browse files
committed
fix/cargo: nested workspace workarounds and integration
See rust-lang/cargo#5042 for details.
1 parent c21e57a commit 6728e1d

File tree

8 files changed

+668
-2003
lines changed

8 files changed

+668
-2003
lines changed

Cargo.lock

+648-477
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
[workspace]
2-
members = ["greenglas", "coaster", "coaster-nn", "coaster-blas", "juice", "juice-examples"]
2+
members = ["greenglas", "coaster", "coaster-nn", "coaster-blas", "juice", "juice-examples", "rust-blas", "rcudnn/cudnn", "rcudnn/cudnn-sys", "rcublas/cublas", "rcublas/cublas-sys"]
3+
4+
exclude = [ "./rcudnn", "./rcublas" ]
35

46
[patch.crates-io]
57
coaster-nn = { path = "./coaster-nn" }
68
coaster-blas = { path = "./coaster-blas" }
79
coaster = { path = "./coaster" }
810
greenglas = { path = "./greenglas" }
911
juice = { path = "./juice" }
12+
rust-blas = { path = "./rust-blas" }
13+
rcublas = { path = "./rcublas/cublas" }
14+
rcublas-sys = { path = "./rcublas/cublas-sys" }
15+
rcudnn = { path = "./rcudnn/cudnn" }
16+
rcudnn-sys = { path = "./rcudnn/cudnn-sys" }
1017

1118
[profile.bench]
1219
opt-level = 3

coaster-blas/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ coaster = { version = "0.1", default-features = false }
1919
lazy_static = "1"
2020

2121
# native
22-
rust-blas = { version = "0.1", optional = true }
22+
rust-blas = { version = "^0.1", optional = true }
2323

2424
# cuda
25-
rcublas = { version = "0.2", optional = true }
25+
rcublas = { version = "^0.3", optional = true }
2626

2727
clippy = { version = "0.0.302", optional = true }
2828

coaster-nn/src/frameworks/cuda/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ impl<T> ConvolutionConfig<T> for crate::cudnn::utils::ConvolutionConfig
357357
where T: Float + DataTypeInfo
358358
{
359359
fn workspace_size(&self) -> usize {
360-
*self.largest_workspace_size()
360+
self.largest_workspace_size()
361361
}
362362
}
363363

0 commit comments

Comments
 (0)