From 17355faf6e1a8ba2428bc8f4e998828bcaab42c0 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:00:18 +0800 Subject: [PATCH] sdcpp is working! --- Makefile | 2 +- otherarch/sdcpp/model.cpp | 6 +++--- otherarch/sdcpp/util.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 26bbdd242..fb6db30d7 100644 --- a/Makefile +++ b/Makefile @@ -502,7 +502,7 @@ clean: main: examples/main/main.cpp common/sampling.cpp build-info.h ggml.o ggml-quants.o ggml-alloc.o ggml-backend.o llama.o common.o console.o grammar-parser.o $(OBJS) $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) @echo '==== Run ./main -h for help. ====' -sdmain: otherarch/sdcpp/main.cpp otherarch/sdcpp/stable-diffusion.cpp common/sampling.cpp build-info.h ggml.o ggml-quants.o ggml-alloc.o ggml-backend.o llama.o common.o console.o grammar-parser.o $(OBJS) +sdmain: otherarch/sdcpp/main.cpp otherarch/sdcpp/stable-diffusion.cpp otherarch/sdcpp/util.cpp otherarch/sdcpp/upscaler.cpp otherarch/sdcpp/model.cpp otherarch/sdcpp/thirdparty/zip.c common/sampling.cpp build-info.h ggml.o ggml-quants.o ggml-alloc.o ggml-backend.o llama.o common.o console.o grammar-parser.o $(OBJS) $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) imatrix: examples/imatrix/imatrix.cpp common/sampling.cpp build-info.h ggml.o ggml-quants.o ggml-alloc.o ggml-backend.o llama.o common.o console.o grammar-parser.o $(OBJS) $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) diff --git a/otherarch/sdcpp/model.cpp b/otherarch/sdcpp/model.cpp index 5925a7da5..7a0efa75e 100644 --- a/otherarch/sdcpp/model.cpp +++ b/otherarch/sdcpp/model.cpp @@ -11,9 +11,9 @@ #include "util.h" #include "vocab.hpp" -#include "ggml/ggml-alloc.h" -#include "ggml/ggml-backend.h" -#include "ggml/ggml.h" +#include "ggml-alloc.h" +#include "ggml-backend.h" +#include "ggml.h" #include "stable-diffusion.h" diff --git a/otherarch/sdcpp/util.cpp b/otherarch/sdcpp/util.cpp index 346886b1b..af51f6e74 100644 --- a/otherarch/sdcpp/util.cpp +++ b/otherarch/sdcpp/util.cpp @@ -22,7 +22,7 @@ #include #endif -#include "ggml/ggml.h" +#include "ggml.h" #include "stable-diffusion.h" bool ends_with(const std::string& str, const std::string& ending) {