Rename vec-dot to vec-ops. (huggingface#449)

LaurentMazare · web-flow · commit 531f23b4d092 · 2023-08-15T10:48:57.000+01:00
* Rename vec-dot to vec-ops.

* Also bump the crate version.

* Add a currently empty readme.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 description = "Minimalist ML framework."
 repository = "https://github.com/huggingface/candle"
diff --git a/candle-core/Cargo.toml b/candle-core/Cargo.toml
@@ -12,7 +12,7 @@ readme = "README.md"
 [dependencies]
 accelerate-src = { workspace = true, optional = true }
 byteorder = { workspace = true }
-candle-kernels = { path = "../candle-kernels", version = "0.1.0", optional = true }
+candle-kernels = { path = "../candle-kernels", version = "0.1.1", optional = true }
 cudarc = { workspace = true, optional = true }
 gemm = { workspace = true }
 half = { workspace = true }
diff --git a/candle-core/src/cpu/kernels.rs b/candle-core/src/cpu/kernels.rs
@@ -1,4 +1,4 @@
-pub trait VecDot: num_traits::NumAssign + Copy {
+pub trait VecOps: num_traits::NumAssign + Copy {
     /// Dot-product of two vectors.
     ///
     /// # Safety
@@ -28,7 +28,7 @@ pub trait VecDot: num_traits::NumAssign + Copy {
     }
 }
 
-impl VecDot for f32 {
+impl VecOps for f32 {
     #[inline(always)]
     unsafe fn vec_dot(lhs: *const Self, rhs: *const Self, res: *mut Self, len: usize) {
         super::vec_dot_f32(lhs, rhs, res, len)
@@ -40,7 +40,7 @@ impl VecDot for f32 {
     }
 }
 
-impl VecDot for half::f16 {
+impl VecOps for half::f16 {
     #[inline(always)]
     unsafe fn vec_dot(lhs: *const Self, rhs: *const Self, res: *mut Self, len: usize) {
         let mut res_f32 = 0f32;
@@ -49,10 +49,10 @@ impl VecDot for half::f16 {
     }
 }
 
-impl VecDot for f64 {}
-impl VecDot for half::bf16 {}
-impl VecDot for u8 {}
-impl VecDot for u32 {}
+impl VecOps for f64 {}
+impl VecOps for half::bf16 {}
+impl VecOps for u8 {}
+impl VecOps for u32 {}
 
 #[inline(always)]
 pub fn par_for_each(n_threads: usize, func: impl Fn(usize) + Send + Sync) {
diff --git a/candle-core/src/dtype.rs b/candle-core/src/dtype.rs
@@ -62,7 +62,7 @@ pub trait WithDType:
     + 'static
     + Send
     + Sync
-    + crate::cpu::kernels::VecDot
+    + crate::cpu::kernels::VecOps
 {
     const DTYPE: DType;
 
diff --git a/candle-datasets/Cargo.toml b/candle-datasets/Cargo.toml
@@ -11,8 +11,8 @@ readme = "README.md"
 
 [dependencies]
 byteorder = { workspace = true }
-candle = { path = "../candle-core", version = "0.1.0", package = "candle-core" }
-candle-nn = { path = "../candle-nn", version = "0.1.0" }
+candle = { path = "../candle-core", version = "0.1.1", package = "candle-core" }
+candle-nn = { path = "../candle-nn", version = "0.1.1" }
 hf-hub = { workspace = true}
 intel-mkl-src = { workspace = true, optional = true }
 memmap2 = { workspace = true }
diff --git a/candle-datasets/README.md b/candle-datasets/README.md
@@ -0,0 +1 @@
+# candle-datasets
diff --git a/candle-examples/Cargo.toml b/candle-examples/Cargo.toml
@@ -11,11 +11,11 @@ readme = "README.md"
 
 [dependencies]
 accelerate-src = { workspace = true, optional = true }
-candle = { path = "../candle-core", version = "0.1.0", package = "candle-core" }
-candle-datasets = { path = "../candle-datasets", version = "0.1.0" }
-candle-nn = { path = "../candle-nn", version = "0.1.0" }
-candle-transformers = { path = "../candle-transformers", version = "0.1.0" }
-candle-flash-attn = { path = "../candle-flash-attn", version = "0.1.0", optional = true }
+candle = { path = "../candle-core", version = "0.1.1", package = "candle-core" }
+candle-datasets = { path = "../candle-datasets", version = "0.1.1" }
+candle-nn = { path = "../candle-nn", version = "0.1.1" }
+candle-transformers = { path = "../candle-transformers", version = "0.1.1" }
+candle-flash-attn = { path = "../candle-flash-attn", version = "0.1.1", optional = true }
 safetensors = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/candle-flash-attn/Cargo.toml b/candle-flash-attn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "candle-flash-attn"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 description = "Flash attention layer for the candle ML framework."
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 readme = "README.md"
 
 [dependencies]
-candle = { path = "../candle-core", features = ["cuda"], version = "0.1.0", package = "candle-core" }
+candle = { path = "../candle-core", features = ["cuda"], version = "0.1.1", package = "candle-core" }
 half = { version = "2.3.1", features = ["num-traits"] }
 
 [build-dependencies]
@@ -21,4 +21,4 @@ rayon = "1.7.0"
 
 [dev-dependencies]
 anyhow = { version = "1", features = ["backtrace"] }
-candle-nn = { path = "../candle-nn", version = "0.1.0", features = ["cuda"] }
+candle-nn = { path = "../candle-nn", version = "0.1.1", features = ["cuda"] }
diff --git a/candle-kernels/Cargo.toml b/candle-kernels/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "candle-kernels"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 description = "CUDA kernels for Candle"
diff --git a/candle-nn/Cargo.toml b/candle-nn/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 
 [dependencies]
 accelerate-src = { workspace = true, optional = true }
-candle = { path = "../candle-core", version = "0.1.0", package = "candle-core" }
+candle = { path = "../candle-core", version = "0.1.1", package = "candle-core" }
 thiserror = { workspace = true }
 intel-mkl-src = { workspace = true, optional = true }
 safetensors = { workspace = true }
diff --git a/candle-pyo3/Cargo.toml b/candle-pyo3/Cargo.toml
@@ -15,7 +15,7 @@ crate-type = ["cdylib"]
 doc = false
 
 [dependencies]
-candle = { path = "../candle-core", version = "0.1.0", package = "candle-core" }
+candle = { path = "../candle-core", version = "0.1.1", package = "candle-core" }
 half = { workspace = true }
 pyo3 = { version = "0.19.0", features = ["extension-module"] }
 
diff --git a/candle-transformers/Cargo.toml b/candle-transformers/Cargo.toml
@@ -11,9 +11,9 @@ readme = "README.md"
 
 [dependencies]
 accelerate-src = { workspace = true, optional = true }
-candle = { path = "../candle-core", version = "0.1.0", package = "candle-core" }
+candle = { path = "../candle-core", version = "0.1.1", package = "candle-core" }
 hf-hub = { workspace = true}
-candle-nn = { path = "../candle-nn", version = "0.1.0" }
+candle-nn = { path = "../candle-nn", version = "0.1.1" }
 intel-mkl-src = { workspace = true, optional = true }
 tokenizers = { workspace = true, features = ["onig"] }
 rand = { workspace = true }
diff --git a/candle-wasm-examples/llama2-c/Cargo.toml b/candle-wasm-examples/llama2-c/Cargo.toml
@@ -9,8 +9,8 @@ categories.workspace = true
 license.workspace = true
 
 [dependencies]
-candle = { path = "../../candle-core", version = "0.1.0", package = "candle-core" }
-candle-nn = { path = "../../candle-nn", version = "0.1.0" }
+candle = { path = "../../candle-core", version = "0.1.1", package = "candle-core" }
+candle-nn = { path = "../../candle-nn", version = "0.1.1" }
 num-traits = { workspace = true }
 tokenizers = { workspace = true, features = ["unstable_wasm"] }
 
diff --git a/candle-wasm-examples/whisper/Cargo.toml b/candle-wasm-examples/whisper/Cargo.toml
@@ -9,8 +9,8 @@ categories.workspace = true
 license.workspace = true
 
 [dependencies]
-candle = { path = "../../candle-core", version = "0.1.0", package = "candle-core" }
-candle-nn = { path = "../../candle-nn", version = "0.1.0" }
+candle = { path = "../../candle-core", version = "0.1.1", package = "candle-core" }
+candle-nn = { path = "../../candle-nn", version = "0.1.1" }
 num-traits = { workspace = true }
 tokenizers = { workspace = true, features = ["unstable_wasm"] }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ exclude = [`
`15`	`15`	`]`
`16`	`16`
`17`	`17`	`[workspace.package]`
`18`		`-version = "0.1.0"`
	`18`	`+version = "0.1.1"`
`19`	`19`	`edition = "2021"`
`20`	`20`	`description = "Minimalist ML framework."`
`21`	`21`	`repository = "https://github.com/huggingface/candle"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pub trait VecDot: num_traits::NumAssign + Copy {`
	`1`	`+pub trait VecOps: num_traits::NumAssign + Copy {`
`2`	`2`	`/// Dot-product of two vectors.`
`3`	`3`	`///`
`4`	`4`	`/// # Safety`
`@@ -28,7 +28,7 @@ pub trait VecDot: num_traits::NumAssign + Copy {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-impl VecDot for f32 {`
	`31`	`+impl VecOps for f32 {`
`32`	`32`	`#[inline(always)]`
`33`	`33`	`unsafe fn vec_dot(lhs: const Self, rhs: const Self, res: *mut Self, len: usize) {`
`34`	`34`	`super::vec_dot_f32(lhs, rhs, res, len)`
`@@ -40,7 +40,7 @@ impl VecDot for f32 {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-impl VecDot for half::f16 {`
	`43`	`+impl VecOps for half::f16 {`
`44`	`44`	`#[inline(always)]`
`45`	`45`	`unsafe fn vec_dot(lhs: const Self, rhs: const Self, res: *mut Self, len: usize) {`
`46`	`46`	`let mut res_f32 = 0f32;`
`@@ -49,10 +49,10 @@ impl VecDot for half::f16 {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`-impl VecDot for f64 {}`
`53`		`-impl VecDot for half::bf16 {}`
`54`		`-impl VecDot for u8 {}`
`55`		`-impl VecDot for u32 {}`
	`52`	`+impl VecOps for f64 {}`
	`53`	`+impl VecOps for half::bf16 {}`
	`54`	`+impl VecOps for u8 {}`
	`55`	`+impl VecOps for u32 {}`
`56`	`56`
`57`	`57`	`#[inline(always)]`
`58`	`58`	`pub fn par_for_each(n_threads: usize, func: impl Fn(usize) + Send + Sync) {`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ pub trait WithDType:`
`62`	`62`	`+ 'static`
`63`	`63`	`+ Send`
`64`	`64`	`+ Sync`
`65`		`- + crate::cpu::kernels::VecDot`
	`65`	`+ + crate::cpu::kernels::VecOps`
`66`	`66`	`{`
`67`	`67`	`const DTYPE: DType;`
`68`	`68`