chore/cargo: nested workspace workarounds

See rust-lang/cargo#5042 for details.
fff-rs · Jan 30, 2020 · b3f5a3e · b3f5a3e
1 parent 310d23b
commit b3f5a3e
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 2,004 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,7 @@
 [workspace]
-members = ["greenglas", "coaster", "coaster-nn", "coaster-blas", "juice", "juice-examples", "rust-blas", "rcudnn", "rcublas"]
+members = ["greenglas", "coaster", "coaster-nn", "coaster-blas", "juice", "juice-examples", "rust-blas", "rcudnn/cudnn", "rcudnn/cudnn-sys", "rcublas/cublas", "rcublas/cublas-sys"]
+
+exclude = [ "./rcudnn", "./rcudart", "./rcublas" ]
 
 [patch.crates-io]
 coaster-nn = { path = "./coaster-nn" }
@@ -8,7 +10,8 @@ coaster = { path = "./coaster" }
 greenglas = { path = "./greenglas" }
 juice = { path = "./juice" }
 rust-blas = { path = "./rust-blas" }
-rust-blas = { path = "./rcublas" }
+rcublas = { path = "./rcublas/cublas" }
+rcublas-sys = { path = "./rcublas/cublas-sys" }
 rcudnn = { path = "./rcudnn/cudnn" }
 rcudnn-sys = { path = "./rcudnn/cudnn-sys" }
 

diff --git a/coaster-blas/Cargo.toml b/coaster-blas/Cargo.toml
@@ -19,10 +19,10 @@ coaster = { version = "0.1", default-features = false }
 lazy_static = "1"
 
 # native
-rust-blas = { version = "0.1", optional = true }
+rust-blas = { version = "^0.1", optional = true }
 
 # cuda
-rcublas = { version = "0.2",  optional = true }
+rcublas = { version = "^0.3",  optional = true }
 
 clippy = { version = "0.0.302", optional = true }
 

diff --git a/coaster-nn/src/frameworks/cuda/mod.rs b/coaster-nn/src/frameworks/cuda/mod.rs
@@ -357,7 +357,7 @@ impl<T> ConvolutionConfig<T> for crate::cudnn::utils::ConvolutionConfig
     where T: Float + DataTypeInfo
 {
     fn workspace_size(&self) -> usize {
-        *self.largest_workspace_size()
+        self.largest_workspace_size()
     }
 }