Revert "fix my mistake that broke other arches"

YellowRoseCx · YellowRoseCx · commit 72c16d2310b2 · 2023-07-03T16:45:39.000-05:00
This reverts commit 777aed5.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
 
