llama_cpp 0.12.4 → 0.12.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/llama_cpp/version.rb +2 -2
- data/vendor/tmp/llama.cpp/Makefile +138 -53
- data/vendor/tmp/llama.cpp/ggml-cuda.cu +688 -270
- data/vendor/tmp/llama.cpp/ggml-impl.h +2 -0
- data/vendor/tmp/llama.cpp/ggml-quants.c +39 -94
- data/vendor/tmp/llama.cpp/ggml-quants.h +68 -59
- data/vendor/tmp/llama.cpp/ggml-sycl.cpp +131 -90
- data/vendor/tmp/llama.cpp/ggml-vulkan-shaders.hpp +1516 -10656
- data/vendor/tmp/llama.cpp/ggml-vulkan.cpp +1697 -1241
- data/vendor/tmp/llama.cpp/ggml-vulkan.h +14 -9
- data/vendor/tmp/llama.cpp/ggml.c +13 -10
- data/vendor/tmp/llama.cpp/llama.cpp +266 -43
- data/vendor/tmp/llama.cpp/llama.h +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 143fb1bb108c9cc679ed6eddaaca4cb8a52a5321ee4ffd965440a2c92aeeb99e
|
|
4
|
+
data.tar.gz: f522cbf943f82143d1a4eae679473468a9920a6ef6fe6cf88147b82bc6a1f279
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1646833e8e1ffd6dd22d809ce2c4f2b0f3de78d84504713da4e8d5ab1c2b466c5cbc47a3c787297753f6d56656635e12cf522acffbe37253bdae0c57f8cc51c9
|
|
7
|
+
data.tar.gz: fbbf0372d52ba8862dcc4ff61f590f634cdcde039dc31f09a93ac6cd8e112c34a1c6d567d54a9ec2d0679e1c4ec8c2e8153071c6952f67af34fa0c4ccf49ac76
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
## [[0.12.5](https://github.com/yoshoku/llama_cpp.rb/compare/v0.12.4...v0.12.5)] - 2024-02-09
|
|
2
|
+
|
|
3
|
+
- Bump bundled llama.cpp from b2047 to b2106.
|
|
4
|
+
|
|
1
5
|
## [[0.12.4](https://github.com/yoshoku/llama_cpp.rb/compare/v0.12.3...v0.12.4)] - 2024-02-03
|
|
2
6
|
|
|
3
7
|
- Bump bundled llama.cpp from b1971 to b2047.
|
data/lib/llama_cpp/version.rb
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
# llama_cpp.rb provides Ruby bindings for the llama.cpp.
|
|
4
4
|
module LLaMACpp
|
|
5
5
|
# The version of llama_cpp.rb you install.
|
|
6
|
-
VERSION = '0.12.
|
|
6
|
+
VERSION = '0.12.5'
|
|
7
7
|
|
|
8
8
|
# The version of llama.cpp bundled with llama_cpp.rb.
|
|
9
|
-
LLAMA_CPP_VERSION = '
|
|
9
|
+
LLAMA_CPP_VERSION = 'b2106'
|
|
10
10
|
end
|
|
@@ -109,8 +109,21 @@ MK_NVCCFLAGS += -O3
|
|
|
109
109
|
else
|
|
110
110
|
MK_CFLAGS += -O3
|
|
111
111
|
MK_CXXFLAGS += -O3
|
|
112
|
+
MK_NVCCFLAGS += -O3
|
|
112
113
|
endif
|
|
113
114
|
|
|
115
|
+
ifndef LLAMA_NO_CCACHE
|
|
116
|
+
CCACHE := $(shell which ccache)
|
|
117
|
+
ifdef CCACHE
|
|
118
|
+
export CCACHE_SLOPPINESS = time_macros
|
|
119
|
+
$(info I ccache found, compilation results will be cached. Disable with LLAMA_NO_CCACHE.)
|
|
120
|
+
CC := $(CCACHE) $(CC)
|
|
121
|
+
CXX := $(CCACHE) $(CXX)
|
|
122
|
+
else
|
|
123
|
+
$(info I ccache not found. Consider installing it for faster compilation.)
|
|
124
|
+
endif # CCACHE
|
|
125
|
+
endif # LLAMA_NO_CCACHE
|
|
126
|
+
|
|
114
127
|
# clock_gettime came in POSIX.1b (1993)
|
|
115
128
|
# CLOCK_MONOTONIC came in POSIX.1-2001 / SUSv3 as optional
|
|
116
129
|
# posix_memalign came in POSIX.1-2001 / SUSv3
|
|
@@ -367,7 +380,7 @@ ifdef LLAMA_CUBLAS
|
|
|
367
380
|
MK_CPPFLAGS += -DGGML_USE_CUBLAS -I/usr/local/cuda/include -I/opt/cuda/include -I$(CUDA_PATH)/targets/x86_64-linux/include -I/usr/local/cuda/targets/aarch64-linux/include
|
|
368
381
|
MK_LDFLAGS += -lcuda -lcublas -lculibos -lcudart -lcublasLt -lpthread -ldl -lrt -L/usr/local/cuda/lib64 -L/opt/cuda/lib64 -L$(CUDA_PATH)/targets/x86_64-linux/lib -L/usr/local/cuda/targets/aarch64-linux/lib -L/usr/lib/wsl/lib
|
|
369
382
|
OBJS += ggml-cuda.o
|
|
370
|
-
MK_NVCCFLAGS
|
|
383
|
+
MK_NVCCFLAGS += -use_fast_math
|
|
371
384
|
ifndef JETSON_EOL_MODULE_DETECT
|
|
372
385
|
MK_NVCCFLAGS += --forward-unknown-to-host-compiler
|
|
373
386
|
endif # JETSON_EOL_MODULE_DETECT
|
|
@@ -375,9 +388,9 @@ ifdef LLAMA_DEBUG
|
|
|
375
388
|
MK_NVCCFLAGS += -lineinfo
|
|
376
389
|
endif # LLAMA_DEBUG
|
|
377
390
|
ifdef LLAMA_CUDA_NVCC
|
|
378
|
-
NVCC = $(LLAMA_CUDA_NVCC)
|
|
391
|
+
NVCC = $(CCACHE) $(LLAMA_CUDA_NVCC)
|
|
379
392
|
else
|
|
380
|
-
NVCC = nvcc
|
|
393
|
+
NVCC = $(CCACHE) nvcc
|
|
381
394
|
endif #LLAMA_CUDA_NVCC
|
|
382
395
|
ifdef CUDA_DOCKER_ARCH
|
|
383
396
|
MK_NVCCFLAGS += -Wno-deprecated-gpu-targets -arch=$(CUDA_DOCKER_ARCH)
|
|
@@ -459,6 +472,18 @@ ifdef LLAMA_VULKAN_CHECK_RESULTS
|
|
|
459
472
|
MK_CPPFLAGS += -DGGML_VULKAN_CHECK_RESULTS
|
|
460
473
|
endif
|
|
461
474
|
|
|
475
|
+
ifdef LLAMA_VULKAN_DEBUG
|
|
476
|
+
MK_CPPFLAGS += -DGGML_VULKAN_DEBUG
|
|
477
|
+
endif
|
|
478
|
+
|
|
479
|
+
ifdef LLAMA_VULKAN_VALIDATE
|
|
480
|
+
MK_CPPFLAGS += -DGGML_VULKAN_VALIDATE
|
|
481
|
+
endif
|
|
482
|
+
|
|
483
|
+
ifdef LLAMA_VULKAN_RUN_TESTS
|
|
484
|
+
MK_CPPFLAGS += -DGGML_VULKAN_RUN_TESTS
|
|
485
|
+
endif
|
|
486
|
+
|
|
462
487
|
ggml-vulkan.o: ggml-vulkan.cpp ggml-vulkan.h
|
|
463
488
|
$(CXX) $(CXXFLAGS) -c $< -o $@
|
|
464
489
|
endif # LLAMA_VULKAN
|
|
@@ -472,7 +497,7 @@ ifdef LLAMA_HIPBLAS
|
|
|
472
497
|
ROCM_PATH ?= /opt/rocm
|
|
473
498
|
GPU_TARGETS ?= $(shell $(ROCM_PATH)/llvm/bin/amdgpu-arch)
|
|
474
499
|
endif
|
|
475
|
-
HIPCC ?= $(ROCM_PATH)/bin/hipcc
|
|
500
|
+
HIPCC ?= $(CCACHE) $(ROCM_PATH)/bin/hipcc
|
|
476
501
|
LLAMA_CUDA_DMMV_X ?= 32
|
|
477
502
|
LLAMA_CUDA_MMV_Y ?= 1
|
|
478
503
|
LLAMA_CUDA_KQUANTS_ITER ?= 2
|
|
@@ -542,8 +567,11 @@ $(info I CFLAGS: $(CFLAGS))
|
|
|
542
567
|
$(info I CXXFLAGS: $(CXXFLAGS))
|
|
543
568
|
$(info I NVCCFLAGS: $(NVCCFLAGS))
|
|
544
569
|
$(info I LDFLAGS: $(LDFLAGS))
|
|
545
|
-
$(info I CC: $(shell $(CC)
|
|
546
|
-
$(info I CXX: $(shell $(CXX)
|
|
570
|
+
$(info I CC: $(shell $(CC) --version | head -n 1))
|
|
571
|
+
$(info I CXX: $(shell $(CXX) --version | head -n 1))
|
|
572
|
+
ifdef LLAMA_CUBLAS
|
|
573
|
+
$(info I NVCC: $(shell $(NVCC) --version | tail -n 1))
|
|
574
|
+
endif # LLAMA_CUBLAS
|
|
547
575
|
$(info )
|
|
548
576
|
|
|
549
577
|
#
|
|
@@ -597,97 +625,135 @@ lib: llama.o ggml.o $(OBJS)
|
|
|
597
625
|
|
|
598
626
|
clean:
|
|
599
627
|
rm -vrf *.o tests/*.o *.so *.a *.dll *.dylib benchmark-matmult common/build-info.cpp *.dot $(COV_TARGETS) $(BUILD_TARGETS) $(TEST_TARGETS)
|
|
628
|
+
find examples pocs -type f -name "*.o" -delete
|
|
600
629
|
|
|
601
630
|
#
|
|
602
631
|
# Examples
|
|
603
632
|
#
|
|
604
633
|
|
|
634
|
+
# $< is the first prerequisite, i.e. the source file.
|
|
635
|
+
# Explicitly compile this to an object file so that it can be cached with ccache.
|
|
636
|
+
# The source file is then filtered out from $^ (the list of all prerequisites) and the object file is added instead.
|
|
637
|
+
|
|
638
|
+
# Helper function that replaces .c, .cpp, and .cu file endings with .o:
|
|
639
|
+
GET_OBJ_FILE = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.cu,%.o,$(1))))
|
|
640
|
+
|
|
605
641
|
main: examples/main/main.cpp ggml.o llama.o $(COMMON_DEPS) console.o grammar-parser.o $(OBJS)
|
|
606
|
-
$(CXX) $(CXXFLAGS)
|
|
642
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
643
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
607
644
|
@echo
|
|
608
645
|
@echo '==== Run ./main -h for help. ===='
|
|
609
646
|
@echo
|
|
610
647
|
|
|
611
648
|
infill: examples/infill/infill.cpp ggml.o llama.o $(COMMON_DEPS) console.o grammar-parser.o $(OBJS)
|
|
612
|
-
$(CXX) $(CXXFLAGS)
|
|
649
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
650
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
613
651
|
|
|
614
652
|
simple: examples/simple/simple.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
615
|
-
$(CXX) $(CXXFLAGS)
|
|
653
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
654
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
616
655
|
|
|
617
656
|
tokenize: examples/tokenize/tokenize.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
618
|
-
$(CXX) $(CXXFLAGS)
|
|
657
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
658
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
619
659
|
|
|
620
660
|
batched: examples/batched/batched.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
621
|
-
$(CXX) $(CXXFLAGS)
|
|
661
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
662
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
622
663
|
|
|
623
664
|
batched-bench: examples/batched-bench/batched-bench.cpp build-info.o ggml.o llama.o common.o $(OBJS)
|
|
624
|
-
$(CXX) $(CXXFLAGS)
|
|
665
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
666
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
625
667
|
|
|
626
668
|
quantize: examples/quantize/quantize.cpp build-info.o ggml.o llama.o $(OBJS)
|
|
627
|
-
$(CXX) $(CXXFLAGS)
|
|
669
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
670
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
628
671
|
|
|
629
672
|
quantize-stats: examples/quantize-stats/quantize-stats.cpp build-info.o ggml.o llama.o $(OBJS)
|
|
630
|
-
$(CXX) $(CXXFLAGS)
|
|
673
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
674
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
631
675
|
|
|
632
676
|
perplexity: examples/perplexity/perplexity.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
633
|
-
$(CXX) $(CXXFLAGS)
|
|
677
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
678
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
634
679
|
|
|
635
680
|
imatrix: examples/imatrix/imatrix.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
636
|
-
$(CXX) $(CXXFLAGS)
|
|
681
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
682
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
637
683
|
|
|
638
684
|
embedding: examples/embedding/embedding.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
639
|
-
$(CXX) $(CXXFLAGS)
|
|
685
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
686
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
640
687
|
|
|
641
688
|
save-load-state: examples/save-load-state/save-load-state.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
642
|
-
$(CXX) $(CXXFLAGS)
|
|
689
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
690
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
643
691
|
|
|
644
692
|
server: examples/server/server.cpp examples/server/oai.hpp examples/server/utils.hpp examples/server/httplib.h examples/server/json.hpp examples/server/index.html.hpp examples/server/index.js.hpp examples/server/completion.js.hpp examples/llava/clip.cpp examples/llava/clip.h common/stb_image.h ggml.o llama.o $(COMMON_DEPS) grammar-parser.o $(OBJS)
|
|
645
|
-
$(CXX) $(CXXFLAGS) -
|
|
693
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
694
|
+
$(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
|
|
695
|
+
$(CXX) $(CXXFLAGS) -Iexamples/server $(filter-out %.h %.hpp $< examples/llava/clip.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/llava/clip.cpp) -o $@ $(LDFLAGS) $(LWINSOCK2)
|
|
646
696
|
|
|
647
697
|
gguf: examples/gguf/gguf.cpp ggml.o $(OBJS)
|
|
648
|
-
$(CXX) $(CXXFLAGS)
|
|
698
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
699
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
649
700
|
|
|
650
701
|
train-text-from-scratch: examples/train-text-from-scratch/train-text-from-scratch.cpp ggml.o llama.o $(COMMON_DEPS) train.o $(OBJS)
|
|
651
|
-
$(CXX) $(CXXFLAGS)
|
|
702
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
703
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
652
704
|
|
|
653
705
|
convert-llama2c-to-ggml: examples/convert-llama2c-to-ggml/convert-llama2c-to-ggml.cpp ggml.o llama.o $(OBJS)
|
|
654
|
-
$(CXX) $(CXXFLAGS)
|
|
706
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
707
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
655
708
|
|
|
656
709
|
llama-bench: examples/llama-bench/llama-bench.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
657
|
-
$(CXX) $(CXXFLAGS)
|
|
710
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
711
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
658
712
|
|
|
659
713
|
libllava.a: examples/llava/llava.cpp examples/llava/llava.h examples/llava/clip.cpp examples/llava/clip.h common/stb_image.h common/base64.hpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
660
714
|
$(CXX) $(CXXFLAGS) -static -fPIC -c $< -o $@ -Wno-cast-qual
|
|
661
715
|
|
|
662
716
|
llava-cli: examples/llava/llava-cli.cpp examples/llava/clip.h examples/llava/clip.cpp examples/llava/llava.h examples/llava/llava.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
663
|
-
$(CXX) $(CXXFLAGS)
|
|
717
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
718
|
+
$(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
|
|
719
|
+
$(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp)
|
|
720
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/llava/clip.cpp examples/llava/llava.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/llava/clip.cpp) $(call GET_OBJ_FILE, examples/llava/llava.cpp) -o $@ $(LDFLAGS)
|
|
664
721
|
|
|
665
722
|
baby-llama: examples/baby-llama/baby-llama.cpp ggml.o llama.o $(COMMON_DEPS) train.o $(OBJS)
|
|
666
|
-
$(CXX) $(CXXFLAGS)
|
|
723
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
724
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
667
725
|
|
|
668
726
|
beam-search: examples/beam-search/beam-search.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
669
|
-
$(CXX) $(CXXFLAGS)
|
|
727
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
728
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
670
729
|
|
|
671
730
|
finetune: examples/finetune/finetune.cpp ggml.o llama.o $(COMMON_DEPS) train.o $(OBJS)
|
|
672
|
-
$(CXX) $(CXXFLAGS)
|
|
731
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
732
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
673
733
|
|
|
674
734
|
export-lora: examples/export-lora/export-lora.cpp ggml.o common/common.h $(OBJS)
|
|
675
|
-
$(CXX) $(CXXFLAGS)
|
|
735
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
736
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
676
737
|
|
|
677
738
|
speculative: examples/speculative/speculative.cpp ggml.o llama.o $(COMMON_DEPS) grammar-parser.o $(OBJS)
|
|
678
|
-
$(CXX) $(CXXFLAGS)
|
|
739
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
740
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
679
741
|
|
|
680
742
|
parallel: examples/parallel/parallel.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
681
|
-
$(CXX) $(CXXFLAGS)
|
|
743
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
744
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
682
745
|
|
|
683
746
|
lookahead: examples/lookahead/lookahead.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
684
|
-
$(CXX) $(CXXFLAGS)
|
|
747
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
748
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
685
749
|
|
|
686
750
|
lookup: examples/lookup/lookup.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
687
|
-
$(CXX) $(CXXFLAGS)
|
|
751
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
752
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
688
753
|
|
|
689
754
|
passkey: examples/passkey/passkey.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
|
|
690
|
-
$(CXX) $(CXXFLAGS)
|
|
755
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
756
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
691
757
|
|
|
692
758
|
ifeq ($(UNAME_S),Darwin)
|
|
693
759
|
swift: examples/batched.swift
|
|
@@ -695,7 +761,7 @@ swift: examples/batched.swift
|
|
|
695
761
|
endif
|
|
696
762
|
|
|
697
763
|
common/build-info.cpp: $(wildcard .git/index) scripts/build-info.sh
|
|
698
|
-
@sh scripts/build-info.sh $(CC) > $@.tmp
|
|
764
|
+
@sh scripts/build-info.sh "$(CC)" > $@.tmp
|
|
699
765
|
@if ! cmp -s $@.tmp $@; then \
|
|
700
766
|
mv $@.tmp $@; \
|
|
701
767
|
else \
|
|
@@ -712,7 +778,8 @@ build-info.o: common/build-info.cpp
|
|
|
712
778
|
tests: $(TEST_TARGETS)
|
|
713
779
|
|
|
714
780
|
benchmark-matmult: examples/benchmark/benchmark-matmult.cpp build-info.o ggml.o $(OBJS)
|
|
715
|
-
$(CXX) $(CXXFLAGS)
|
|
781
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
782
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
716
783
|
|
|
717
784
|
run-benchmark-matmult: benchmark-matmult
|
|
718
785
|
./$@
|
|
@@ -720,58 +787,76 @@ run-benchmark-matmult: benchmark-matmult
|
|
|
720
787
|
.PHONY: run-benchmark-matmult swift
|
|
721
788
|
|
|
722
789
|
vdot: pocs/vdot/vdot.cpp ggml.o $(OBJS)
|
|
723
|
-
$(CXX) $(CXXFLAGS)
|
|
790
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
791
|
+
$(CXX) $(CXXFLAGS) $(filter-out $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
724
792
|
|
|
725
793
|
q8dot: pocs/vdot/q8dot.cpp ggml.o $(OBJS)
|
|
726
|
-
$(CXX) $(CXXFLAGS)
|
|
794
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
795
|
+
$(CXX) $(CXXFLAGS) $(filter-out $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
727
796
|
|
|
728
797
|
tests/test-llama-grammar: tests/test-llama-grammar.cpp ggml.o grammar-parser.o $(OBJS)
|
|
729
|
-
$(CXX) $(CXXFLAGS)
|
|
798
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
799
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
730
800
|
|
|
731
801
|
tests/test-grammar-parser: tests/test-grammar-parser.cpp ggml.o llama.o grammar-parser.o $(OBJS)
|
|
732
|
-
$(CXX) $(CXXFLAGS)
|
|
802
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
803
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
733
804
|
|
|
734
805
|
tests/test-double-float: tests/test-double-float.cpp ggml.o $(OBJS)
|
|
735
|
-
$(CXX) $(CXXFLAGS)
|
|
806
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
807
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
736
808
|
|
|
737
809
|
tests/test-grad0: tests/test-grad0.cpp ggml.o $(OBJS)
|
|
738
|
-
$(CXX) $(CXXFLAGS)
|
|
810
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
811
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
739
812
|
|
|
740
813
|
tests/test-opt: tests/test-opt.cpp ggml.o $(OBJS)
|
|
741
|
-
$(CXX) $(CXXFLAGS)
|
|
814
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
815
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
742
816
|
|
|
743
817
|
tests/test-quantize-fns: tests/test-quantize-fns.cpp ggml.o $(OBJS)
|
|
744
|
-
$(CXX) $(CXXFLAGS)
|
|
818
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
819
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
745
820
|
|
|
746
821
|
tests/test-quantize-perf: tests/test-quantize-perf.cpp ggml.o $(OBJS)
|
|
747
|
-
$(CXX) $(CXXFLAGS)
|
|
822
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
823
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
748
824
|
|
|
749
825
|
tests/test-sampling: tests/test-sampling.cpp ggml.o llama.o $(OBJS)
|
|
750
|
-
$(CXX) $(CXXFLAGS)
|
|
826
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
827
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
751
828
|
|
|
752
829
|
tests/test-tokenizer-0-falcon: tests/test-tokenizer-0-falcon.cpp ggml.o llama.o $(COMMON_DEPS) console.o $(OBJS)
|
|
753
|
-
$(CXX) $(CXXFLAGS)
|
|
830
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
831
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
754
832
|
|
|
755
833
|
tests/test-tokenizer-0-llama: tests/test-tokenizer-0-llama.cpp ggml.o llama.o $(COMMON_DEPS) console.o $(OBJS)
|
|
756
|
-
$(CXX) $(CXXFLAGS)
|
|
834
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
835
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
757
836
|
|
|
758
837
|
tests/test-tokenizer-1-bpe: tests/test-tokenizer-1-bpe.cpp ggml.o llama.o $(COMMON_DEPS) console.o $(OBJS)
|
|
759
|
-
$(CXX) $(CXXFLAGS)
|
|
838
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
839
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
760
840
|
|
|
761
841
|
tests/test-tokenizer-1-llama: tests/test-tokenizer-1-llama.cpp ggml.o llama.o $(COMMON_DEPS) console.o $(OBJS)
|
|
762
|
-
$(CXX) $(CXXFLAGS)
|
|
842
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
843
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
763
844
|
|
|
764
845
|
tests/test-rope: tests/test-rope.cpp ggml.o $(OBJS)
|
|
765
|
-
$(CXX) $(CXXFLAGS)
|
|
846
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
847
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
766
848
|
|
|
767
849
|
tests/test-c.o: tests/test-c.c llama.h
|
|
768
850
|
$(CC) $(CFLAGS) -c $(filter-out %.h,$^) -o $@
|
|
769
851
|
|
|
770
852
|
tests/test-backend-ops: tests/test-backend-ops.cpp ggml.o $(OBJS)
|
|
771
|
-
$(CXX) $(CXXFLAGS)
|
|
853
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
854
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
772
855
|
|
|
773
856
|
tests/test-model-load-cancel: tests/test-model-load-cancel.cpp ggml.o llama.o tests/get-model.cpp $(COMMON_DEPS) $(OBJS)
|
|
774
|
-
$(CXX) $(CXXFLAGS)
|
|
857
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
858
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|
|
775
859
|
|
|
776
860
|
tests/test-autorelease: tests/test-autorelease.cpp ggml.o llama.o tests/get-model.cpp $(COMMON_DEPS) $(OBJS)
|
|
777
|
-
$(CXX) $(CXXFLAGS)
|
|
861
|
+
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
|
|
862
|
+
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
|