From cbc9984a17b3452da4fee397aac912f1e9f7a4c3 Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@gmail.com> Date: Wed, 10 Jun 2015 07:11:41 +0000 Subject: [PATCH] NIPS --- Makefile | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d855880..bc3b9bf 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ GPU=1 +OPENCV=1 DEBUG=0 + ARCH= -arch=sm_52 VPATH=./src/ @@ -9,9 +11,9 @@ 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 +LDFLAGS= -lm -pthread -lstdc++ +COMMON= -I/usr/local/cuda/include/ +CFLAGS=-Wall -Wfatal-errors ifeq ($(DEBUG), 1) OPTS=-O0 -g @@ -19,13 +21,20 @@ 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 +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 normalization_layer.o parser.o option_list.o darknet.o detection_layer.o imagenet.o captcha.o detection.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 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 -- Gitblit v1.10.0