From cb1f33c6ae840e8dc0f43518daf76e6ed01034f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 19:48:57 +0000
Subject: [PATCH] Fixed race condition in server

---
 Makefile |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a02d7ef..3247999 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,51 @@
+GPU=1
+CLBLAS=0
+
 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
-else
-COMMON += -march=native -flto
+COMMON=-Wall -Wfatal-errors `pkg-config --cflags opencv` -I/usr/local/cuda/include/
+ifeq ($(GPU), 1) 
+COMMON+=-DGPU
 endif
-CFLAGS= $(COMMON) -Ofast
-#CFLAGS= $(COMMON) -O0 -g 
-LDFLAGS=`pkg-config --libs opencv` -lm
+
+ifeq ($(CLBLAS), 1) 
+COMMON+=-DCLBLAS
+LDFLAGS=-lclBLAS
+endif
+
+UNAME = $(shell uname)
+OPTS=-Ofast -flto
+#OPTS=-O3
+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 -pthread
 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
+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 server.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