From 296ee3ec58c673f0bc3ccb30394349be2c7dc8f3 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Sat, 13 May 2023 21:09:28 -0700 Subject: [PATCH] Make some other fixes to radpajama build config --- third_party/radpajama/copy-gptneox.cc | 1 + third_party/radpajama/gptneox.cc | 1 + third_party/radpajama/quantize-gptneox.cc | 1 + third_party/radpajama/radpajama.mk | 30 ++++++++++++++++++++--- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/third_party/radpajama/copy-gptneox.cc b/third_party/radpajama/copy-gptneox.cc index 470a17629..1050673c6 100644 --- a/third_party/radpajama/copy-gptneox.cc +++ b/third_party/radpajama/copy-gptneox.cc @@ -47,6 +47,7 @@ static const std::map GPTNEOX_FTYPE_MAP = { // ./quantize models/llama/ggml-model.bin models/llama/ggml-model-quant.bin type // int main(int argc, char ** argv) { + ggjt_v1(); ggml_time_init(); if (argc < 4) { diff --git a/third_party/radpajama/gptneox.cc b/third_party/radpajama/gptneox.cc index 06d8bf352..bf142851b 100644 --- a/third_party/radpajama/gptneox.cc +++ b/third_party/radpajama/gptneox.cc @@ -2247,6 +2247,7 @@ static void gptneox_model_quantize_internal(const std::string & fname_inp, const struct gptneox_context * gptneox_init_from_file( const char * path_model, struct gptneox_context_params params) { + ggjt_v1(); ggml_time_init(); gptneox_context * ctx = new gptneox_context; diff --git a/third_party/radpajama/quantize-gptneox.cc b/third_party/radpajama/quantize-gptneox.cc index 27b0b4816..4ed8cd6a7 100644 --- a/third_party/radpajama/quantize-gptneox.cc +++ b/third_party/radpajama/quantize-gptneox.cc @@ -47,6 +47,7 @@ static const std::map GPTNEOX_FTYPE_MAP = { // ./quantize models/llama/ggml-model.bin models/llama/ggml-model-quant.bin type // int main(int argc, char ** argv) { + ggjt_v1(); ggml_time_init(); if (argc < 4) { diff --git a/third_party/radpajama/radpajama.mk b/third_party/radpajama/radpajama.mk index e197d7282..96107e46c 100644 --- a/third_party/radpajama/radpajama.mk +++ b/third_party/radpajama/radpajama.mk @@ -20,9 +20,7 @@ THIRD_PARTY_RADPAJAMA_A_HDRS = \ THIRD_PARTY_RADPAJAMA_A_SRCS = \ third_party/radpajama/common-gptneox.cc \ - third_party/radpajama/copy-gptneox.cc \ third_party/radpajama/gptneox.cc \ - third_party/radpajama/quantize-gptneox.cc THIRD_PARTY_RADPAJAMA_A_DIRECTDEPS = \ LIBC_CALLS \ @@ -58,6 +56,8 @@ $(THIRD_PARTY_RADPAJAMA_A).pkg: \ # # make -j8 o//third_party/radpajama/radpajama.com # make -j8 o//third_party/radpajama/radpajama-chat.com +# make -j8 o//third_party/radpajama/radpajama-copy.com +# make -j8 o//third_party/radpajama/radpajama-quantize.com THIRD_PARTY_RADPAJAMA_ARTIFACTS += THIRD_PARTY_RADPAJAMA_MAIN THIRD_PARTY_RADPAJAMA_MAIN_OBJS = $(THIRD_PARTY_RADPAJAMA_MAIN_SRCS:%.cc=o/$(MODE)/%.o) @@ -65,20 +65,26 @@ THIRD_PARTY_RADPAJAMA_MAIN_BINS = $(THIRD_PARTY_RADPAJAMA_COMS) $(THIRD_PARTY_RA THIRD_PARTY_RADPAJAMA_MAIN_COMS = \ o/$(MODE)/third_party/radpajama/radpajama.com \ - o/$(MODE)/third_party/radpajama/radpajama-chat.com + o/$(MODE)/third_party/radpajama/radpajama-chat.com \ + o/$(MODE)/third_party/radpajama/radpajama-copy.com \ + o/$(MODE)/third_party/radpajama/radpajama-quantize.com THIRD_PARTY_RADPAJAMA_MAIN_SRCS = \ third_party/radpajama/main-redpajama.cc \ - third_party/radpajama/main-redpajama-chat.cc + third_party/radpajama/main-redpajama-chat.cc \ + third_party/radpajama/copy-gptneox.cc \ + third_party/radpajama/quantize-gptneox.cc THIRD_PARTY_RADPAJAMA_MAIN_DIRECTDEPS = \ LIBC_CALLS \ + LIBC_FMT \ LIBC_INTRIN \ LIBC_NEXGEN32E \ LIBC_RUNTIME \ LIBC_STDIO \ LIBC_STR \ LIBC_STUBS \ + THIRD_PARTY_GGML \ THIRD_PARTY_RADPAJAMA \ THIRD_PARTY_LIBCXX @@ -105,6 +111,22 @@ o/$(MODE)/third_party/radpajama/radpajama-chat.com.dbg: \ $(APE_NO_MODIFY_SELF) @$(APELINK) +o/$(MODE)/third_party/radpajama/radpajama-copy.com.dbg: \ + o/$(MODE)/third_party/radpajama/main.pkg \ + $(THIRD_PARTY_RADPAJAMA_MAIN_DEPS) \ + o/$(MODE)/third_party/radpajama/copy-gptneox.o \ + $(CRT) \ + $(APE_NO_MODIFY_SELF) + @$(APELINK) + +o/$(MODE)/third_party/radpajama/radpajama-quantize.com.dbg: \ + o/$(MODE)/third_party/radpajama/main.pkg \ + $(THIRD_PARTY_RADPAJAMA_MAIN_DEPS) \ + o/$(MODE)/third_party/radpajama/quantize-gptneox.o \ + $(CRT) \ + $(APE_NO_MODIFY_SELF) + @$(APELINK) + ################################################################################ # package level definitions