From ca4e41864569272eff7d900b4d0f143f1d9e2bab Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Wed, 26 Feb 2025 01:49:11 -0500
Subject: [PATCH] candle-core uses internal deps

---
 Cargo.lock                                  | 23 +++++++++++++++++----
 Cargo.toml                                  |  1 +
 crates/vendor/candle/candle-core/Cargo.toml |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 88fd3e59c7..409873d31e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1445,8 +1445,8 @@ dependencies = [
  "accelerate-src",
  "anyhow",
  "byteorder",
- "candle-kernels 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "candle-metal-kernels",
+ "candle-kernels 0.8.3",
+ "candle-metal-kernels 0.8.3",
  "clap",
  "criterion",
  "cudarc",
@@ -1479,7 +1479,7 @@ dependencies = [
  "accelerate-src",
  "byteorder",
  "candle-kernels 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "candle-metal-kernels",
+ "candle-metal-kernels 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "cudarc",
  "gemm 0.17.1",
  "half",
@@ -1517,6 +1517,21 @@ dependencies = [
  "bindgen_cuda",
 ]
 
+[[package]]
+name = "candle-metal-kernels"
+version = "0.8.3"
+dependencies = [
+ "anyhow",
+ "clap",
+ "half",
+ "metal 0.27.0",
+ "once_cell",
+ "rand 0.8.5",
+ "rand_distr",
+ "thiserror 1.0.63",
+ "tracing",
+]
+
 [[package]]
 name = "candle-metal-kernels"
 version = "0.8.3"
@@ -1536,7 +1551,7 @@ dependencies = [
  "accelerate-src",
  "anyhow",
  "candle-core 0.8.3",
- "candle-metal-kernels",
+ "candle-metal-kernels 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap",
  "criterion",
  "half",
diff --git a/Cargo.toml b/Cargo.toml
index 4512c2257f..a92863581e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,6 +99,7 @@ members = [
   "crates/vendor/limitation",
   #"crates/vendor/candle/candle-flash-attn",
   "crates/vendor/candle/candle-kernels",
+  "crates/vendor/candle/candle-metal-kernels",
   "crates/vendor/candle/candle-nn",
   "crates/vendor/candle/candle-core",
   "crates/vendor/candle/candle-onnx",
diff --git a/crates/vendor/candle/candle-core/Cargo.toml b/crates/vendor/candle/candle-core/Cargo.toml
index afe0b35b18..8beaa608bb 100644
--- a/crates/vendor/candle/candle-core/Cargo.toml
+++ b/crates/vendor/candle/candle-core/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 [dependencies]
 accelerate-src = { version = "0.3.2" , optional = true }
 byteorder = "1.4.3"
-candle-kernels = { package = "candle-kernels", version = "0.8.3", optional = true }
-candle-metal-kernels = { package = "candle-metal-kernels", version = "0.8.3" , optional = true }
+candle-kernels = { path = "../candle-kernels", version = "0.8.3", optional = true }
+candle-metal-kernels = { path = "../candle-metal-kernels", version = "0.8.3" , optional = true }
 metal = { version = "0.27.0", features = ["mps"], optional = true }
 cudarc = { version = "0.13.5", features = ["std", "cublas", "cublaslt", "curand", "driver", "nvrtc", "f16", "cuda-version-from-build-system", "dynamic-linking"], default-features=false, optional = true }
 gemm = { version = "0.17.0", features = ["wasm-simd128-enable"] }