From d2dea11ef65566518b6d722e9dbe33822aa98b74 Mon Sep 17 00:00:00 2001 From: Nicolas Patry Date: Fri, 28 Jul 2023 12:19:20 +0200 Subject: [PATCH 1/3] Fixing nccl feature. --- Cargo.toml | 2 +- candle-examples/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4f5bf2d9..e068382c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ byteorder = "1.4.3" clap = { version = "4.2.4", features = ["derive"] } # Re-enable this once 0.9.13 as been released as it would include the cublas-f16 changes # cudarc = { version = "0.9.13", optional = true, features = ["f16"] } -cudarc = { git = "https://github.com/coreylowman/cudarc.git", features = ["f16", "nccl"] } +cudarc = { git = "https://github.com/coreylowman/cudarc.git", features = ["f16"] } # TODO: Switch back to the official gemm implementation once the following are available. # https://github.com/sarah-ek/gemm/pull/8. # https://github.com/sarah-ek/gemm/pull/9. diff --git a/candle-examples/Cargo.toml b/candle-examples/Cargo.toml index 2ecc8500..d4666d47 100644 --- a/candle-examples/Cargo.toml +++ b/candle-examples/Cargo.toml @@ -42,7 +42,7 @@ default = [] cuda = ["candle/cuda", "candle-nn/cuda", "candle-transformers/cuda"] flash-attn = ["cuda", "dep:candle-flash-attn"] mkl = ["dep:intel-mkl-src", "candle/mkl", "candle-nn/mkl", "candle-transformers/mkl"] -nccl = ["dep:cudarc", "dep:half"] +nccl = ["dep:cudarc", "cudarc/nccl", "dep:half"] [[example]] name = "llama_multiprocess" From be256a6ba633ecf2bef3b66779142a157ee9f7f1 Mon Sep 17 00:00:00 2001 From: Nicolas Patry Date: Fri, 28 Jul 2023 10:23:05 +0000 Subject: [PATCH 2/3] Fixing. --- candle-examples/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/candle-examples/Cargo.toml b/candle-examples/Cargo.toml index d4666d47..64f45b26 100644 --- a/candle-examples/Cargo.toml +++ b/candle-examples/Cargo.toml @@ -42,7 +42,7 @@ default = [] cuda = ["candle/cuda", "candle-nn/cuda", "candle-transformers/cuda"] flash-attn = ["cuda", "dep:candle-flash-attn"] mkl = ["dep:intel-mkl-src", "candle/mkl", "candle-nn/mkl", "candle-transformers/mkl"] -nccl = ["dep:cudarc", "cudarc/nccl", "dep:half"] +nccl = ["cuda", "cudarc/nccl", "half"] [[example]] name = "llama_multiprocess" From 4002968cf5ad269cfbc34ea615ea524416510048 Mon Sep 17 00:00:00 2001 From: Nicolas Patry Date: Fri, 28 Jul 2023 10:34:21 +0000 Subject: [PATCH 3/3] Put back `"dep:half" --- candle-examples/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/candle-examples/Cargo.toml b/candle-examples/Cargo.toml index 64f45b26..a595e74d 100644 --- a/candle-examples/Cargo.toml +++ b/candle-examples/Cargo.toml @@ -42,7 +42,7 @@ default = [] cuda = ["candle/cuda", "candle-nn/cuda", "candle-transformers/cuda"] flash-attn = ["cuda", "dep:candle-flash-attn"] mkl = ["dep:intel-mkl-src", "candle/mkl", "candle-nn/mkl", "candle-transformers/mkl"] -nccl = ["cuda", "cudarc/nccl", "half"] +nccl = ["cuda", "cudarc/nccl", "dep:half"] [[example]] name = "llama_multiprocess"