From ba3513e44b2e2cb7c201a0ebcd81a7564d3c2a23 Mon Sep 17 00:00:00 2001
From: Aaron Teo <aaron.teo1@ibm.com>
Date: Sat, 21 Jun 2025 19:27:55 +0800
Subject: [PATCH] ggml-cpu: switch to private macros

Signed-off-by: Aaron Teo <aaron.teo1@ibm.com>
---
 ggml/src/CMakeLists.txt | 8 ++++----
 ggml/src/ggml-impl.h    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index c949b7e74..04daf8ee1 100644
--- a/ggml/src/CMakeLists.txt
+++ b/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()
diff --git a/ggml/src/ggml-impl.h b/ggml/src/ggml-impl.h
index 5c0ef8408..d04b03a39 100644
--- a/ggml/src/ggml-impl.h
+++ b/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" {