Skip to content

Commit 28c4059

Browse files
committed
Fixing the static-linking.
1 parent f4b1aa3 commit 28c4059

File tree

7 files changed

+15
-18
lines changed

7 files changed

+15
-18
lines changed

Cargo.lock

Lines changed: 3 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ candle-flash-attn = { version = "0.8", package = "candle-flash-attn" }
5454
half = { version = "2.3.1", features = ["num-traits"] }
5555

5656
[patch.crates-io]
57-
cudarc = { git = "https://github.com/Narsil/cudarc" , rev = "1956436aeddea1da04fc3226282bc07c07eeaa35"}
58-
candle = { git = "https://github.com/Narsil/candle", rev = "2e273ddf31b1b796d3cfcd181ccb98deaa48466e", package = "candle-core" }
59-
candle-nn = { git = "https://github.com/Narsil/candle", rev = "2e273ddf31b1b796d3cfcd181ccb98deaa48466e", package = "candle-nn" }
60-
candle-transformers = { git = "https://github.com/Narsil/candle", rev = "2e273ddf31b1b796d3cfcd181ccb98deaa48466e", package = "candle-transformers" }
61-
candle-flash-attn = { git = "https://github.com/Narsil/candle", rev = "2e273ddf31b1b796d3cfcd181ccb98deaa48466e", package = "candle-flash-attn" }
57+
cudarc = { git = "https://github.com/Narsil/cudarc" , rev = "18ae111a4e8779c11377636b9cc3379f686e99c6"}
58+
candle = { git = "https://github.com/huggingface/candle", rev = "ec6d7ca7738f4052b6613edc8f4d2bb6866a7539", package = "candle-core" }
59+
candle-nn = { git = "https://github.com/huggingface/candle", rev = "ec6d7ca7738f4052b6613edc8f4d2bb6866a7539", package = "candle-nn" }
60+
candle-transformers = { git = "https://github.com/huggingface/candle", rev = "ec6d7ca7738f4052b6613edc8f4d2bb6866a7539", package = "candle-transformers" }
61+
candle-flash-attn = { git = "https://github.com/huggingface/candle", rev = "ec6d7ca7738f4052b6613edc8f4d2bb6866a7539", package = "candle-flash-attn" }
6262

6363
[profile.release]
6464
debug = 0

backends/candle/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ accelerate = ["dep:accelerate-src", "candle/accelerate", "candle-nn/accelerate"]
4242
metal = ["candle/metal", "candle-nn/metal"]
4343
mkl = ["dep:intel-mkl-src", "intel-mkl-src/mkl-static-lp64-iomp", "candle/mkl"]
4444
mkl-dynamic = ["dep:intel-mkl-src", "intel-mkl-src/mkl-dynamic-lp64-iomp", "candle/mkl"]
45-
cuda = ["candle/cuda", "candle-nn/cuda", "dep:candle-cublaslt", "dep:candle-layer-norm", "dep:candle-rotary"]
45+
cuda = ["candle/_cuda", "candle-nn/_cuda", "dep:candle-cublaslt", "dep:candle-layer-norm", "dep:candle-rotary"]
4646
flash-attn-v1 = ["dep:candle-flash-attn-v1", "cuda"]
4747
flash-attn = ["dep:candle-flash-attn", "cuda"]

candle-extensions/candle-cublaslt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ edition = "2021"
66
description = "CUBLASLt gemm for the candle ML framework."
77

88
[dependencies]
9-
candle = { workspace=true, features = ["cuda"]}
9+
candle = { workspace=true, features = ["_cuda"]}
1010
cudarc = { workspace = true, features = [ "cublaslt", "f16" ]}
1111
half = { workspace = true}

candle-extensions/candle-layer-norm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
description = "Layer Norm layer for the candle ML framework."
77

88
[dependencies]
9-
candle = { workspace = true, features = ["cuda"] }
9+
candle = { workspace = true, features = ["_cuda"] }
1010
half = { workspace = true }
1111

1212
[build-dependencies]

candle-extensions/candle-rotary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
1010
readme = "README.md"
1111

1212
[dependencies]
13-
candle = { workspace = true, features = ["cuda"]}
13+
candle = { workspace = true, features = ["_cuda"]}
1414
half = { workspace = true }
1515

1616
[build-dependencies]

router/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ vergen = { version = "8.0.0", features = ["build", "git", "gitcl"] }
7878
tonic-build = { version = "0.11.0", optional = true }
7979

8080
[features]
81-
default = ["candle", "http"]
81+
default = ["candle", "http", "static-linking"]
8282
http = ["dep:axum", "dep:axum-tracing-opentelemetry", "dep:base64", "dep:tower-http", "dep:utoipa", "dep:utoipa-swagger-ui"]
8383
grpc = ["metrics-exporter-prometheus/http-listener", "dep:prost", "dep:tonic", "dep:tonic-health", "dep:tonic-reflection", "dep:tonic-build", "dep:async-stream", "dep:tokio-stream"]
8484
metal = ["text-embeddings-backend/metal"]
@@ -91,5 +91,6 @@ candle = ["text-embeddings-backend/candle"]
9191
candle-cuda = ["candle", "text-embeddings-backend/flash-attn"]
9292
candle-cuda-turing = ["candle", "text-embeddings-backend/flash-attn-v1"]
9393
candle-cuda-volta = ["candle", "text-embeddings-backend/cuda"]
94-
static-linking = ["cudarc/static-linking"]
94+
static-linking = ["dep:cudarc", "cudarc/static-linking"]
95+
dynamic-linking = ["dep:cudarc", "cudarc/dynamic-linking"]
9596
google = []

0 commit comments

Comments
 (0)