update Makefile

This commit is contained in:
Djip007 2024-11-17 00:49:52 +01:00
parent dda8847636
commit a3822fb59b

View file

@ -569,7 +569,7 @@ endif # GGML_NVPL
ifndef GGML_NO_LLAMAFILE ifndef GGML_NO_LLAMAFILE
MK_CPPFLAGS += -DGGML_USE_TINYBLAS MK_CPPFLAGS += -DGGML_USE_TINYBLAS
OBJ_GGML_EXT += ggml/src/ggml-tinyblas/ggml-tinyblas.o ggml/src/ggml-tinyblas/sgemm.o OBJ_GGML_EXT += ggml/src/ggml-tinyblas/ggml-tinyblas-cpp17.o ggml/src/ggml-tinyblas/sgemm-cpp17.o
endif endif
ifndef GGML_NO_AMX ifndef GGML_NO_AMX
@ -1153,22 +1153,9 @@ $(DIR_GGML)/src/ggml-cpu/ggml-cpu-cpp.o: \
ggml/src/ggml-impl.h ggml/src/ggml-impl.h
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
# TODO: renomer en GGML_NO_TINYBLAS # for c++17 build
# needed for c++17 build $(DIR_GGML)/%-cpp17.o: $(DIR_GGML)/%.cpp
ifndef GGML_NO_LLAMAFILE $(CXX) $(CXXFLAGS) -MMD -std=c++17 -c $< -o $@
ggml/src/ggml-tinyblas/ggml-tinyblas.o: \
ggml/src/ggml-tinyblas/ggml-tinyblas.cpp \
ggml/include/ggml-tinyblas.h \
ggml/src/ggml-tinyblas/sgemm.h \
ggml/include/ggml.h
$(CXX) $(CXXFLAGS) -std=c++17 -c $< -o $@
ggml/src/ggml-tinyblas/sgemm.o: \
ggml/src/ggml-tinyblas/sgemm.cpp \
ggml/src/ggml-tinyblas/sgemm.h \
ggml/include/ggml.h
$(CXX) $(CXXFLAGS) -std=c++17 -c $< -o $@
endif # GGML_NO_LLAMAFILE
# Rules for building object files # Rules for building object files
$(DIR_GGML)/%.o: $(DIR_GGML)/%.c $(DIR_GGML)/%.o: $(DIR_GGML)/%.c