This is an automated email from the ASF dual-hosted git repository.
wangwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-singa.git
The following commit(s) were added to refs/heads/master by this push:
new 21c5b88 SINGA-429-cxx-flags
new 8bf958e Merge pull request #439 from dcslin/SINGA-429-cxx-flags
21c5b88 is described below
commit 21c5b8882868bfac76b831fed217e4895674370c
Author: shicong <[email protected]>
AuthorDate: Mon Mar 11 14:48:57 2019 +0800
SINGA-429-cxx-flags
---
cmake/Dependencies.cmake | 2 +-
tool/docker/README.md | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index f25b0ae..f66b42f 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -145,6 +145,6 @@ ENDIF()
IF(USE_MKLDNN)
FIND_PATH(MKLDNN_INCLUDE_DIR NAME "mkldnn.hpp" PATHS
"$ENV{CMAKE_INCLUDE_PATH}")
FIND_LIBRARY(MKLDNN_LIBRARIES NAME "libmkldnn.so" PATHS
"$ENV{CMAKE_LIBRARY_PATH}")
- INCLUDE_DIRECTORIES(SYSTEM ${MKLDNN_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(${MKLDNN_INCLUDE_DIR})
LIST(APPEND SINGA_LINKER_LIBS ${MKLDNN_LIBRARIES})
ENDIF()
diff --git a/tool/docker/README.md b/tool/docker/README.md
index c95ab49..26763fb 100644
--- a/tool/docker/README.md
+++ b/tool/docker/README.md
@@ -26,7 +26,8 @@
|runtime| Ubuntu16.04|runtime|CPU|-|3.6|
|conda-cuda9.0| Ubuntu16.04|devel|GPU|CUDA9.0+CUDNN7.1.2|3.6|
|cuda9.0-py2| Ubuntu16.04|devel|GPU|CUDA9.0+CUDNN7.1.2|2.7|
-|cuda9.0-py3| Ubuntu16.04|devel|GPU|CUDA9.0+CUDNN7.1.2|3.6|
+|cuda9.0-py3| Ubuntu18.04|devel|GPU|CUDA9.0+CUDNN7.1.2|3.6|
+|cuda10.0-py3| Ubuntu18.04|devel|GPU|CUDA10.0+CUDNN7.4.2|3.6|
runtime and conda-xxx image has installed miniconda3;
cudaxxx images have installed all depedent libs using apt-get.
