Diego Devesa commited on
Commit
0001327
·
1 Parent(s): c9e03e6

ggml : do not use ARM features not included in the build (llama/10457)

Browse files
Files changed (1) hide show
  1. ggml/src/ggml-cpu/ggml-cpu.c +4 -4
ggml/src/ggml-cpu/ggml-cpu.c CHANGED
@@ -13896,7 +13896,7 @@ int ggml_cpu_has_vsx(void) {
13896
  }
13897
 
13898
  int ggml_cpu_has_neon(void) {
13899
- #if defined(__ARM_ARCH)
13900
  return ggml_arm_arch_features.has_neon;
13901
  #else
13902
  return 0;
@@ -13904,7 +13904,7 @@ int ggml_cpu_has_neon(void) {
13904
  }
13905
 
13906
  int ggml_cpu_has_sve(void) {
13907
- #if defined(__ARM_ARCH)
13908
  return ggml_arm_arch_features.has_sve;
13909
  #else
13910
  return 0;
@@ -13912,7 +13912,7 @@ int ggml_cpu_has_sve(void) {
13912
  }
13913
 
13914
  int ggml_cpu_has_matmul_int8(void) {
13915
- #if defined(__ARM_ARCH)
13916
  return ggml_arm_arch_features.has_i8mm;
13917
  #else
13918
  return 0;
@@ -13920,7 +13920,7 @@ int ggml_cpu_has_matmul_int8(void) {
13920
  }
13921
 
13922
  int ggml_cpu_get_sve_cnt(void) {
13923
- #if defined(__ARM_ARCH)
13924
  return ggml_arm_arch_features.sve_cnt;
13925
  #else
13926
  return 0;
 
13896
  }
13897
 
13898
  int ggml_cpu_has_neon(void) {
13899
+ #if defined(__ARM_ARCH) && defined(__ARM_NEON)
13900
  return ggml_arm_arch_features.has_neon;
13901
  #else
13902
  return 0;
 
13904
  }
13905
 
13906
  int ggml_cpu_has_sve(void) {
13907
+ #if defined(__ARM_ARCH) && defined(__ARM_FEATURE_SVE)
13908
  return ggml_arm_arch_features.has_sve;
13909
  #else
13910
  return 0;
 
13912
  }
13913
 
13914
  int ggml_cpu_has_matmul_int8(void) {
13915
+ #if defined(__ARM_ARCH) && defined(__ARM_FEATURE_MATMUL_INT8)
13916
  return ggml_arm_arch_features.has_i8mm;
13917
  #else
13918
  return 0;
 
13920
  }
13921
 
13922
  int ggml_cpu_get_sve_cnt(void) {
13923
+ #if defined(__ARM_ARCH) && defined(__ARM_FEATURE_SVE)
13924
  return ggml_arm_arch_features.sve_cnt;
13925
  #else
13926
  return 0;