mirror of
				https://github.com/ggml-org/llama.cpp.git
				synced 2025-10-31 08:51:55 +00:00 
			
		
		
		
	fix llama-lookup-* Makefile rules
This commit is contained in:
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -65,6 +65,7 @@ models-mnt | |||||||
| /llama-gritlm | /llama-gritlm | ||||||
| /llama-imatrix | /llama-imatrix | ||||||
| /llama-infill | /llama-infill | ||||||
|  | /llama-llava | ||||||
| /llama-lookahead | /llama-lookahead | ||||||
| /llama-lookup | /llama-lookup | ||||||
| /llama-lookup-create | /llama-lookup-create | ||||||
| @@ -84,7 +85,6 @@ models-mnt | |||||||
| /llama-tokenize | /llama-tokenize | ||||||
| /llama-train-text-from-scratch | /llama-train-text-from-scratch | ||||||
| /llama-vdot | /llama-vdot | ||||||
| /llava |  | ||||||
| llama-batched-swift | llama-batched-swift | ||||||
| /common/build-info.cpp | /common/build-info.cpp | ||||||
| arm_neon.h | arm_neon.h | ||||||
|   | |||||||
							
								
								
									
										20
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								Makefile
									
									
									
									
									
								
							| @@ -1,5 +1,6 @@ | |||||||
| # Define the default target now so that it is always the first target | # Define the default target now so that it is always the first target | ||||||
| BUILD_TARGETS = \ | BUILD_TARGETS = \ | ||||||
|  | 	libllava.a \ | ||||||
| 	llama \ | 	llama \ | ||||||
| 	llama-baby \ | 	llama-baby \ | ||||||
| 	llama-batched \ | 	llama-batched \ | ||||||
| @@ -16,7 +17,6 @@ BUILD_TARGETS = \ | |||||||
| 	llama-gritlm \ | 	llama-gritlm \ | ||||||
| 	llama-imatrix \ | 	llama-imatrix \ | ||||||
| 	llama-infill \ | 	llama-infill \ | ||||||
| 	llama-libllava.a \ |  | ||||||
| 	llama-llava \ | 	llama-llava \ | ||||||
| 	llama-lookahead \ | 	llama-lookahead \ | ||||||
| 	llama-lookup \ | 	llama-lookup \ | ||||||
| @@ -960,12 +960,18 @@ llama-lookahead: examples/lookahead/lookahead.cpp ggml.o llama.o $(COMMON_DEPS) | |||||||
| llama-lookup: examples/lookup/lookup.cpp ggml.o llama.o ngram-cache.o $(COMMON_DEPS) $(OBJS) | llama-lookup: examples/lookup/lookup.cpp ggml.o llama.o ngram-cache.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) | ||||||
| 	$(CXX) $(CXXFLAGS) -c examples/lookup/lookup-create.cpp -o $(call GET_OBJ_FILE, examples/lookup/lookup-create.cpp) |  | ||||||
| 	$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, examples/lookup/lookup-create.cpp) -o lookup-create $(LDFLAGS) | llama-lookup-create: examples/lookup/lookup-create.cpp ggml.o llama.o ngram-cache.o $(COMMON_DEPS) $(OBJS) | ||||||
| 	$(CXX) $(CXXFLAGS) -c examples/lookup/lookup-merge.cpp -o $(call GET_OBJ_FILE, examples/lookup/lookup-merge.cpp) | 	$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) | ||||||
| 	$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, examples/lookup/lookup-merge.cpp) -o lookup-merge $(LDFLAGS) | 	$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) | ||||||
| 	$(CXX) $(CXXFLAGS) -c examples/lookup/lookup-stats.cpp -o $(call GET_OBJ_FILE, examples/lookup/lookup-stats.cpp) |  | ||||||
| 	$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, examples/lookup/lookup-stats.cpp) -o lookup-stats $(LDFLAGS) | llama-lookup-merge: examples/lookup/lookup-merge.cpp ggml.o llama.o ngram-cache.o $(COMMON_DEPS) $(OBJS) | ||||||
|  | 	$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) | ||||||
|  | 	$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) | ||||||
|  |  | ||||||
|  | llama-lookup-stats: examples/lookup/lookup-stats.cpp ggml.o llama.o ngram-cache.o $(COMMON_DEPS) $(OBJS) | ||||||
|  | 	$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) | ||||||
|  | 	$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) | ||||||
|  |  | ||||||
| llama-passkey: examples/passkey/passkey.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS) | llama-passkey: examples/passkey/passkey.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS) | ||||||
| 	$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) | 	$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Olivier Chafik
					Olivier Chafik