changes to fix build

YellowRoseCx · Jun 29, 2023 · 2c3b46f · 2c3b46f
1 parent c9e1103
commit 2c3b46f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -184,20 +184,22 @@ ifdef LLAMA_CUDA_KQUANTS_ITER
 else
 	CXXFLAGS += -DK_QUANTS_PER_ITERATION=2
 endif
-ggml-cuda.o:
-    CXXFLAGS += $(addprefix --offload-arch=,$(GPU_TARGETS)) \
-                -DGGML_CUDA_DMMV_X=$(LLAMA_CUDA_DMMV_X) \
-                -DGGML_CUDA_DMMV_Y=$(LLAMA_CUDA_DMMV_Y)
+
+ggml-cuda.o: CXXFLAGS += $(addprefix --offload-arch=,$(GPU_TARGETS)) \
+				-DGGML_CUDA_DMMV_X=$(LLAMA_CUDA_DMMV_X) \
+				-DGGML_CUDA_DMMV_Y=$(LLAMA_CUDA_DMMV_Y)
 # DGGML_CUDA_DMMV_F16 does not currently work with AMD.
 ggml-cuda.o: ggml-cuda.cu ggml-cuda.h
-    $(CXX) $(CXXFLAGS) -x hip -c -o $@ $<
+	$(CXX) $(CXXFLAGS) -x hip -c -o $@ $<
+
 ggml_v2-cuda.o: otherarch/ggml_v2-cuda.cu otherarch/ggml_v2-cuda.h
-    $(CXX) $(CXXFLAGS) -x hip -c -o $@ $<
-ggml_v2-cuda-legacy.o: otherarch/ggml_v2-cuda-legacy.cu otherarch/ggml_v2-cuda-legacy.h
-    $(CXX) $(CXXFLAGS) -x hip -c -o $@ $<
+	$(CXX) $(CXXFLAGS) -x hip -c -o $@ $<
 
+ggml_v2-cuda-legacy.o: otherarch/ggml_v2-cuda-legacy.cu otherarch/ggml_v2-cuda-legacy.h
+	$(CXX) $(CXXFLAGS) -x hip -c -o $@ $<
 endif # LLAMA_HIPBLAS
 
+
 ifdef LLAMA_METAL
 	CFLAGS   += -DGGML_USE_METAL -DGGML_METAL_NDEBUG
 	CXXFLAGS += -DGGML_USE_METAL
@@ -253,11 +255,11 @@ else
 	OPENBLAS_NOAVX2_BUILD = $(CXX) $(CXXFLAGS) $^ $(ARCH_ADD) -lopenblas -shared -o $@.so $(LDFLAGS)
 	endif
 	ifdef LLAMA_CLBLAST
-        ifeq ($(UNAME_S),Darwin)
-                CLBLAST_BUILD = $(CXX) $(CXXFLAGS) $^ -lclblast -framework OpenCL $(ARCH_ADD) -lopenblas -shared -o $@.so $(LDFLAGS)
-        else
-                CLBLAST_BUILD = $(CXX) $(CXXFLAGS) $^ -lclblast -lOpenCL $(ARCH_ADD) -lopenblas -shared -o $@.so $(LDFLAGS)
-        endif
+		ifeq ($(UNAME_S),Darwin)
+				CLBLAST_BUILD = $(CXX) $(CXXFLAGS) $^ -lclblast -framework OpenCL $(ARCH_ADD) -lopenblas -shared -o $@.so $(LDFLAGS)
+		else
+				CLBLAST_BUILD = $(CXX) $(CXXFLAGS) $^ -lclblast -lOpenCL $(ARCH_ADD) -lopenblas -shared -o $@.so $(LDFLAGS)
+		endif
 	endif
 
 ifdef LLAMA_CUBLAS

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
 
@@ -639,4 +640,4 @@ bool gptj_eval(
     ggml_free(ctx0);
 
     return true;
-}
+}
diff --git a/otherarch/llama_v2.cpp b/otherarch/llama_v2.cpp
@@ -11,7 +11,8 @@
 #include "ggml_v2.h"
 #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
 
@@ -3098,4 +3099,4 @@ std::vector<llama_token> llama_v2_tokenize(struct llama_v2_context * ctx, const
     res.resize(n);
 
     return res;
-}
+}
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
 
@@ -658,4 +659,4 @@ bool gpt_neox_eval(
     ggml_free(ctx0);
 
     return true;
-}
+}