Skip to content

Commit 50cd16f

Browse files
committed
fix/cargo: nested workspace workarounds and integration
See rust-lang/cargo#5042 for details.
1 parent 3a3842c commit 50cd16f

File tree

8 files changed

+692
-2002
lines changed

8 files changed

+692
-2002
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

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[workspace]
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" ]
5+
6+
[patch.crates-io]
7+
coaster-nn = { path = "./coaster-nn" }
8+
coaster-blas = { path = "./coaster-blas" }
9+
coaster = { path = "./coaster" }
10+
greenglas = { path = "./greenglas" }
11+
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" }
17+
18+
[profile.bench]
19+
opt-level = 3
20+
debug = false
21+
rpath = false
22+
lto = false
23+
debug-assertions = false
24+
codegen-units = 1
25+
26+
[profile.dev]
27+
opt-level = 0
28+
debug = true
29+
rpath = false
30+
lto = false
31+
debug-assertions = true
32+
codegen-units = 2

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)