From 72c16d2310b2e4c44018e2084aeb79e68c0b8709 Mon Sep 17 00:00:00 2001
From: YellowRoseCx <80486540+YellowRoseCx@users.noreply.github.com>
Date: Mon, 3 Jul 2023 16:45:39 -0500
Subject: [PATCH] Revert "fix my mistake that broke other arches"

This reverts commit 777aed5e69e240a54e7d3da962d8520855f072b9.
---
 otherarch/gpt2_v3.cpp  | 3 ++-
 otherarch/gptj_v3.cpp  | 3 ++-
 otherarch/llama_v2.cpp | 3 ++-
 otherarch/mpt_v3.cpp   | 3 ++-
 otherarch/neox_v3.cpp  | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/otherarch/gpt2_v3.cpp b/otherarch/gpt2_v3.cpp
index 6574a83142bd7..b507357c4555a 100644
--- a/otherarch/gpt2_v3.cpp
+++ b/otherarch/gpt2_v3.cpp
@@ -18,7 +18,8 @@
 
 #ifdef GGML_USE_CUBLAS
 #include "ggml-cuda.h"
-#elif defined(GGML_USE_CLBLAST)
+#endif
+#if defined(GGML_USE_CLBLAST)
 #include "ggml-opencl.h"
 #endif
 
diff --git a/otherarch/gptj_v3.cpp b/otherarch/gptj_v3.cpp
index 12b6df126a6a7..66cad6f5cff44 100644
--- a/otherarch/gptj_v3.cpp
+++ b/otherarch/gptj_v3.cpp
@@ -18,7 +18,8 @@
 
 #ifdef GGML_USE_CUBLAS
 #include "ggml-cuda.h"
-#elif defined(GGML_USE_CLBLAST)
+#endif
+#if defined(GGML_USE_CLBLAST)
 #include "ggml-opencl.h"
 #endif
 
diff --git a/otherarch/llama_v2.cpp b/otherarch/llama_v2.cpp
index 80af180b5330f..af14e9480e4e5 100644
--- a/otherarch/llama_v2.cpp
+++ b/otherarch/llama_v2.cpp
@@ -12,7 +12,8 @@
 
 #ifdef GGML_USE_CUBLAS
 #include "ggml_v2-cuda.h"
-#elif defined(GGML_USE_CLBLAST)
+#endif
+#if defined(GGML_USE_CLBLAST)
 #include "ggml_v2-opencl.h"
 #endif
 
diff --git a/otherarch/mpt_v3.cpp b/otherarch/mpt_v3.cpp
index cca7fc0ca7b7f..ef362a051c3d3 100644
--- a/otherarch/mpt_v3.cpp
+++ b/otherarch/mpt_v3.cpp
@@ -18,7 +18,8 @@
 
 #ifdef GGML_USE_CUBLAS
 #include "ggml-cuda.h"
-#elif defined(GGML_USE_CLBLAST)
+#endif
+#if defined(GGML_USE_CLBLAST)
 #include "ggml-opencl.h"
 #endif
 
diff --git a/otherarch/neox_v3.cpp b/otherarch/neox_v3.cpp
index 8b757dcfb6cf5..7522b8f8da0a2 100644
--- a/otherarch/neox_v3.cpp
+++ b/otherarch/neox_v3.cpp
@@ -16,7 +16,8 @@
 
 #ifdef GGML_USE_CUBLAS
 #include "ggml-cuda.h"
-#elif defined(GGML_USE_CLBLAST)
+#endif
+#if defined(GGML_USE_CLBLAST)
 #include "ggml-opencl.h"
 #endif