From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@burninator.cs.washington.edu> Date: Thu, 23 Jun 2016 05:31:14 +0000 Subject: [PATCH] hi --- Makefile | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 32ff4c0..14f4211 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ -GPU=0 -OPENCV=0 +GPU=1 +OPENCV=1 +CUDNN=0 DEBUG=0 -ARCH= -arch=sm_52 +ARCH= --gpu-architecture=compute_52 --gpu-code=compute_52 VPATH=./src/ EXEC=darknet @@ -11,8 +12,8 @@ CC=gcc NVCC=nvcc OPTS=-Ofast -LDFLAGS= -lm -pthread -lstdc++ -COMMON= -I/usr/local/cuda/include/ +LDFLAGS= -lm -pthread +COMMON= CFLAGS=-Wall -Wfatal-errors ifeq ($(DEBUG), 1) @@ -29,13 +30,20 @@ endif ifeq ($(GPU), 1) -COMMON+= -DGPU +COMMON+= -DGPU -I/usr/local/cuda/include/ 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 box.o nightmare.o normalization_layer.o avgpool_layer.o +ifeq ($(CUDNN), 1) +COMMON+= -DCUDNN +CFLAGS+= -DCUDNN +LDFLAGS+= -lcudnn +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 route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o layer.o compare.o classifier.o local_layer.o swag.o shortcut_layer.o activation_layer.o rnn_layer.o gru_layer.o rnn.o rnn_vid.o crnn_layer.o demo.o tag.o cifar.o go.o batchnorm_layer.o art.o ifeq ($(GPU), 1) +LDFLAGS+= -lstdc++ 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 -- Gitblit v1.10.0