Merge pull request #404 from babichjacob/simplify-cpu-features

Author: MarcusDunn

llama-cpp-2/Cargo.toml

@@ -22,35 +22,6 @@ vulkan = ["llama-cpp-sys-2/vulkan"]
 native = ["llama-cpp-sys-2/native"]
 sampler = []
 
-[target.'cfg(target_feature = "avx")'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
-    "avx",
-] }
-[target.'cfg(target_feature = "avx2")'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
-    "avx2",
-] }
-[target.'cfg(target_feature = "avx512f")'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
-    "avx512",
-] }
-[target.'cfg(target_feature = "avx512vbmi")'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
-    "avx512_vmbi",
-] }
-[target.'cfg(target_feature = "avx512vnni")'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
-    "avx512_vnni",
-] }
-[target.'cfg(target_feature = "f16c")'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
-    "f16c",
-] }
-[target.'cfg(target_feature = "fma")'.dependencies]
-llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
-    "fma",
-] }
-
 [target.'cfg(all(target_os = "macos", any(target_arch = "aarch64", target_arch = "arm64")))'.dependencies]
 llama-cpp-sys-2 = { path = "../llama-cpp-sys-2", version = "0.1.63", features = [
     "metal",

llama-cpp-sys-2/Cargo.toml

@@ -53,14 +53,7 @@ cc = { workspace = true, features = ["parallel"] }
 once_cell = "1.19.0"
 
 [features]
-avx = []
-avx2 = []
-avx512 = []
-avx512_vmbi = []
-avx512_vnni = []
 cuda = []
-f16c = []
-fma = []
 metal = []
 dynamic_link = []
 vulkan = []

llama-cpp-sys-2/build.rs

@@ -259,59 +259,64 @@ fn push_feature_flags(cx: &mut Build, cxx: &mut Build) {
             cxx.flag("-march=native");
         }
 
-        if cfg!(feature = "fma") && cfg!(target_family = "unix") {
+        if cfg!(target_feature = "fma") && cfg!(target_family = "unix") {
             cx.flag("-mfma");
             cxx.flag("-mfma");
         }
 
-        if cfg!(feature = "f16c") && cfg!(target_family = "unix") {
+        if cfg!(target_feature = "f16c") && cfg!(target_family = "unix") {
             cx.flag("-mf16c");
             cxx.flag("-mf16c");
         }
 
         if cfg!(target_family = "unix") {
-            if cfg!(feature = "avx512") {
-                cx.flag("-mavx512f").flag("-mavx512bw");
-                cxx.flag("-mavx512f").flag("-mavx512bw");
+            if cfg!(target_feature = "avx512f") {
+                cx.flag("-mavx512f");
+                cxx.flag("-mavx512f");
 
-                if cfg!(feature = "avx512_vmbi") {
+                if cfg!(target_feature = "avx512bw") {
+                    cx.flag("-mavx512bw");
+                    cxx.flag("-mavx512bw");
+                }
+
+                if cfg!(target_feature = "avx512vbmi") {
                     cx.flag("-mavx512vbmi");
                     cxx.flag("-mavx512vbmi");
                 }
 
-                if cfg!(feature = "avx512_vnni") {
+                if cfg!(target_feature = "avx512vnni") {
                     cx.flag("-mavx512vnni");
                     cxx.flag("-mavx512vnni");
                 }
             }
 
-            if cfg!(feature = "avx2") {
+            if cfg!(target_feature = "avx2") {
                 cx.flag("-mavx2");
                 cxx.flag("-mavx2");
             }
 
-            if cfg!(feature = "avx") {
+            if cfg!(target_feature = "avx") {
                 cx.flag("-mavx");
                 cxx.flag("-mavx");
             }
         } else if cfg!(target_family = "windows") {
-            if cfg!(feature = "avx512") {
+            if cfg!(target_feature = "avx512f") {
                 cx.flag("/arch:AVX512");
                 cxx.flag("/arch:AVX512");
 
-                if cfg!(feature = "avx512_vmbi") {
+                if cfg!(target_feature = "avx512vbmi") {
                     cx.define("__AVX512VBMI__", None);
                     cxx.define("__AVX512VBMI__", None);
                 }
 
-                if cfg!(feature = "avx512_vnni") {
+                if cfg!(target_feature = "avx512vnni") {
                     cx.define("__AVX512VNNI__", None);
                     cxx.define("__AVX512VNNI__", None);
                 }
-            } else if cfg!(feature = "avx2") {
+            } else if cfg!(target_feature = "avx2") {
                 cx.flag("/arch:AVX2");
                 cxx.flag("/arch:AVX2");
-            } else if cfg!(feature = "avx") {
+            } else if cfg!(target_feature = "avx") {
                 cx.flag("/arch:AVX");
                 cxx.flag("/arch:AVX");
             }