From 1cacdd9a36a8468e1eada56adb013ba4dd2a56b9 Mon Sep 17 00:00:00 2001
From: Aaron Teo <aaron.teo1@ibm.com>
Date: Sat, 21 Jun 2025 19:08:48 +0800
Subject: [PATCH] ggml-cpu: fix macro declaration

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

diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt
index b7447e8db..f5ddb219c 100644
--- a/ggml/src/ggml-cpu/CMakeLists.txt
+++ b/ggml/src/ggml-cpu/CMakeLists.txt
@@ -467,12 +467,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
         if (GGML_VXE)
             message(STATUS "VX/VXE/VXE2 enabled")
             list(APPEND ARCH_FLAGS -mvx -mzvector)
-            list(APPEND ARCH_DEFINITIONS GGML_NNPA __NNPA__)
+            list(APPEND ARCH_DEFINITIONS GGML_VXE)
         endif()
 
         if (GGML_NNPA)
             target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_NNPA)
             message(STATUS "NNPA enabled")
+            list(APPEND ARCH_DEFINITIONS GGML_NNPA)
         endif()
     elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "wasm")
         message(STATUS "Wasm detected")
diff --git a/ggml/src/ggml-impl.h b/ggml/src/ggml-impl.h
index d86e08d90..5c0ef8408 100644
--- a/ggml/src/ggml-impl.h
+++ b/ggml/src/ggml-impl.h
@@ -28,7 +28,7 @@
 #include <immintrin.h>
 #endif
 
-#if defined(__s390x__) && defined(__VEC__)
+#if defined(GGML_VXE)
 #include <vecintrin.h>
 #include <ggml-cpu/ggml-cpu-impl.h>