From a4485b8a6656c2a2fa0b78ca7c035523c8149b8c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 15:49:25 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet

---
 Makefile |   85 ++++++++++++++++++++++++------------------
 1 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index c2eecd5..1d1fdf2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,61 @@
-GPU=1
-CLBLAS=0
+GPU=0
+OPENCV=0
+DEBUG=0
 
-CC=gcc
-COMMON=-Wall -Wfatal-errors `pkg-config --cflags opencv` -I/usr/local/cuda/include/
-ifeq ($(GPU), 1) 
-COMMON+=-DGPU
-endif
+ARCH= -arch=sm_52
 
-ifeq ($(CLBLAS), 1) 
-COMMON+=-DCLBLAS
-LDFLAGS=-lclBLAS
-endif
-
-UNAME = $(shell uname)
-OPTS=-Ofast -flto
-#OPTS=-O3
-ifeq ($(UNAME), Darwin)
-COMMON+= -isystem /usr/local/Cellar/opencv/2.4.6.1/include/opencv -isystem /usr/local/Cellar/opencv/2.4.6.1/include
-ifeq ($(GPU), 1)
-LDFLAGS= -framework OpenCL
-endif
-else
-OPTS+= -march=native
-ifeq ($(GPU), 1)
-LDFLAGS+= -lOpenCL
-endif
-endif
-CFLAGS= $(COMMON) $(OPTS)
-#CFLAGS= $(COMMON) -O0 -g
-LDFLAGS+=`pkg-config --libs opencv` -lm
 VPATH=./src/
-EXEC=cnn
+EXEC=darknet
 OBJDIR=./obj/
 
-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 mini_blas.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
-OBJS = $(addprefix $(OBJDIR), $(OBJ))
+CC=gcc
+NVCC=nvcc
+OPTS=-Ofast
+LDFLAGS= -lm -pthread -lstdc++ 
+COMMON= -I/usr/local/cuda/include/ 
+CFLAGS=-Wall -Wfatal-errors 
 
-all: $(EXEC)
+ifeq ($(DEBUG), 1) 
+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) 
+COMMON+= -DGPU
+CFLAGS+= -DGPU
+LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas -lcurand
+endif
+
+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
+ifeq ($(GPU), 1) 
+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
+endif
+
+OBJS = $(addprefix $(OBJDIR), $(OBJ))
+DEPS = $(wildcard src/*.h) Makefile
+
+all: obj $(EXEC)
 
 $(EXEC): $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+	$(CC) $(COMMON) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
-$(OBJDIR)%.o: %.c 
-	$(CC) $(CFLAGS) -c $< -o $@
+$(OBJDIR)%.o: %.c $(DEPS)
+	$(CC) $(COMMON) $(CFLAGS) -c $< -o $@
+
+$(OBJDIR)%.o: %.cu $(DEPS)
+	$(NVCC) $(ARCH) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@
+
+obj:
+	mkdir -p obj
+
 
 .PHONY: clean
 

--
Gitblit v1.10.0