summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguohuijiang1234 <huijiangguo@openailab.com>2017-11-24 16:34:44 +0800
committerguohuijiang1234 <huijiangguo@openailab.com>2017-11-24 16:34:44 +0800
commitb8ffd6e11f0dc0c47fdf25fabed3f638266a7f24 (patch)
tree86b4025bd4268b25c8301c2638354a148e410df1
parent43c8862eb768c0b772d92d2fdc23a54d13a1e461 (diff)
downloadcaffeonacl-b8ffd6e11f0dc0c47fdf25fabed3f638266a7f24.tar.gz
caffeonacl-b8ffd6e11f0dc0c47fdf25fabed3f638266a7f24.tar.bz2
caffeonacl-b8ffd6e11f0dc0c47fdf25fabed3f638266a7f24.zip
updata Makefile
-rw-r--r--Makefile3
-rw-r--r--Makefile.config.acl3
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2422f3b2..2afeae34 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,5 @@
PROJECT := caffe
-AIDDIR=/usr/local/AID
-export PKG_CONFIG_PATH=${AIDDIR}/opencv3.3.0/lib/pkgconfig
-
CONFIG_FILE := Makefile.config.acl
# Explicitly check for the config file, otherwise make -k will proceed anyway.
ifeq ($(wildcard $(CONFIG_FILE)),)
diff --git a/Makefile.config.acl b/Makefile.config.acl
index 6dcc7cdf..f20326f9 100644
--- a/Makefile.config.acl
+++ b/Makefile.config.acl
@@ -1,6 +1,9 @@
## Refer to http://caffe.berkeleyvision.org/installation.html
# Contributions simplifying and improving our build system are welcome!
+AIDDIR=/usr/local/AID
+export PKG_CONFIG_PATH=${AIDDIR}/opencv3.3.0/lib/pkgconfig
+
# cuDNN acceleration switch (uncomment to build with cuDNN).
# USE_CUDNN := 1