Update to use scheme.mk

shadmwanzia · Dec 18, 2016 · 733aff9 · 733aff9
1 parent 517e78d
commit 733aff9
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 134 deletions.
diff --git a/bin/cuda/makefile b/bin/cuda/makefile
@@ -4,19 +4,11 @@ LDFLAGS := -L"../../lib" -lccv $(LDFLAGS)
 CFLAGS := -O3 -Wall -I"../../lib" $(CFLAGS)
 NVFLAGS := -O3 -I"../../lib" -lineinfo $(NVFLAGS)
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all clean
+.PHONY: release all clean
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../lib/scheme.mk
 
 all: libccv.a cwc-forwards cwc-backwards cwc-bench cwc-verify
 

diff --git a/bin/makefile b/bin/makefile
@@ -7,19 +7,11 @@ TARGETS = bbffmt msermatch siftmatch bbfcreate bbfdetect scdcreate scddetect swt
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all clean dep
+.PHONY: release all clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../lib/scheme.mk
 
 all: libccv.a $(TARGETS) .gitignore
 

diff --git a/bin/nnc/cudnn/makefile b/bin/nnc/cudnn/makefile
@@ -8,19 +8,11 @@ TARGETS = conv-cudnn-forw conv-cudnn-back
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all clean dep
+.PHONY: release all clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../../lib/scheme.mk
 
 all: $(TARGETS)
 

diff --git a/bin/nnc/makefile b/bin/nnc/makefile
@@ -8,19 +8,11 @@ TARGETS = nnc-e2e-verify nnc-e2e-sym-verify nnc-sym
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all clean dep
+.PHONY: release all clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../lib/scheme.mk
 
 all: $(TARGETS)
 

diff --git a/bin/nnc/opt/makefile b/bin/nnc/opt/makefile
@@ -8,19 +8,11 @@ TARGETS = auto-tune-conv auto-tune-gemm conv-4x4-3x3-winograd conv-gemm conv-opt
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all clean dep
+.PHONY: release all clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../../lib/scheme.mk
 
 all: $(TARGETS)
 

diff --git a/lib/makefile b/lib/makefile
@@ -9,19 +9,12 @@ SRC_OBJS := $(patsubst %.c,%.o,$(SRCS))
 
 CUDA_OBJS := $(patsubst %.c,%.o,$(patsubst %.cu,%.o,$(CUDA_SRCS)))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
 # Make nnc/libnnc.o a phony target therefore it will be triggered every time.
-.PHONY: release debug all lib clean dep nnc/libnnc.o
+.PHONY: release all lib clean dep nnc/libnnc.o
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include scheme.mk
 
 all: lib ../samples/image-net-2012-vgg-d.sqlite3
 

diff --git a/lib/nnc/cmd/makefile b/lib/nnc/cmd/makefile
@@ -7,18 +7,11 @@ CUDA_CMD_OBJS := $(patsubst %.c,%.o,$(patsubst %.cu,%.o,$(CUDA_CMD_SRCS)))
 CFLAGS := -O3 -Wall -I"../../" $(CFLAGS)
 NVFLAGS := -O3 -I"../../" $(NVFLAGS)
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all lib clean cmd libnnc-cmd.o $(CUDA_CMD_LIB)
+.PHONY: release all lib clean cmd libnnc-cmd.o $(CUDA_CMD_LIB)
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../scheme.mk
 
 all: lib
 

diff --git a/lib/nnc/gpu/makefile b/lib/nnc/gpu/makefile
@@ -7,18 +7,11 @@ SRCS := ccv_nnc_compat.cu
 
 SRC_OBJS := $(patsubst %.c,%.o,$(patsubst %.cu,%.o,$(SRCS)))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all lib clean libnnc-compat-cuda.o
+.PHONY: release all lib clean libnnc-compat-cuda.o
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../scheme.mk
 
 all: lib
 

diff --git a/lib/nnc/makefile b/lib/nnc/makefile
@@ -7,18 +7,11 @@ SRCS := ccv_nnc_cmd.c ccv_nnc_tensor.c ccv_nnc_graph.c ccv_nnc_symbolic_graph.c
 
 SRC_OBJS := $(patsubst %.c,%.o,$(SRCS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
-.PHONY: release debug all lib clean cmd libnnc.o cmd/libnnc-cmd.o gpu/libnnc-compat-cuda.o
+.PHONY: release all lib clean cmd libnnc.o cmd/libnnc-cmd.o gpu/libnnc-compat-cuda.o
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../scheme.mk
 
 all: lib
 

diff --git a/lib/scheme.mk b/lib/scheme.mk
@@ -0,0 +1,14 @@
+.PHONY: debug 
+
+# Debug Scheme
+
+DEBUG ?= 0
+ifeq ($(DEBUG), 1)
+	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
+	LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
+endif
+
+debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
+debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
+debug: export DEBUG = 1
+debug: all
diff --git a/serve/makefile b/serve/makefile
@@ -9,18 +9,11 @@ SRCS = serve.c uri.c parsers.c bbf.c dpm.c icf.c scd.c sift.c swt.c tld.c convne
 
 SRC_OBJS := $(patsubst %.c,%.o,$(SRCS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address
-endif
-
-.PHONY: release debug all clean dep
+.PHONY: release all clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address
-debug: export DEBUG = 1
-debug: all
+include ../lib/scheme.mk
 
 all: libccv.a $(TARGETS)
 

diff --git a/site/_source/makefile b/site/_source/makefile
@@ -7,17 +7,9 @@ TARGETS = section-001-001 section-001-002
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address
-endif
-
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address
-debug: export DEBUG = 1
-debug: all
+include ../../lib/scheme.mk
 
 all: libccv.a $(TARGETS)
 

diff --git a/test/regression/makefile b/test/regression/makefile
@@ -6,21 +6,13 @@ TARGETS = defects.l0.1.tests
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
 .PRECIOUS: $(patsubst %,%.o,$(TARGETS))
 
-.PHONY: release debug all test clean dep
+.PHONY: release all test clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../lib/scheme.mk
 
 all: $(TARGETS)
 

diff --git a/test/unit/makefile b/test/unit/makefile
@@ -6,21 +6,13 @@ TARGETS = algebra.tests util.tests numeric.tests basic.tests image_processing.te
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
 .PRECIOUS: $(patsubst %,%.o,$(TARGETS))
 
-.PHONY: release debug all test clean dep
+.PHONY: release all test clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../lib/scheme.mk
 
 all: $(TARGETS)
 

diff --git a/test/unit/nnc/makefile b/test/unit/nnc/makefile
@@ -6,21 +6,13 @@ TARGETS = tfb.tests tensor.tests forward.tests backward.tests gradient.tests gra
 
 TARGET_SRCS := $(patsubst %,%.c,$(TARGETS))
 
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-endif
-
 .PRECIOUS: $(patsubst %,%.o,$(TARGETS))
 
-.PHONY: release debug all test clean dep
+.PHONY: release all test clean dep
 
 release: all
 
-debug: CFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: LDFLAGS += -g -fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined
-debug: export DEBUG = 1
-debug: all
+include ../../../lib/scheme.mk
 
 all: $(TARGETS)