New feature extraction method

Joseph Redmon

2014-04-17 ac82bde55f3206a7a0d1b7a7580bea05096af32b

 Makefile

@@ -1,14 +1,25 @@
CC=gcc
CFLAGS=-Wall `pkg-config --cflags opencv` -O3 -flto -ffast-math
#CFLAGS=-Wall `pkg-config --cflags opencv` -O0 -g
LDFLAGS=`pkg-config --libs opencv` -lm
COMMON=-Wall `pkg-config --cflags opencv` -I/usr/local/cuda/include/
UNAME = $(shell uname)
OPTS=-O3
ifeq ($(UNAME), Darwin)
COMMON+= -isystem /usr/local/Cellar/opencv/2.4.6.1/include/opencv -isystem /usr/local/Cellar/opencv/2.4.6.1/include
LDFLAGS= -framework OpenCL
else
OPTS+= -march=native
LDFLAGS= -lOpenCL
endif
CFLAGS= $(COMMON) $(OPTS)
#CFLAGS= $(COMMON) -O0 -g 
LDFLAGS+=`pkg-config --libs opencv` -lm
VPATH=./src/
EXEC=cnn

OBJ=network.o image.o tests.o convolutional_layer.o connected_layer.o maxpool_layer.o
OBJ=network.o image.o tests.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 mini_blas.o convolutional_layer.o opencl.o gpu_gemm.o cpu_gemm.o normalization_layer.o

all: cnn
all: $(EXEC)

cnn: $(OBJ)
$(EXEC): $(OBJ)
   $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@

%.o: %.c 
@@ -17,5 +28,5 @@
.PHONY: clean

clean:
   rm -rf $(OBJ) cnn
   rm -rf $(OBJ) $(EXEC)