still refactoring, but need a checkpoint to prepare build for 1.0.7

This commit is contained in:
Concedo
2023-04-01 08:55:14 +08:00
parent 6b86f5ea22
commit 801b178f2a
11 changed files with 452 additions and 44 deletions
+6 -6
View File
@@ -211,7 +211,7 @@ endif
BLAS_BUILD =
ifeq ($(OS),Windows_NT)
BLAS_BUILD = $(CXX) $(CXXFLAGS) ggml_blas.o common.o extra.o expose.o llama_adapter.o libopenblas.lib -shared -o llamacpp_blas.dll $(LDFLAGS)
BLAS_BUILD = $(CXX) $(CXXFLAGS) ggml_blas.o common.o extra.o expose.o model_adapter.o libopenblas.lib -shared -o llamacpp_blas.dll $(LDFLAGS)
else
BLAS_BUILD = @echo 'Your OS is $(OS) and does not appear to be Windows. If you want to use openblas, please link it manually with LLAMA_OPENBLAS=1'
endif
@@ -258,8 +258,8 @@ extra.o: extra.cpp extra.h
expose.o: expose.cpp expose.h
$(CXX) $(CXXFLAGS) -c expose.cpp -o expose.o
llama_adapter.o: llama_adapter.cpp llama_adapter.h
$(CXX) $(CXXFLAGS) -c llama_adapter.cpp -o llama_adapter.o
model_adapter.o:
$(CXX) $(CXXFLAGS) -c llama_adapter.cpp -o model_adapter.o
clean:
rm -vf *.o main quantize perplexity embedding main.exe quantize.exe llamacpp.dll llamacpp_blas.dll gpt2.exe gptj.exe
@@ -274,10 +274,10 @@ gptj: ggml_old_v1.o
$(CXX) $(CXXFLAGS) otherarch/gptj_old.cpp otherarch/utils.cpp ggml_old_v1.o -o gptj $(LDFLAGS)
llamalib: ggml.o common.o extra.o expose.o llama_adapter.o
$(CXX) $(CXXFLAGS) ggml.o common.o extra.o expose.o llama_adapter.o -shared -o llamacpp.dll $(LDFLAGS)
llamalib: ggml.o common.o extra.o expose.o model_adapter.o
$(CXX) $(CXXFLAGS) ggml.o common.o extra.o expose.o model_adapter.o -shared -o llamacpp.dll $(LDFLAGS)
llamalib_blas: ggml_blas.o common.o extra.o expose.o llama_adapter.o
llamalib_blas: ggml_blas.o common.o extra.o expose.o model_adapter.o
$(BLAS_BUILD)
quantize: examples/quantize/quantize.cpp ggml.o llama.o