From 741ada451cc7fee1b9a4c3deaec6af87a2af7497 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 17 Aug 2015 16:31:25 +0000
Subject: [PATCH] Added Darknet reference model

---
 Makefile |   57 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index e48e142..556f2a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,49 +1,62 @@
-GPU=1
+GPU=0
+OPENCV=0
 DEBUG=0
 
+ARCH= --gpu-architecture=compute_20 --gpu-code=compute_20
+
 VPATH=./src/
-EXEC=cnn
+EXEC=darknet
 OBJDIR=./obj/
 
 CC=gcc
 NVCC=nvcc
-OPTS=-O3
-LINKER=$(CC)
-LDFLAGS=`pkg-config --libs opencv` -lm -pthread
-COMMON=`pkg-config --cflags opencv` -I/usr/local/cuda/include/
-CFLAGS=-Wall -Wfatal-errors
-CFLAGS+=$(OPTS)
+OPTS=-Ofast
+LDFLAGS= -lm -pthread -lstdc++ 
+COMMON= -I/usr/local/cuda/include/ 
+CFLAGS=-Wall -Wfatal-errors 
 
 ifeq ($(DEBUG), 1) 
-COMMON+=-O0 -g
-CFLAGS+=-O0 -g
+OPTS=-O0 -g
+endif
+
+CFLAGS+=$(OPTS)
+
+ifeq ($(OPENCV), 1) 
+COMMON+= -DOPENCV
+CFLAGS+= -DOPENCV
+LDFLAGS+= `pkg-config --libs opencv` 
+COMMON+= `pkg-config --cflags opencv` 
 endif
 
 ifeq ($(GPU), 1) 
-LINKER=$(NVCC)
-COMMON+=-DGPU
-CFLAGS+=-DGPU
-LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas
+COMMON+= -DGPU
+CFLAGS+= -DGPU
+LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas -lcurand
 endif
 
-#OBJ=network.o network_gpu.o image.o cnn.o connected_layer.o maxpool_layer.o activations.o list.o option_list.o parser.o utils.o data.o matrix.o softmax_layer.o convolutional_layer.o gemm.o normalization_layer.o opencl.o im2col.o col2im.o axpy.o dropout_layer.o crop_layer.o freeweight_layer.o cost_layer.o server.o
-OBJ=gemm.o utils.o cuda.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o normalization_layer.o parser.o option_list.o cnn.o
+OBJ=gemm.o utils.o cuda.o deconvolutional_layer.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o darknet.o detection_layer.o imagenet.o captcha.o detection.o route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o
 ifeq ($(GPU), 1) 
-OBJ+=convolutional_kernels.o activation_kernels.o im2col_kernels.o col2im_kernels.o blas_kernels.o crop_layer_kernels.o dropout_layer_kernels.o maxpool_layer_kernels.o softmax_layer_kernels.o network_kernels.o
+OBJ+=convolutional_kernels.o deconvolutional_kernels.o activation_kernels.o im2col_kernels.o col2im_kernels.o blas_kernels.o crop_layer_kernels.o dropout_layer_kernels.o maxpool_layer_kernels.o softmax_layer_kernels.o network_kernels.o avgpool_layer_kernels.o
 endif
 
 OBJS = $(addprefix $(OBJDIR), $(OBJ))
+DEPS = $(wildcard src/*.h) Makefile
 
-all: $(EXEC)
+all: obj results $(EXEC)
 
 $(EXEC): $(OBJS)
-	$(CC) $(COMMON) $(CFLAGS) $(LDFLAGS) $^ -o $@
+	$(CC) $(COMMON) $(CFLAGS) $^ -o $@ $(LDFLAGS)
 
-$(OBJDIR)%.o: %.c 
+$(OBJDIR)%.o: %.c $(DEPS)
 	$(CC) $(COMMON) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)%.o: %.cu 
-	$(NVCC) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@
+$(OBJDIR)%.o: %.cu $(DEPS)
+	$(NVCC) $(ARCH) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@
+
+obj:
+	mkdir -p obj
+results:
+	mkdir -p results
 
 .PHONY: clean
 

--
Gitblit v1.10.0