Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Refactor/tinyblas #10343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
Loading
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update Makefile
  • Loading branch information
Djip007 committed Nov 16, 2024
commit a3822fb59b9649a7dc1b916cd9c05950b5adfba7
21 changes: 4 additions & 17 deletions 21 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
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.