From 013031ce3f80cd3297937ae126baecf4ea63d9e8 Mon Sep 17 00:00:00 2001
From: sivagnanamn <sivagnanammurthy@gmail.com>
Date: Wed, 21 Mar 2018 04:54:44 +0000
Subject: [PATCH] Minor changes to keep MAC OSX happy
---
src/demo.c | 2 +-
Makefile | 17 ++++++++++++++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 41f0e04..f664a72 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@
-gencode arch=compute_52,code=[sm_52,compute_52] \
-gencode arch=compute_61,code=[sm_61,compute_61]
+OS := $(shell uname)
+
# Tesla V100
# ARCH= -gencode arch=compute_70,code=[sm_70,compute_70]
@@ -62,17 +64,26 @@
LDFLAGS+= -lgomp
endif
-ifeq ($(GPU), 1)
+ifeq ($(GPU), 1)
COMMON+= -DGPU -I/usr/local/cuda/include/
CFLAGS+= -DGPU
+ifeq ($(OS),Darwin) #MAC
+LDFLAGS+= -L/usr/local/cuda/lib -lcuda -lcudart -lcublas -lcurand
+else
LDFLAGS+= -L/usr/local/cuda/lib64 -lcuda -lcudart -lcublas -lcurand
endif
+endif
-ifeq ($(CUDNN), 1)
-COMMON+= -DCUDNN
+ifeq ($(CUDNN), 1)
+COMMON+= -DCUDNN
+ifeq ($(OS),Darwin) #MAC
+CFLAGS+= -DCUDNN -I/usr/local/cuda/include
+LDFLAGS+= -L/usr/local/cuda/lib -lcudnn
+else
CFLAGS+= -DCUDNN -I/usr/local/cudnn/include
LDFLAGS+= -L/usr/local/cudnn/lib64 -lcudnn
endif
+endif
OBJ=http_stream.o gemm.o utils.o cuda.o convolutional_layer.o list.o image.o activations.o im2col.o col2im.o blas.o crop_layer.o dropout_layer.o maxpool_layer.o softmax_layer.o data.o matrix.o network.o connected_layer.o cost_layer.o parser.o option_list.o darknet.o detection_layer.o captcha.o route_layer.o writing.o box.o nightmare.o normalization_layer.o avgpool_layer.o coco.o dice.o yolo.o detector.o layer.o compare.o classifier.o local_layer.o swag.o shortcut_layer.o activation_layer.o rnn_layer.o gru_layer.o rnn.o rnn_vid.o crnn_layer.o demo.o tag.o cifar.o go.o batchnorm_layer.o art.o region_layer.o reorg_layer.o reorg_old_layer.o super.o voxel.o tree.o
ifeq ($(GPU), 1)
diff --git a/src/demo.c b/src/demo.c
index b5917fa..e0a6ed3 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -66,7 +66,7 @@
//error("Stream closed.");
printf("Stream closed.\n");
flag_exit = 1;
- return;
+ return EXIT_FAILURE;
}
//in_s = resize_image(in, net.w, net.h);
in_s = make_image(in.w, in.h, in.c);
--
Gitblit v1.10.0