From f869e9d3ead72eb65ea224d4947e0b5630bc5047 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Wed, 26 Feb 2025 01:57:25 -0500
Subject: [PATCH] vendor in flash-attn, but the build still fails

---
 Cargo.lock                                    | 22 +++++++++++++++++++
 Cargo.toml                                    |  3 ++-
 .../candle/candle-flash-attn/Cargo.toml       |  2 +-
 crates/vendor/candle/tensor-tools/Cargo.toml  | 18 +++++----------
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 56942a3c09..395bfa1915 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1495,6 +1495,17 @@ dependencies = [
  "zip 1.1.4",
 ]
 
+[[package]]
+name = "candle-flash-attn"
+version = "0.8.3"
+dependencies = [
+ "anyhow",
+ "bindgen_cuda",
+ "candle-core 0.0.0",
+ "candle-nn 0.0.0",
+ "half",
+]
+
 [[package]]
 name = "candle-kernels"
 version = "0.8.3"
@@ -10816,6 +10827,17 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "tensor-tools"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "candle-core 0.0.0",
+ "clap",
+ "rayon",
+ "safetensors",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
diff --git a/Cargo.toml b/Cargo.toml
index a92863581e..03e314d3de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -97,12 +97,13 @@ members = [
 
   # Vendored code
   "crates/vendor/limitation",
-  #"crates/vendor/candle/candle-flash-attn",
+  "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",
+  "crates/vendor/candle/tensor-tools",
   # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now.
   #"crates/vendor/newrelic-telemetry-sdk-rust", 
 
diff --git a/crates/vendor/candle/candle-flash-attn/Cargo.toml b/crates/vendor/candle/candle-flash-attn/Cargo.toml
index 6be829272f..98bd425cdd 100644
--- a/crates/vendor/candle/candle-flash-attn/Cargo.toml
+++ b/crates/vendor/candle/candle-flash-attn/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 readme = "README.md"
 
 [dependencies]
-candle = { path = "../candle-core", features = ["cuda"], package = "candle-core", version = "0.8.3" }
+candle = { path = "../candle-core", package = "candle-core", features = ["cuda"] }
 half = { version = "2.3.1", features = ["num-traits"] }
 
 [build-dependencies]
diff --git a/crates/vendor/candle/tensor-tools/Cargo.toml b/crates/vendor/candle/tensor-tools/Cargo.toml
index eecd7e4353..490b794e85 100644
--- a/crates/vendor/candle/tensor-tools/Cargo.toml
+++ b/crates/vendor/candle/tensor-tools/Cargo.toml
@@ -1,16 +1,10 @@
 [package]
 name = "tensor-tools"
-version.workspace = true
-edition.workspace = true
-description.workspace = true
-repository.workspace = true
-keywords.workspace = true
-categories.workspace = true
-license.workspace = true
+edition = "2021"
 
 [dependencies]
-anyhow = { workspace = true }
-candle = { workspace = true }
-clap = { workspace = true }
-rayon = { workspace = true }
-safetensors = { workspace = true }
+anyhow = { version = "1", features = ["backtrace"] }
+candle = { path = "../candle-core", package = "candle-core" }
+clap = { version = "4.2.4", features = ["derive"] }
+rayon = "1.7.0"
+safetensors = "0.4.1"