From 0c2cf402aff1b6eef47e8bdfae77472589c42e0c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:35:58 +0000
Subject: [PATCH] Some small fixes for frame

---
 Makefile |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 3b01ab2..ee382b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
 CC=gcc
-GPU=1
-COMMON=-Wall `pkg-config --cflags opencv` -I/usr/local/cuda/include/
+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=-O3
+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)
@@ -15,15 +19,12 @@
 endif
 endif
 CFLAGS= $(COMMON) $(OPTS)
-CFLAGS= $(COMMON) -O0 -g 
+#CFLAGS= $(COMMON) -O0 -g 
 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 cpu_gemm.o normalization_layer.o
-ifeq ($(GPU), 1)
-OBJ+=gpu_gemm.o opencl.o 
-endif
+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