Skip to content

Commit

Permalink
update Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
Djip007 committed Nov 16, 2024
1 parent dda8847 commit a3822fb
Showing 1 changed file with 4 additions and 17 deletions.
21 changes: 4 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ endif # GGML_NVPL

ifndef GGML_NO_LLAMAFILE
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

ifndef GGML_NO_AMX
Expand Down Expand Up @@ -1153,22 +1153,9 @@ $(DIR_GGML)/src/ggml-cpu/ggml-cpu-cpp.o: \
ggml/src/ggml-impl.h
$(CXX) $(CXXFLAGS) -c $< -o $@

# TODO: renomer en GGML_NO_TINYBLAS
# needed for c++17 build
ifndef GGML_NO_LLAMAFILE
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
# for c++17 build
$(DIR_GGML)/%-cpp17.o: $(DIR_GGML)/%.cpp
$(CXX) $(CXXFLAGS) -MMD -std=c++17 -c $< -o $@

# Rules for building object files
$(DIR_GGML)/%.o: $(DIR_GGML)/%.c
Expand Down

0 comments on commit a3822fb

Please sign in to comment.