vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attemp to fix compile problem on mac

Browse source
This commit is contained in:
ngxson 2024-06-12 12:49:01 +02:00
parent 7297817d13
commit e683b9af60
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -3,7 +3,7 @@ BUILD_TARGETS = \
main quantize quantize-stats perplexity imatrix embedding vdot q8dot train-text-from-scratch convert-llama2c-to-ggml \ main quantize quantize-stats perplexity imatrix embedding vdot q8dot train-text-from-scratch convert-llama2c-to-ggml \
simple batched batched-bench save-load-state server gguf gguf-split eval-callback llama-bench libllava.a llava-cli baby-llama \ simple batched batched-bench save-load-state server gguf gguf-split eval-callback llama-bench libllava.a llava-cli baby-llama \
retrieval speculative infill tokenize benchmark-matmult parallel finetune export-lora lookahead lookup passkey gritlm \ retrieval speculative infill tokenize benchmark-matmult parallel finetune export-lora lookahead lookup passkey gritlm \
tests/test-c.o control-vector-generator control-vector-generator tests/test-c.o
# Binaries only useful for tests # Binaries only useful for tests
TEST_TARGETS = \ TEST_TARGETS = \
@ -874,7 +874,7 @@ eval-callback: examples/eval-callback/eval-callback.cpp ggml.o llama.o $(COMMON_
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) $(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) $(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
control-vector-generator: examples/control-vector-generator/control-vector-generator.cpp examples/control-vector-generator/pca.hpp ggml.o llama.o $(COMMON_DEPS) $(OBJS) control-vector-generator: examples/control-vector-generator/control-vector-generator.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) $(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) $(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)

6
examples/control-vector-generator/control-vector-generator.cpp
View file

@ -603,11 +603,11 @@ int main(int argc, char ** argv) {
cb_data.n_layers = n_layers; cb_data.n_layers = n_layers;
cb_data.n_tokens = t.max_seq_len; cb_data.n_tokens = t.max_seq_len;
printf("Evaluating prompt[%ld/%ld]: \"%s\" - \"%s\" (%ld tokens)\n", printf("Evaluating prompt[%d/%d]: \"%s\" - \"%s\" (%d tokens)\n",
i+1, cparams.positive_entries.size(), (int) i+1, (int) cparams.positive_entries.size(),
tokens_to_str(ctx, t.tokens_pos.cbegin(), t.tokens_pos.cend()).c_str(), tokens_to_str(ctx, t.tokens_pos.cbegin(), t.tokens_pos.cend()).c_str(),
tokens_to_str(ctx, t.tokens_neg.cbegin(), t.tokens_neg.cend()).c_str(), tokens_to_str(ctx, t.tokens_neg.cbegin(), t.tokens_neg.cend()).c_str(),
t.max_seq_len); (int) t.max_seq_len);
cb_data.is_eval_pos = true; cb_data.is_eval_pos = true;
get_hidden_layers(ctx, t.tokens_pos); get_hidden_layers(ctx, t.tokens_pos);

4
examples/control-vector-generator/pca.hpp
View file

@ -21,7 +21,7 @@
#define DEBUG_POS 5 #define DEBUG_POS 5
static void print_debug_tensor(struct ggml_tensor * t, bool with_data = true) { static void print_debug_tensor(struct ggml_tensor * t, bool with_data = true) {
printf("%s: %s (%s): [%ld, %ld]\n", __func__, t->name, ggml_type_name(t->type), (size_t) t->ne[0], (size_t) t->ne[1]); printf("%s: %s (%s): [%d, %d]\n", __func__, t->name, ggml_type_name(t->type), (int) t->ne[0], (int) t->ne[1]);
if (!with_data) return; if (!with_data) return;
printf("%s: %s[0] = [", __func__, t->name); printf("%s: %s[0] = [", __func__, t->name);
for (size_t i = 0; i <= DEBUG_POS; i++) { for (size_t i = 0; i <= DEBUG_POS; i++) {
@ -325,7 +325,7 @@ static void run_pca(
params.i_layer = il; params.i_layer = il;
params.n_layers = v_input.size(); params.n_layers = v_input.size();
power_iteration(params, v_input[il], ctrl_out); power_iteration(params, v_input[il], ctrl_out);
printf("%s: Done layer %ld / %ld\n", __func__, il+1, v_input.size()); printf("%s: Done layer %d / %d\n", __func__, (int) il+1, v_input.size());
//print_debug_tensor(ctrl_out); //print_debug_tensor(ctrl_out);
} }
} }