From 7fe80a2bb56ee3eaa95d3e3e3ee7a4129e58e4b7 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 09 Jun 2015 20:56:33 +0000
Subject: [PATCH] sync issues

---
 Makefile |   63 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 640f308..4ebac6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,51 @@
-CC=gcc
-COMMON=-Wall `pkg-config --cflags opencv`
-UNAME = $(shell uname)
-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
-LDFLAGS= -framework OpenCL
-else
-OPTS+= -march=native -flto
-LDFLAGS= -lOpenCL
-endif
-CFLAGS= $(COMMON) $(OPTS)
-#CFLAGS= $(COMMON) -O0 -g 
-LDFLAGS+=`pkg-config --libs opencv` -lm
-VPATH=./src/
-EXEC=cnn
+GPU=1
+DEBUG=0
+ARCH= -arch=sm_52
 
-OBJ=network.o image.o tests.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 opencl.o gpu_gemm.o cpu_gemm.o normalization_layer.o
+VPATH=./src/
+EXEC=darknet
+OBJDIR=./obj/
+
+CC=gcc
+NVCC=nvcc
+OPTS=-Ofast
+LDFLAGS=`pkg-config --libs opencv` -lm -pthread -lstdc++
+COMMON=`pkg-config --cflags opencv` -I/usr/local/cuda/include/
+CFLAGS=-Wall -Wfatal-errors
+
+ifeq ($(DEBUG), 1) 
+OPTS=-O0 -g
+endif
+
+CFLAGS+=$(OPTS)
+
+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: $(EXEC)
 
-$(EXEC): $(OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+$(EXEC): $(OBJS)
+	$(CC) $(COMMON) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
-%.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 $@
 
 .PHONY: clean
 
 clean:
-	rm -rf $(OBJ) $(EXEC)
+	rm -rf $(OBJS) $(EXEC)
 

--
Gitblit v1.10.0