From 5231ae52d9b5d4044f96f90029fbdc9789bb9761 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Fri, 25 Oct 2024 11:50:45 -0700 Subject: [PATCH] Fix incremental build file deps (#7361) The common src/hdr defs should be in the common definitions, not gpu specific. --- llama/make/common-defs.make | 6 ++++++ llama/make/gpu.make | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/llama/make/common-defs.make b/llama/make/common-defs.make index 34545069..8ba33501 100644 --- a/llama/make/common-defs.make +++ b/llama/make/common-defs.make @@ -76,3 +76,9 @@ else CP := cp -af endif +COMMON_SRCS := \ + $(wildcard *.c) \ + $(wildcard *.cpp) +COMMON_HDRS := \ + $(wildcard *.h) \ + $(wildcard *.hpp) diff --git a/llama/make/gpu.make b/llama/make/gpu.make index 1b233e1f..939fa41a 100644 --- a/llama/make/gpu.make +++ b/llama/make/gpu.make @@ -34,13 +34,6 @@ endif GPU_RUNNER_LIBS = $(wildcard $(addsuffix .$(SHARED_EXT).*,$(addprefix $(GPU_LIB_DIR)/$(SHARED_PREFIX),$(GPU_RUNNER_LIBS_SHORT)))) DIST_GPU_RUNNER_LIB_DEPS = $(addprefix $(DIST_GPU_RUNNER_DEPS_DIR)/,$(notdir $(GPU_RUNNER_LIBS))) -COMMON_SRCS := \ - $(wildcard *.c) \ - $(wildcard *.cpp) -COMMON_HDRS := \ - $(wildcard *.h) \ - $(wildcard *.hpp) - GPU_RUNNER_SRCS := \ ggml-cuda.cu \ $(filter-out $(wildcard ggml-cuda/fattn*.cu),$(wildcard ggml-cuda/*.cu)) \