From cd8d53df21f3ad2810add2a8cff766c745f55a17 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:14:52 +0000
Subject: [PATCH] So there WAS this huge bug. Gone now

---
 Makefile |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6cd3999..ee382b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,34 @@
 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
+GPU=0
+COMMON=-Wall -Werror -Wfatal-errors `pkg-config --cflags opencv` -I/usr/local/cuda/include/
+ifeq ($(GPU), 1) 
+COMMON+=-DGPU
+else
+endif
+UNAME = $(shell uname)
+OPTS=-Ofast -flto
+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
+ifeq ($(GPU), 1)
+LDFLAGS= -framework OpenCL
+endif
+else
+OPTS+= -march=native
+ifeq ($(GPU), 1)
+LDFLAGS= -lOpenCL
+endif
+endif
+CFLAGS= $(COMMON) $(OPTS)
 #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 gemm.o normalization_layer.o opencl.o im2col.o col2im.o axpy.o
 
-all: cnn
+all: $(EXEC)
 
-cnn: $(OBJ)
+$(EXEC): $(OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
 %.o: %.c 
@@ -18,5 +37,5 @@
 .PHONY: clean
 
 clean:
-	rm -rf $(OBJ) cnn
+	rm -rf $(OBJ) $(EXEC)
 

--
Gitblit v1.10.0