added dnnl device

Author: shicong

CMakeLists.txt

@@ -66,6 +66,7 @@ OPTION(USE_OPENCL "Use OpenCL" OFF)
 OPTION(ENABLE_DIST "Enable distributed training" OFF)
 OPTION(DISABLE_WARNINGS "Disable warnings under windows" ON)
 OPTION(USE_MODULES "Compile dependent libs as submodules together with singa" OFF)
+OPTION(USE_DNNL "Use dnnl libs" OFF)
 OPTION(USE_DIST "Use nccl distributed module" OFF)
 
 # TODO: remove all USE_CBLAS in codes

cmake/Dependencies.cmake

@@ -142,6 +142,13 @@ IF(USE_JAVA)
     FIND_PACKAGE(SWIG 3.0 REQUIRED)
 ENDIF()
 
+IF(USE_DNNL)
+    FIND_PATH(DNNL_INCLUDE_DIR NAME "dnnl.hpp" PATHS "${CMAKE_CURRENT_SOURCE_DIR}/dnnl/include")
+    FIND_LIBRARY(DNNL_LIBRARIES NAME "dnnl" PATHS "${CMAKE_CURRENT_SOURCE_DIR}/dnnl/lib")
+    MESSAGE(STATUS "Found DNNL at ${DNNL_INCLUDE_DIR}")
+    INCLUDE_DIRECTORIES(${DNNL_INCLUDE_DIR})
+    LIST(APPEND SINGA_LINKER_LIBS ${DNNL_LIBRARIES})
+ENDIF()
 
 IF(USE_DIST)
     FIND_PATH(MPI_INCLUDE_DIR NAME "mpi.h" PATHS "/home/ubuntu/mpich-3.3/build/include/")

include/singa/core/common.h

@@ -34,6 +34,10 @@
 #endif
 #endif // USE_CUDA
 
+#ifdef USE_DNNL
+#include <dnnl.hpp>
+#endif // USE_DNNL
+
 
 #ifdef USE_OPENCL
 #include "singa/utils/opencl_utils.h"
@@ -107,6 +111,11 @@ typedef struct _Context {
 #endif
 #endif // USE_CUDA
 
+#ifdef USE_DNNL
+  dnnl::engine *engine;
+  dnnl::stream *stream;
+#endif // USE_DNNL
+
 #ifdef USE_OPENCL
   // This stores the context ID of the OpenCL context controlled by ViennaCL.
   long vcl_ctx_id;

include/singa/utils/mkldnn_utils.h

@@ -24,11 +24,18 @@ std::shared_ptr<Device> defaultDevice=std::make_shared<CppCPU>();
 
 CppCPU::CppCPU() : Device(-1, 1) {
   lang_ = kCpp;
+#ifdef USE_DNNL
+  ctx_.engine = new dnnl::engine(dnnl::engine::kind::cpu, 0);
+  ctx_.stream = new dnnl::engine_stream(*ctx_.engine);
+#endif // USE_DNNL
   //host_ = nullptr;
 }
 
 CppCPU::~CppCPU() {
-
+#ifdef USE_DNNL
+  delete(ctx_.engine);
+  delete(ctx_.stream);
+#endif // USE_DNNL
 };
 
 void CppCPU::SetRandSeed(unsigned seed) {