ikawrakow/ik_llama.cpp
1
0
Fork 0
mirror of https://github.com/ikawrakow/ik_llama.cpp.git synced 2026-04-30 03:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Makefile

Browse Source 
I always use cmake, so had forgotten to pay attention to the
Makefile.
This commit is contained in:
Iwan Kawrakow
2024-08-09 17:29:32 +03:00
committed by Kawrakow
parent f0d7a0d53b
commit f5d1af61d7
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@@ -248,7 +248,7 @@ endif
# keep standard at C11 and C++11 # keep standard at C11 and C++11
MK_CPPFLAGS = -Iggml/include -Iggml/src -Iinclude -Isrc -Icommon MK_CPPFLAGS = -Iggml/include -Iggml/src -Iinclude -Isrc -Icommon
MK_CFLAGS = -std=c11 -fPIC MK_CFLAGS = -std=c11 -fPIC
MK_CXXFLAGS = -std=c++11 -fPIC MK_CXXFLAGS = -std=c++17 -fPIC
MK_NVCCFLAGS = -std=c++11 MK_NVCCFLAGS = -std=c++11
ifdef LLAMA_NO_CCACHE ifdef LLAMA_NO_CCACHE
@@ -560,6 +560,12 @@ ifdef GGML_NVPL
OBJ_GGML += ggml/src/ggml-blas.o OBJ_GGML += ggml/src/ggml-blas.o
endif # GGML_NVPL endif # GGML_NVPL
OBJ_GGML += ggml/src/iqk/iqk_quantize.o
ifndef GGML_NO_IQKMULMAT
MK_CPPFLAGS += -DGGML_USE_IQK_MULMAT
OBJ_GGML += ggml/src/iqk/iqk_mul_mat.o
endif
ifndef GGML_NO_LLAMAFILE ifndef GGML_NO_LLAMAFILE
MK_CPPFLAGS += -DGGML_USE_LLAMAFILE MK_CPPFLAGS += -DGGML_USE_LLAMAFILE
OBJ_GGML += ggml/src/llamafile/sgemm.o OBJ_GGML += ggml/src/llamafile/sgemm.o
@@ -1019,6 +1025,21 @@ ggml/src/ggml-blas.o: \
ggml/include/ggml-blas.h ggml/include/ggml-blas.h
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
ggml/src/iqk/iqk_quantize.o: \
ggml/src/iqk/iqk_quantize.cpp \
ggml/src/iqk/iqk_quantize.h \
ggml/src/ggml-quants.h ggml/src/ggml-common.h ggml/include/ggml.h ggml/src/ggml-impl.h
$(CXX) $(CXXFLAGS) -c $< -o $@
ifndef GGML_NO_IQKMULMAT
ggml/src/iqk/iqk_mul_mat.o: \
ggml/src/iqk/iqk_mul_mat.cpp \
ggml/src/iqk/iqk_mul_mat.h \
ggml/src/iqk/iqk_quantize.h \
ggml/src/ggml-quants.h ggml/src/ggml-common.h ggml/include/ggml.h ggml/src/ggml-impl.h
$(CXX) $(CXXFLAGS) -c $< -o $@
endif # GGML_NO_IQKMULMAT
ifndef GGML_NO_LLAMAFILE ifndef GGML_NO_LLAMAFILE
ggml/src/llamafile/sgemm.o: \ ggml/src/llamafile/sgemm.o: \
ggml/src/llamafile/sgemm.cpp \ ggml/src/llamafile/sgemm.cpp \

6
ggml/src/iqk/iqk_quantize.cpp
View File

@@ -42,9 +42,13 @@ struct IQ1BNQuantizer {
} }
return max_in_row; return max_in_row;
} }
static constexpr uint8_t k_mult[5] = {81, 27, 9, 3, 1}; // The Makefile has issues dwaling with this?
//static constexpr uint8_t k_mult[5] = {81, 27, 9, 3, 1};
static const uint8_t k_mult[5];
}; };
const uint8_t IQ1BNQuantizer::k_mult[5] = {81, 27, 9, 3, 1};
void IQ1BNQuantizer::quantize_one_row_1bn(const float * src, block_iq1_bn * y, int n_per_row, const float * imatrix) { void IQ1BNQuantizer::quantize_one_row_1bn(const float * src, block_iq1_bn * y, int n_per_row, const float * imatrix) {
static const int k_nb[6] = {1, 3, 9, 27, 81, 243}; static const int k_nb[6] = {1, 3, 9, 27, 81, 243};