From 815ceaa04f0a851e02da5d4527acc48863fe20c9 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Fisher Date: Sun, 5 Nov 2017 12:14:04 +0300 Subject: [PATCH 1/3] using pattern rules, test depends on same name obj. --- testing/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/testing/Makefile b/testing/Makefile index bd679e8..1f7dae9 100644 --- a/testing/Makefile +++ b/testing/Makefile @@ -40,12 +40,9 @@ include $(KBLAS_TEST3_DIR)/Makefile C_OBJ= $(patsubst %.c,$(OBJ_DIR)/%.o,$(C_SRC)) EXE= $(patsubst %.c,$(BIN_DIR)/%,$(C_SRC)) -$(BIN_DIR)/test_%: $(OBJ_DIR)/test_%.o - $(CC) $(COPTS) $< -o $@ $(LIB_PATH) $(LIB) - all: $(EXE) -$(EXE): $(C_OBJ) - +$(EXE): $(BIN_DIR)/%: $(OBJ_DIR)/%.o + $(CC) $(COPTS) $< -o $@ $(LIB_PATH) $(LIB) clean: rm -f $(OBJ_DIR)/*.o $(EXE) From dd1d7dbbc1b64de6cc9b2214555ae52636a97b4e Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Fisher Date: Sun, 5 Nov 2017 12:18:15 +0300 Subject: [PATCH 2/3] tests depend on $(KBLAS_LIB), not objects. --- testing/Makefile | 2 +- testing/blas_l2/Makefile | 2 +- testing/blas_l3/Makefile | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testing/Makefile b/testing/Makefile index 1f7dae9..ef37773 100644 --- a/testing/Makefile +++ b/testing/Makefile @@ -42,7 +42,7 @@ EXE= $(patsubst %.c,$(BIN_DIR)/%,$(C_SRC)) all: $(EXE) -$(EXE): $(BIN_DIR)/%: $(OBJ_DIR)/%.o +$(EXE): $(BIN_DIR)/%: $(OBJ_DIR)/%.o $(KBLAS_LIB) $(CC) $(COPTS) $< -o $@ $(LIB_PATH) $(LIB) clean: rm -f $(OBJ_DIR)/*.o $(EXE) diff --git a/testing/blas_l2/Makefile b/testing/blas_l2/Makefile index d98cc31..b0b455a 100644 --- a/testing/blas_l2/Makefile +++ b/testing/blas_l2/Makefile @@ -45,5 +45,5 @@ C_SRC+= test_sscal.c \ test_dgemv2_dim.c -$(OBJ_DIR)/test_%.o: $(KBLAS_TEST2_DIR)/test_%.c $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%.o: $(KBLAS_TEST2_DIR)/test_%.c $(INC_SRC) $(CC) $(COPTS) $(INCLUDES) -c $< -o $@ diff --git a/testing/blas_l3/Makefile b/testing/blas_l3/Makefile index d790736..29f7172 100644 --- a/testing/blas_l3/Makefile +++ b/testing/blas_l3/Makefile @@ -35,27 +35,27 @@ C_SRC+= \ # EXE+= $(patsubst %.c,$(BIN_DIR)/%,$(KBLAS_L3_CSRC)) -$(OBJ_DIR)/test_%trmm.o: $(KBLAS_TEST3_DIR)/test_%trmm.c $(KBLAS_TEST3_DIR)/test_trmm.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%trmm.o: $(KBLAS_TEST3_DIR)/test_%trmm.c $(KBLAS_TEST3_DIR)/test_trmm.ch testing_Xtr_common.h $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ -$(OBJ_DIR)/test_%trmm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_cpu.c $(KBLAS_TEST3_DIR)/test_trmm_cpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%trmm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_cpu.c $(KBLAS_TEST3_DIR)/test_trmm_cpu.ch testing_Xtr_common.h $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ -$(OBJ_DIR)/test_%trmm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_mgpu.c $(KBLAS_TEST3_DIR)/test_trmm_mgpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%trmm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_mgpu.c $(KBLAS_TEST3_DIR)/test_trmm_mgpu.ch testing_Xtr_common.h $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ -$(OBJ_DIR)/test_%trsm.o: $(KBLAS_TEST3_DIR)/test_%trsm.c $(KBLAS_TEST3_DIR)/test_trsm.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%trsm.o: $(KBLAS_TEST3_DIR)/test_%trsm.c $(KBLAS_TEST3_DIR)/test_trsm.ch testing_Xtr_common.h $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ -$(OBJ_DIR)/test_%trsm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_cpu.c $(KBLAS_TEST3_DIR)/test_trsm_cpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%trsm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_cpu.c $(KBLAS_TEST3_DIR)/test_trsm_cpu.ch testing_Xtr_common.h $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ -$(OBJ_DIR)/test_%trsm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_mgpu.c $(KBLAS_TEST3_DIR)/test_trsm_mgpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%trsm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_mgpu.c $(KBLAS_TEST3_DIR)/test_trsm_mgpu.ch testing_Xtr_common.h $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ -$(OBJ_DIR)/test_%gemm.o: $(KBLAS_TEST3_DIR)/test_%gemm.c $(KBLAS_TEST3_DIR)/test_gemm.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%gemm.o: $(KBLAS_TEST3_DIR)/test_%gemm.c $(KBLAS_TEST3_DIR)/test_gemm.ch testing_Xtr_common.h $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ -$(OBJ_DIR)/test_%gemmXt.o: $(KBLAS_TEST3_DIR)/test_%gemmXt.c $(INC_SRC) $(KBLAS_LIB) +$(OBJ_DIR)/test_%gemmXt.o: $(KBLAS_TEST3_DIR)/test_%gemmXt.c $(INC_SRC) $(CXX) $(INCLUDES) -c $< -o $@ From 0769b54788a5143fcc6ad343204ad5db34ffa3ee Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Fisher Date: Sun, 5 Nov 2017 12:41:25 +0300 Subject: [PATCH 3/3] Add .PHONY target --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d1355ec..f525db1 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +.PHONY: all clean + all: (cd src && make -j) (cd testing && make -j) @@ -5,4 +7,4 @@ all: clean: rm -f -v ./lib/*.a (cd src && make clean) - (cd testing && make clean) \ No newline at end of file + (cd testing && make clean)