From 0f1a31648c5292fa49b35eac90a2ee676d6c13e6 Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@gmail.com> Date: Sat, 31 Jan 2015 06:05:23 +0000 Subject: [PATCH] idk, probably something changed --- Makefile | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e48e142..f685bb4 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ GPU=1 DEBUG=0 +ARCH= -arch=sm_35 VPATH=./src/ -EXEC=cnn +EXEC=darknet OBJDIR=./obj/ CC=gcc NVCC=nvcc OPTS=-O3 -LINKER=$(CC) LDFLAGS=`pkg-config --libs opencv` -lm -pthread COMMON=`pkg-config --cflags opencv` -I/usr/local/cuda/include/ CFLAGS=-Wall -Wfatal-errors @@ -20,14 +20,12 @@ endif ifeq ($(GPU), 1) -LINKER=$(NVCC) COMMON+=-DGPU CFLAGS+=-DGPU LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas endif -#OBJ=network.o network_gpu.o image.o cnn.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 convolutional_layer.o gemm.o normalization_layer.o opencl.o im2col.o col2im.o axpy.o dropout_layer.o crop_layer.o freeweight_layer.o cost_layer.o server.o -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 cnn.o +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 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 endif @@ -43,7 +41,7 @@ $(CC) $(COMMON) $(CFLAGS) -c $< -o $@ $(OBJDIR)%.o: %.cu - $(NVCC) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@ + $(NVCC) $(ARCH) $(COMMON) --compiler-options "$(CFLAGS)" -c $< -o $@ .PHONY: clean -- Gitblit v1.10.0