From 818b1e2dec5d8becc76953defa2045895907feb9 Mon Sep 17 00:00:00 2001
From: lltcggie <lltcggie@gmail.com>
Date: Fri, 4 Dec 2015 05:17:22 +0900
Subject: [PATCH] =?UTF-8?q?Caffe=E3=82=92Intel=20MKL=E3=82=92=E4=BD=BF?=
 =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=83=93=E3=83=AB=E3=83=89=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=82=84=E3=81=A4=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/waifu2x.cpp                          | 24 +++++++--------------
 waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj |  4 ++--
 waifu2x-caffe-dll/waifu2x.cpp               |  9 +++++++-
 waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj |  4 ++--
 waifu2x-caffe/waifu2x-caffe.vcxproj         |  4 ++--
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp
index 325086a..42b9f8c 100644
--- a/common/waifu2x.cpp
+++ b/common/waifu2x.cpp
@@ -36,6 +36,10 @@
 #pragma comment(lib, "curand.lib")
 #pragma comment(lib, "cublas.lib")
 #pragma comment(lib, "cudnn.lib")
+#pragma comment(lib, "mkl_intel_lp64.lib")
+#pragma comment(lib, "mkl_intel_thread.lib")
+#pragma comment(lib, "mkl_core.lib")
+#pragma comment(lib, "libiomp5md.lib")
 
 #pragma comment(lib, "IlmImfd.lib")
 #pragma comment(lib, "libjasperd.lib")
@@ -59,11 +63,14 @@
 #pragma comment(lib, "libhdf5_hl.lib")
 #pragma comment(lib, "libhdf5.lib")
 #pragma comment(lib, "zlibstatic.lib")
-#pragma comment(lib, "libopenblas.lib")
 #pragma comment(lib, "cudart.lib")
 #pragma comment(lib, "curand.lib")
 #pragma comment(lib, "cublas.lib")
 #pragma comment(lib, "cudnn.lib")
+#pragma comment(lib, "mkl_intel_lp64.lib")
+#pragma comment(lib, "mkl_intel_thread.lib")
+#pragma comment(lib, "mkl_core.lib")
+#pragma comment(lib, "libiomp5md.lib")
 
 #pragma comment(lib, "IlmImf.lib")
 #pragma comment(lib, "libjasper.lib")
@@ -92,15 +99,6 @@ static std::once_flag waifu2x_once_flag;
 static std::once_flag waifu2x_cudnn_once_flag;
 static std::once_flag waifu2x_cuda_once_flag;
 
-#ifdef _MSC_VER
-// OpenBLASの初期化、終了関数
-extern "C"
-{
-	void __cdecl gotoblas_init(void);
-	void __cdecl gotoblas_quit(void);
-}
-#endif
-
 #ifndef CUDA_CHECK_WAIFU2X
 #define CUDA_CHECK_WAIFU2X(condition) \
  do { \
@@ -236,16 +234,10 @@ Waifu2x::eWaifu2xCudaError Waifu2x::can_use_CUDA()
 
 void Waifu2x::init_liblary()
 {
-#ifdef _MSC_VER
-	gotoblas_init();
-#endif
 }
 
 void Waifu2x::quit_liblary()
 {
-#ifdef _MSC_VER
-	gotoblas_quit();
-#endif
 }
 
 cv::Mat Waifu2x::LoadMat(const std::string &path)
diff --git a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj
index 75602cf..822e732 100644
--- a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj
+++ b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj
@@ -42,13 +42,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\mkl\lib\intel64_win;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\compiler\lib\intel64;$(LibraryPath)</LibraryPath>
     <TargetName>waifu2x-caffe</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\mkl\lib\intel64_win;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\compiler\lib\intel64;$(LibraryPath)</LibraryPath>
     <TargetName>waifu2x-caffe</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/waifu2x-caffe-dll/waifu2x.cpp b/waifu2x-caffe-dll/waifu2x.cpp
index b2dc2b7..a0a1711 100644
--- a/waifu2x-caffe-dll/waifu2x.cpp
+++ b/waifu2x-caffe-dll/waifu2x.cpp
@@ -26,6 +26,10 @@
 #pragma comment(lib, "curand.lib")
 #pragma comment(lib, "cublas.lib")
 #pragma comment(lib, "cudnn.lib")
+#pragma comment(lib, "mkl_intel_lp64.lib")
+#pragma comment(lib, "mkl_intel_thread.lib")
+#pragma comment(lib, "mkl_core.lib")
+#pragma comment(lib, "libiomp5md.lib")
 
 #pragma comment(lib, "IlmImfd.lib")
 #pragma comment(lib, "libjasperd.lib")
@@ -49,11 +53,14 @@
 #pragma comment(lib, "libhdf5_hl.lib")
 #pragma comment(lib, "libhdf5.lib")
 #pragma comment(lib, "zlibstatic.lib")
-#pragma comment(lib, "libopenblas.lib")
 #pragma comment(lib, "cudart.lib")
 #pragma comment(lib, "curand.lib")
 #pragma comment(lib, "cublas.lib")
 #pragma comment(lib, "cudnn.lib")
+#pragma comment(lib, "mkl_intel_lp64.lib")
+#pragma comment(lib, "mkl_intel_thread.lib")
+#pragma comment(lib, "mkl_core.lib")
+#pragma comment(lib, "libiomp5md.lib")
 
 #pragma comment(lib, "IlmImf.lib")
 #pragma comment(lib, "libjasper.lib")
diff --git a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
index 534f623..915aba2 100644
--- a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
+++ b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj
@@ -42,12 +42,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\mkl\lib\intel64_win;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\compiler\lib\intel64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\mkl\lib\intel64_win;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\compiler\lib\intel64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
diff --git a/waifu2x-caffe/waifu2x-caffe.vcxproj b/waifu2x-caffe/waifu2x-caffe.vcxproj
index 50ac69e..c322d0e 100644
--- a/waifu2x-caffe/waifu2x-caffe.vcxproj
+++ b/waifu2x-caffe/waifu2x-caffe.vcxproj
@@ -42,12 +42,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\mkl\lib\intel64_win;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\compiler\lib\intel64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>D:\caffe-build\install\include;D:\caffe-build\install\include\boost-1_59;$(CUDA_PATH_V7_5)\include;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\$(PlatformShortName)\vc12\staticlib;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\mkl\lib\intel64_win;C:\Program Files (x86)\IntelSWTools\compilers_and_libraries_2016.1.146\windows\compiler\lib\intel64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>