From d7d7da2653ff4f79a275529b0ac3fec438880083 Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@gmail.com> Date: Fri, 27 Mar 2015 02:13:59 +0000 Subject: [PATCH] Fixed im2col mistake >< face#palm --- Makefile | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f685bb4..f474fce 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GPU=1 DEBUG=0 -ARCH= -arch=sm_35 +ARCH= -arch=sm_50 VPATH=./src/ EXEC=darknet @@ -9,25 +9,25 @@ CC=gcc NVCC=nvcc OPTS=-O3 -LDFLAGS=`pkg-config --libs opencv` -lm -pthread +LDFLAGS=`pkg-config --libs opencv` -lm -pthread -lstdc++ COMMON=`pkg-config --cflags opencv` -I/usr/local/cuda/include/ CFLAGS=-Wall -Wfatal-errors -CFLAGS+=$(OPTS) ifeq ($(DEBUG), 1) -COMMON+=-O0 -g -CFLAGS+=-O0 -g +OPTS=-O0 -g endif +CFLAGS+=$(OPTS) + ifeq ($(GPU), 1) COMMON+=-DGPU CFLAGS+=-DGPU -LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas +LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas -lcurand endif -OBJ=gemm.o utils.o cuda.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 +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 ifeq ($(GPU), 1) -OBJ+=convolutional_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 +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)) -- Gitblit v1.10.0