From b13ad6d5fd23f68f506c14ede4282126d893702b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 05 Nov 2014 22:49:58 +0000
Subject: [PATCH] Can validate on imagenet now

---
 Makefile |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index ee382b4..f5499ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,17 @@
+GPU=1
+CLBLAS=0
+
 CC=gcc
-GPU=0
-COMMON=-Wall -Werror -Wfatal-errors `pkg-config --cflags opencv` -I/usr/local/cuda/include/
+COMMON=-Wall -Wfatal-errors `pkg-config --cflags opencv` -I/usr/local/cuda/include/
 ifeq ($(GPU), 1) 
 COMMON+=-DGPU
-else
 endif
+
+ifeq ($(CLBLAS), 1) 
+COMMON+=-DCLBLAS
+LDFLAGS=-lclBLAS
+endif
+
 UNAME = $(shell uname)
 OPTS=-Ofast -flto
 ifeq ($(UNAME), Darwin)
@@ -15,27 +22,29 @@
 else
 OPTS+= -march=native
 ifeq ($(GPU), 1)
-LDFLAGS= -lOpenCL
+LDFLAGS+= -lOpenCL
 endif
 endif
 CFLAGS= $(COMMON) $(OPTS)
-#CFLAGS= $(COMMON) -O0 -g 
+#CFLAGS= $(COMMON) -O0 -g
 LDFLAGS+=`pkg-config --libs opencv` -lm
 VPATH=./src/
 EXEC=cnn
+OBJDIR=./obj/
 
-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
+OBJ=network.o network_gpu.o image.o cnn.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 dropout_layer.o crop_layer.o freeweight_layer.o cost_layer.o
+OBJS = $(addprefix $(OBJDIR), $(OBJ))
 
 all: $(EXEC)
 
-$(EXEC): $(OBJ)
+$(EXEC): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
-%.o: %.c 
+$(OBJDIR)%.o: %.c 
 	$(CC) $(CFLAGS) -c $< -o $@
 
 .PHONY: clean
 
 clean:
-	rm -rf $(OBJ) $(EXEC)
+	rm -rf $(OBJS) $(EXEC)
 

--
Gitblit v1.10.0