Fix feature compilation for vector

huggingface · Feb 1, 2025 · fd0beea · fd0beea
1 parent aa5bf7f
commit fd0beea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/candle-core/src/lib.rs b/candle-core/src/lib.rs
@@ -70,7 +70,7 @@ pub mod layout;
 pub mod metal_backend;
 #[cfg(feature = "mkl")]
 mod mkl;
-#[cfg(not(all(feature = "mkl", feature = "accelerate")))]
+#[cfg(not(any(feature = "mkl", feature = "accelerate")))]
 mod mathfun;
 pub mod npy;
 pub mod op;

diff --git a/candle-core/src/op.rs b/candle-core/src/op.rs
@@ -321,7 +321,7 @@ macro_rules! bin_op {
                 crate::accelerate::$f64_vec(xs1, xs2, ys)
             }
 
-            #[cfg(all(not(feature = "mkl"), not(feature = "accelerate")))]
+            #[cfg(not(any(feature = "mkl", feature = "accelerate")))]
             #[inline(always)]
             fn f32_vec(xs1: &[f32], xs2: &[f32], ys: &mut [f32]) {
                 crate::mathfun::$f32_vec(xs1, xs2, ys)
@@ -448,7 +448,7 @@ macro_rules! unary_op {
                 crate::accelerate::$f64_vec(xs, ys)
             }
 
-            #[cfg(all(not(feature = "mkl"), not(feature = "accelerate")))]
+            #[cfg(not(any(feature = "mkl", feature = "accelerate")))]
             #[inline(always)]
             fn f32_vec(xs: &[f32], ys: &mut [f32]) {
                 crate::mathfun::$f32_vec(xs, ys)
@@ -556,7 +556,7 @@ impl UnaryOpT for Gelu {
         crate::accelerate::vd_gelu(xs, ys)
     }
 
-    #[cfg(all(not(feature = "mkl"), not(feature = "accelerate")))]
+    #[cfg(not(any(feature = "mkl", feature = "accelerate")))]
     #[inline(always)]
     fn f32_vec(xs: &[f32], ys: &mut [f32]) {
         crate::mathfun::vs_gelu(xs, ys)
@@ -665,7 +665,7 @@ impl UnaryOpT for Silu {
         crate::accelerate::vd_silu(xs, ys)
     }
 
-    #[cfg(all(not(feature = "mkl"), not(feature = "accelerate")))]
+    #[cfg(not(any(feature = "mkl", feature = "accelerate")))]
     #[inline(always)]
     fn f32_vec(xs: &[f32], ys: &mut [f32]) {
         crate::mathfun::vs_silu(xs, ys)