projects
/
platform
/
upstream
/
caffe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
347fdbd
)
default engine to Caffe in case config is missing
author
Evan Shelhamer
<shelhamer@imaginarynumber.net>
Thu, 4 Sep 2014 00:14:59 +0000
(17:14 -0700)
committer
Evan Shelhamer
<shelhamer@imaginarynumber.net>
Sun, 7 Sep 2014 01:27:07 +0000
(
03:27
+0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
89f7347
..
41793a9
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-257,7
+257,8
@@
else
COMMON_FLAGS += -DNDEBUG -O2
endif
-# Computation engine configuration
+# Computation engine configuration (default is standard Caffe)
+ENGINE ?= caffe
ifeq ($(ENGINE), caffe)
COMMON_FLAGS += -DCAFFE_ENGINE
endif