Skip to content

Commit

Permalink
fix/cargo: nested workspace workarounds and integration
Browse files Browse the repository at this point in the history
See rust-lang/cargo#5042 for details.
  • Loading branch information
drahnr committed Feb 1, 2020
1 parent a287f6b commit e563120
Show file tree
Hide file tree
Showing 8 changed files with 692 additions and 2,002 deletions.
1,125 changes: 648 additions & 477 deletions Cargo.lock

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[workspace]
members = ["greenglas", "coaster", "coaster-nn", "coaster-blas", "juice", "juice-examples", "rust-blas", "rcudnn/cudnn", "rcudnn/cudnn-sys", "rcublas/cublas", "rcublas/cublas-sys"]

exclude = [ "./rcudnn", "./rcublas" ]

[patch.crates-io]
coaster-nn = { path = "./coaster-nn" }
coaster-blas = { path = "./coaster-blas" }
coaster = { path = "./coaster" }
greenglas = { path = "./greenglas" }
juice = { path = "./juice" }
rust-blas = { path = "./rust-blas" }
rcublas = { path = "./rcublas/cublas" }
rcublas-sys = { path = "./rcublas/cublas-sys" }
rcudnn = { path = "./rcudnn/cudnn" }
rcudnn-sys = { path = "./rcudnn/cudnn-sys" }

[profile.bench]
opt-level = 3
debug = false
rpath = false
lto = false
debug-assertions = false
codegen-units = 1

[profile.dev]
opt-level = 0
debug = true
rpath = false
lto = false
debug-assertions = true
codegen-units = 2
4 changes: 2 additions & 2 deletions coaster-blas/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
2 changes: 1 addition & 1 deletion coaster-nn/src/frameworks/cuda/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}

Expand Down
Loading

0 comments on commit e563120

Please sign in to comment.