From cc06817efa24f20811ef6b32143c6700a91c5f2a Mon Sep 17 00:00:00 2001 From: Joseph Redmon <pjreddie@gmail.com> Date: Fri, 11 Apr 2014 08:00:27 +0000 Subject: [PATCH] Attempt at visualizing ImageNet Features --- Makefile | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6cd3999..07cf79f 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,24 @@ 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 -CFLAGS= $(COMMON) -O3 -ffast-math -flto +COMMON=-Wall `pkg-config --cflags opencv` +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 +LDFLAGS= -framework OpenCL +else +COMMON+= -march=native -flto +LDFLAGS= -lOpenCL +endif +CFLAGS= $(COMMON) -Ofast #CFLAGS= $(COMMON) -O0 -g -LDFLAGS=`pkg-config --libs opencv` -lm +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 opencl.o gpu_gemm.o cpu_gemm.o -all: cnn +all: $(EXEC) -cnn: $(OBJ) +$(EXEC): $(OBJ) $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ %.o: %.c @@ -18,5 +27,5 @@ .PHONY: clean clean: - rm -rf $(OBJ) cnn + rm -rf $(OBJ) $(EXEC) -- Gitblit v1.10.0