From b23ebee43293d54a54d7666bb23265fb3083730c Mon Sep 17 00:00:00 2001
From: raver119 <raver119@gmail.com>
Date: Fri, 20 Mar 2020 12:42:29 +0300
Subject: [PATCH] - MKL-DNN version upgrade - deviceMutex replaced for CPU

Signed-off-by: raver119 <raver119@gmail.com>
---
 libnd4j/CMakeLists.txt.mkldnn.in                | 2 +-
 libnd4j/include/execution/cpu/LaunchContext.cpp | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libnd4j/CMakeLists.txt.mkldnn.in b/libnd4j/CMakeLists.txt.mkldnn.in
index 4e4a130e1..36c426053 100644
--- a/libnd4j/CMakeLists.txt.mkldnn.in
+++ b/libnd4j/CMakeLists.txt.mkldnn.in
@@ -5,7 +5,7 @@ project(mkldnn-download NONE)
 include(ExternalProject)
 ExternalProject_Add(mkldnn
   GIT_REPOSITORY     https://github.com/intel/mkl-dnn.git
-  GIT_TAG           v1.2.1
+  GIT_TAG           v1.2.2
   SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/mkldnn-src"
   BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/mkldnn-build"
   CONFIGURE_COMMAND ""
diff --git a/libnd4j/include/execution/cpu/LaunchContext.cpp b/libnd4j/include/execution/cpu/LaunchContext.cpp
index 23df9f9f1..23e78c350 100644
--- a/libnd4j/include/execution/cpu/LaunchContext.cpp
+++ b/libnd4j/include/execution/cpu/LaunchContext.cpp
@@ -44,6 +44,7 @@ namespace sd {
 
     std::vector<std::shared_ptr<LaunchContext>> LaunchContext::_contexts = std::vector<std::shared_ptr<LaunchContext>>();
     MAP_IMPL<int, std::mutex*> LaunchContext::_deviceMutexes;
+    std::mutex LaunchContext::_mutex;
 
 ////////////////////////////////////////////////////////////////////////
     LaunchContext::LaunchContext() {
@@ -51,8 +52,6 @@ namespace sd {
         _workspace = nullptr;
         _deviceID = 0;
 
-        _deviceMutexes[_deviceID] = new std::mutex();
-
 #ifdef HAVE_MKLDNN
         _engine = new dnnl::engine(dnnl::engine::kind::cpu, 0);
 #endif
@@ -73,8 +72,7 @@ namespace sd {
     }
 
     std::mutex* LaunchContext::deviceMutex() {
-        auto deviceId = AffinityManager::currentDeviceId();
-        return _deviceMutexes[deviceId];
+        return &_mutex;
     }
 
     void LaunchContext::swapContextBuffers(ContextBuffers &buffers) {