From 9d42f49a240136a8cd643cdc1f98230d4f22b05e Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@gmail.com> Date: Tue, 25 Aug 2015 01:27:42 +0000 Subject: [PATCH] changing data loading --- Makefile | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 0a029e9..8ce6888 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,8 @@ OPENCV=1 DEBUG=0 -ARCH= -arch=sm_52 +ARCH= --gpu-architecture=compute_20 --gpu-code=compute_20 +ARCH= -arch sm_52 VPATH=./src/ EXEC=darknet @@ -10,7 +11,7 @@ CC=gcc NVCC=nvcc -OPTS=-Ofast +OPTS=-O2 LDFLAGS= -lm -pthread -lstdc++ COMMON= -I/usr/local/cuda/include/ CFLAGS=-Wall -Wfatal-errors @@ -34,18 +35,18 @@ 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 +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 region_layer.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 +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 OBJS = $(addprefix $(OBJDIR), $(OBJ)) DEPS = $(wildcard src/*.h) Makefile -all: obj $(EXEC) +all: obj results $(EXEC) $(EXEC): $(OBJS) - $(CC) $(COMMON) $(CFLAGS) $(LDFLAGS) $^ -o $@ + $(CC) $(COMMON) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(OBJDIR)%.o: %.c $(DEPS) $(CC) $(COMMON) $(CFLAGS) -c $< -o $@ @@ -55,7 +56,8 @@ obj: mkdir -p obj - +results: + mkdir -p results .PHONY: clean -- Gitblit v1.10.0