ggml-cpu: switch to private macros

Signed-off-by: Aaron Teo <[email protected]>

Author: taronaeo

ggml/src/CMakeLists.txt

@@ -406,14 +406,14 @@ endif()
 
 if (GGML_VXE)
     add_compile_definitions(GGML_VXE)
-    target_compile_definitions(ggml PUBLIC GGML_VXE)
-    target_compile_definitions(ggml-base PUBLIC GGML_VXE)
+    target_compile_definitions(ggml PRIVATE GGML_VXE)
+    target_compile_definitions(ggml-base PRIVATE GGML_VXE)
     message(STATUS "GGML_VXE triggered")
 endif()
 
 if (GGML_NNPA)
     add_compile_definitions(GGML_NNPA)
-    target_compile_definitions(ggml PUBLIC GGML_NNPA)
-    target_compile_definitions(ggml-base PUBLIC GGML_NNPA)
+    target_compile_definitions(ggml PRIVATE GGML_NNPA)
+    target_compile_definitions(ggml-base PRIVATE GGML_NNPA)
     message(STATUS "GGML_NNPA triggered")
 endif()

ggml/src/ggml-impl.h

@@ -31,13 +31,13 @@
 #if defined(GGML_VXE)
 #include <vecintrin.h>
 #include <ggml-cpu/ggml-cpu-impl.h>
+#endif
 
 #if defined(GGML_NNPA)
 #ifndef __NNPA__
 #define __NNPA__
 #endif  // __NNPA__
 #endif  // GGML_NNPA
-#endif  // __s390x__ && __VEC__
 
 #ifdef __cplusplus
 extern "C" {