tcsenpai/ollama
1
0
Fork 0
mirror of https://github.com/tcsenpai/ollama.git synced 2025-06-10 04:57:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

consistent whitespace

Browse Source
This commit is contained in:
jmorganca 2024-06-11 22:50:10 -07:00
parent 3d1f3569cf
commit 18662d1180
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
llama/Makefile
View File

@ -6,27 +6,27 @@ export CGO_CFLAGS_ALLOW = -mfma|-mf16c
export CGO_CXXFLAGS_ALLOW = -mfma|-mf16c export CGO_CXXFLAGS_ALLOW = -mfma|-mf16c
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
ARCH := amd64 ARCH := amd64
endif endif
ifneq (,$(findstring MINGW,$(OS))) ifneq (,$(findstring MINGW,$(OS)))
OBJ_EXT := obj OBJ_EXT := obj
SHARED_EXT := dll SHARED_EXT := dll
HIP_PATH := $(shell cygpath -w -s "$(HIP_PATH)") HIP_PATH := $(shell cygpath -w -s "$(HIP_PATH)")
else else
OBJ_EXT := o OBJ_EXT := o
SHARED_EXT := so SHARED_EXT := so
endif endif
CUDA_SRCS := \ CUDA_SRCS := \
ggml-cuda.cu \ ggml-cuda.cu \
$(wildcard ggml-cuda/*.cu) \ $(wildcard ggml-cuda/*.cu) \
$(wildcard ggml-cuda/template-instances/fattn-wmma*.cu) \ $(wildcard ggml-cuda/template-instances/fattn-wmma*.cu) \
$(wildcard ggml-cuda/template-instances/mmq*.cu) \ $(wildcard ggml-cuda/template-instances/mmq*.cu) \
$(wildcard ggml-cuda/template-instances/fattn-vec*q4_0-q4_0.cu) \ $(wildcard ggml-cuda/template-instances/fattn-vec*q4_0-q4_0.cu) \
$(wildcard ggml-cuda/template-instances/fattn-vec*q8_0-q8_0.cu) \ $(wildcard ggml-cuda/template-instances/fattn-vec*q8_0-q8_0.cu) \
$(wildcard ggml-cuda/template-instances/fattn-vec*f16-f16.cu) \ $(wildcard ggml-cuda/template-instances/fattn-vec*f16-f16.cu) \
ggml.c ggml-backend.c ggml-alloc.c ggml-quants.c sgemm.cpp ggml.c ggml-backend.c ggml-alloc.c ggml-quants.c sgemm.cpp
CUDA_OBJS := $(CUDA_SRCS:.cu=.cuda.$(OBJ_EXT)) CUDA_OBJS := $(CUDA_SRCS:.cu=.cuda.$(OBJ_EXT))
CUDA_OBJS := $(CUDA_OBJS:.c=.cuda.$(OBJ_EXT)) CUDA_OBJS := $(CUDA_OBJS:.c=.cuda.$(OBJ_EXT))
@ -37,72 +37,72 @@ HIP_OBJS := $(HIP_OBJS:.c=.hip.$(OBJ_EXT))
HIP_OBJS := $(HIP_OBJS:.cpp=.hip.$(OBJ_EXT)) HIP_OBJS := $(HIP_OBJS:.cpp=.hip.$(OBJ_EXT))
CUDA_FLAGS := \ CUDA_FLAGS := \
--generate-code=arch=compute_50,code=[compute_50,sm_50] \ --generate-code=arch=compute_50,code=[compute_50,sm_50] \
--generate-code=arch=compute_52,code=[compute_52,sm_52] \ --generate-code=arch=compute_52,code=[compute_52,sm_52] \
--generate-code=arch=compute_61,code=[compute_61,sm_61] \ --generate-code=arch=compute_61,code=[compute_61,sm_61] \
--generate-code=arch=compute_70,code=[compute_70,sm_70] \ --generate-code=arch=compute_70,code=[compute_70,sm_70] \
--generate-code=arch=compute_75,code=[compute_75,sm_75] \ --generate-code=arch=compute_75,code=[compute_75,sm_75] \
--generate-code=arch=compute_80,code=[compute_80,sm_80] \ --generate-code=arch=compute_80,code=[compute_80,sm_80] \
-DGGML_CUDA_DMMV_X=32 \ -DGGML_CUDA_DMMV_X=32 \
-DGGML_CUDA_PEER_MAX_BATCH_SIZE=128 \ -DGGML_CUDA_PEER_MAX_BATCH_SIZE=128 \
-DGGML_USE_CUDA=1 \ -DGGML_USE_CUDA=1 \
-DGGML_SHARED=1 \ -DGGML_SHARED=1 \
-DGGML_BUILD=1 \ -DGGML_BUILD=1 \
-DGGML_USE_LLAMAFILE \ -DGGML_USE_LLAMAFILE \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
-DCMAKE_POSITION_INDEPENDENT_CODE=on \ -DCMAKE_POSITION_INDEPENDENT_CODE=on \
-Wno-deprecated-gpu-targets \ -Wno-deprecated-gpu-targets \
--forward-unknown-to-host-compiler \ --forward-unknown-to-host-compiler \
-use_fast_math \ -use_fast_math \
-link \ -link \
-shared \ -shared \
-I. \ -I. \
-O3 -O3
HIP_ARCHS := gfx900 gfx940 gfx941 gfx942 gfx1010 gfx1012 gfx1030 gfx1100 gfx1101 gfx1102 HIP_ARCHS := gfx900 gfx940 gfx941 gfx942 gfx1010 gfx1012 gfx1030 gfx1100 gfx1101 gfx1102
LINUX_HIP_ARCHS := gfx906:xnack- gfx908:xnack- gfx90a:xnack+ gfx90a:xnack- LINUX_HIP_ARCHS := gfx906:xnack- gfx908:xnack- gfx90a:xnack+ gfx90a:xnack-
HIPCC := "$(HIP_PATH)/bin/hipcc.bin.exe" HIPCC := "$(HIP_PATH)/bin/hipcc.bin.exe"
HIP_FLAGS := \ HIP_FLAGS := \
-c \ -c \
-O3 \ -O3 \
-DGGML_USE_CUDA \ -DGGML_USE_CUDA \
-DGGML_BUILD=1 \ -DGGML_BUILD=1 \
-DGGML_SHARED=1 \ -DGGML_SHARED=1 \
-DGGML_CUDA_DMMV_X=32 \ -DGGML_CUDA_DMMV_X=32 \
-DGGML_CUDA_MMV_Y=1 \ -DGGML_CUDA_MMV_Y=1 \
-DGGML_SCHED_MAX_COPIES=4 \ -DGGML_SCHED_MAX_COPIES=4 \
-DGGML_USE_HIPBLAS \ -DGGML_USE_HIPBLAS \
-DGGML_USE_LLAMAFILE \ -DGGML_USE_LLAMAFILE \
-DHIP_FAST_MATH \ -DHIP_FAST_MATH \
-DNDEBUG \ -DNDEBUG \
-DK_QUANTS_PER_ITERATION=2 \ -DK_QUANTS_PER_ITERATION=2 \
-D_CRT_SECURE_NO_WARNINGS \ -D_CRT_SECURE_NO_WARNINGS \
-DCMAKE_POSITION_INDEPENDENT_CODE=on \ -DCMAKE_POSITION_INDEPENDENT_CODE=on \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
-Wno-expansion-to-defined \ -Wno-expansion-to-defined \
-Wno-invalid-noreturn \ -Wno-invalid-noreturn \
-Wno-ignored-attributes \ -Wno-ignored-attributes \
-Wno-pass-failed \ -Wno-pass-failed \
-Wno-deprecated-declarations \ -Wno-deprecated-declarations \
-Wno-unused-result \ -Wno-unused-result \
-Xclang \ -Xclang \
--dependent-lib=msvcrt \ --dependent-lib=msvcrt \
-I. \ -I. \
$(foreach arch, $(HIP_ARCHS), --offload-arch=$(arch)) $(foreach arch, $(HIP_ARCHS), --offload-arch=$(arch))
ifeq ($(UNAME_S), Linux) ifeq ($(UNAME_S), Linux)
HIP_FLAGS += $(foreach arch, $(LINUX_HIP_ARCHS), --offload-arch=$(arch)) HIP_FLAGS += $(foreach arch, $(LINUX_HIP_ARCHS), --offload-arch=$(arch))
endif endif
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
all: ollama_runner all: ollama_runner
else ifeq ($(ARCH),amd64) else ifeq ($(ARCH),amd64)
all: ollama_runner ollama_runner_avx ollama_runner_avx2 all: ollama_runner ollama_runner_avx ollama_runner_avx2
endif endif
else else
all: ollama_runner ollama_runner_avx ollama_runner_avx2 ollama_runner_cuda ollama_runner_rocm all: ollama_runner ollama_runner_avx ollama_runner_avx2 ollama_runner_cuda ollama_runner_rocm
endif endif
%.cuda.$(OBJ_EXT): %.cu %.cuda.$(OBJ_EXT): %.cu