From 5ef74c2031a040f30a670dc7d60790fc6a9ec720 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 May 2014 22:20:34 +0000
Subject: [PATCH] Slowly refactoring and pushing to GPU

---
 Makefile |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a02d7ef..445c775 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,29 @@
 CC=gcc
-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
+GPU=1
+COMMON=-Wall -Werror -Wfatal-errors `pkg-config --cflags opencv` -I/usr/local/cuda/include/
+ifeq ($(GPU), 1) 
+COMMON+=-DGPU
 else
-COMMON += -march=native -flto
 endif
-CFLAGS= $(COMMON) -Ofast
+UNAME = $(shell uname)
+OPTS=-O3 -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
+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 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
+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: $(EXEC)
 

--
Gitblit v1.10.0