From 8f1b4e0962857d402f9d017fcbf387ef0eceb7c4 Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@gmail.com> Date: Thu, 01 Sep 2016 23:48:41 +0000 Subject: [PATCH] updates and things --- Makefile | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ee20684..b36b6b8 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ GPU=0 +CUDNN=0 OPENCV=0 DEBUG=0 -ARCH= --gpu-architecture=compute_20 --gpu-code=compute_20 +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 coco.o dice.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 captcha.o route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o detector.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 region_layer.o reorg_layer.o super.o voxel.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