diff --git a/.gitignore b/.gitignore index deb3dcc5..12d2c999 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ opencv/ convnet/ decaf/ submission/ -cnn +darknet # OS Generated # .DS_Store* diff --git a/Makefile b/Makefile index cc0c9ad1..f685bb4a 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ DEBUG=0 ARCH= -arch=sm_35 VPATH=./src/ -EXEC=cnn +EXEC=darknet OBJDIR=./obj/ CC=gcc @@ -25,8 +25,7 @@ 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 diff --git a/src/cnn.c b/src/darknet.c similarity index 100% rename from src/cnn.c rename to src/darknet.c