From f7a17f82eb43de864a4f980f235055da9685eef8 Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@gmail.com> Date: Wed, 29 Jan 2014 00:28:42 +0000 Subject: [PATCH] Convolutional layers working w/ matrices --- Makefile | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6cd3999..fda7d88 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,22 @@ CC=gcc -COMMON=-Wall `pkg-config --cflags opencv` -isystem /usr/local/Cellar/opencv/2.4.6.1/include/opencv -isystem /usr/local/Cellar/opencv/2.4.6.1/include +COMMON=-Wall `pkg-config --cflags opencv` CFLAGS= $(COMMON) -O3 -ffast-math -flto +UNAME = $(shell uname) +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 +else +CFLAGS += -march=native +endif #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 activations.o list.o option_list.o parser.o utils.o data.o matrix.o softmax_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 -all: cnn +all: $(EXEC) -cnn: $(OBJ) +$(EXEC): $(OBJ) $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ %.o: %.c @@ -18,5 +25,5 @@ .PHONY: clean clean: - rm -rf $(OBJ) cnn + rm -rf $(OBJ) $(EXEC) -- Gitblit v1.10.0