diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp index 42b9f8c..3a14d9b 100644 --- a/common/waifu2x.cpp +++ b/common/waifu2x.cpp @@ -22,30 +22,21 @@ #ifdef _DEBUG #pragma comment(lib, "caffe-d.lib") #pragma comment(lib, "proto-d.lib") -#pragma comment(lib, "libboost_system-vc120-mt-sgd-1_59.lib") -#pragma comment(lib, "libboost_thread-vc120-mt-sgd-1_59.lib") -#pragma comment(lib, "libboost_filesystem-vc120-mt-sgd-1_59.lib") +#pragma comment(lib, "libboost_system-vc120-mt-gd-1_59.lib") +#pragma comment(lib, "libboost_thread-vc120-mt-gd-1_59.lib") +#pragma comment(lib, "libboost_filesystem-vc120-mt-gd-1_59.lib") #pragma comment(lib, "glogd.lib") #pragma comment(lib, "gflagsd.lib") #pragma comment(lib, "libprotobufd.lib") #pragma comment(lib, "libhdf5_hl_D.lib") #pragma comment(lib, "libhdf5_D.lib") #pragma comment(lib, "zlibstaticd.lib") -#pragma comment(lib, "libopenblasd.lib") +#pragma comment(lib, "libopenblas.dll.a") #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, "IlmImfd.lib") -#pragma comment(lib, "libjasperd.lib") -#pragma comment(lib, "libjpegd.lib") -#pragma comment(lib, "libpngd.lib") -#pragma comment(lib, "libtiffd.lib") #pragma comment(lib, "opencv_calib3d249d.lib") #pragma comment(lib, "opencv_contrib249d.lib") #pragma comment(lib, "opencv_core249d.lib") @@ -54,29 +45,21 @@ #else #pragma comment(lib, "caffe.lib") #pragma comment(lib, "proto.lib") -#pragma comment(lib, "libboost_system-vc120-mt-s-1_59.lib") -#pragma comment(lib, "libboost_thread-vc120-mt-s-1_59.lib") -#pragma comment(lib, "libboost_filesystem-vc120-mt-s-1_59.lib") +#pragma comment(lib, "libboost_system-vc120-mt-1_59.lib") +#pragma comment(lib, "libboost_thread-vc120-mt-1_59.lib") +#pragma comment(lib, "libboost_filesystem-vc120-mt-1_59.lib") #pragma comment(lib, "glog.lib") #pragma comment(lib, "gflags.lib") #pragma comment(lib, "libprotobuf.lib") #pragma comment(lib, "libhdf5_hl.lib") #pragma comment(lib, "libhdf5.lib") #pragma comment(lib, "zlibstatic.lib") +#pragma comment(lib, "libopenblas.dll.a") #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") -#pragma comment(lib, "libjpeg.lib") -#pragma comment(lib, "libpng.lib") -#pragma comment(lib, "libtiff.lib") #pragma comment(lib, "opencv_calib3d249.lib") #pragma comment(lib, "opencv_contrib249.lib") #pragma comment(lib, "opencv_core249.lib") diff --git a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj index 822e732..ce83878 100644 --- a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj +++ b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj @@ -42,13 +42,13 @@ true 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) - 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) + D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\x64\vc12\lib;$(LibraryPath) waifu2x-caffe false 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) - 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) + D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\x64\vc12\lib;$(LibraryPath) waifu2x-caffe @@ -58,7 +58,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL Console @@ -76,7 +76,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Console diff --git a/waifu2x-caffe-dll/waifu2x.cpp b/waifu2x-caffe-dll/waifu2x.cpp index a0a1711..3dcb539 100644 --- a/waifu2x-caffe-dll/waifu2x.cpp +++ b/waifu2x-caffe-dll/waifu2x.cpp @@ -12,30 +12,21 @@ #ifdef _DEBUG #pragma comment(lib, "caffe-d.lib") #pragma comment(lib, "proto-d.lib") -#pragma comment(lib, "libboost_system-vc120-mt-sgd-1_59.lib") -#pragma comment(lib, "libboost_thread-vc120-mt-sgd-1_59.lib") -#pragma comment(lib, "libboost_filesystem-vc120-mt-sgd-1_59.lib") +#pragma comment(lib, "libboost_system-vc120-mt-gd-1_59.lib") +#pragma comment(lib, "libboost_thread-vc120-mt-gd-1_59.lib") +#pragma comment(lib, "libboost_filesystem-vc120-mt-gd-1_59.lib") #pragma comment(lib, "glogd.lib") #pragma comment(lib, "gflagsd.lib") #pragma comment(lib, "libprotobufd.lib") #pragma comment(lib, "libhdf5_hl_D.lib") #pragma comment(lib, "libhdf5_D.lib") #pragma comment(lib, "zlibstaticd.lib") -#pragma comment(lib, "libopenblasd.lib") +#pragma comment(lib, "libopenblas.dll.a") #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, "IlmImfd.lib") -#pragma comment(lib, "libjasperd.lib") -#pragma comment(lib, "libjpegd.lib") -#pragma comment(lib, "libpngd.lib") -#pragma comment(lib, "libtiffd.lib") #pragma comment(lib, "opencv_calib3d249d.lib") #pragma comment(lib, "opencv_contrib249d.lib") #pragma comment(lib, "opencv_core249d.lib") @@ -44,29 +35,21 @@ #else #pragma comment(lib, "caffe.lib") #pragma comment(lib, "proto.lib") -#pragma comment(lib, "libboost_system-vc120-mt-s-1_59.lib") -#pragma comment(lib, "libboost_thread-vc120-mt-s-1_59.lib") -#pragma comment(lib, "libboost_filesystem-vc120-mt-s-1_59.lib") +#pragma comment(lib, "libboost_system-vc120-mt-1_59.lib") +#pragma comment(lib, "libboost_thread-vc120-mt-1_59.lib") +#pragma comment(lib, "libboost_filesystem-vc120-mt-1_59.lib") #pragma comment(lib, "glog.lib") #pragma comment(lib, "gflags.lib") #pragma comment(lib, "libprotobuf.lib") #pragma comment(lib, "libhdf5_hl.lib") #pragma comment(lib, "libhdf5.lib") #pragma comment(lib, "zlibstatic.lib") +#pragma comment(lib, "libopenblas.dll.a") #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") -#pragma comment(lib, "libjpeg.lib") -#pragma comment(lib, "libpng.lib") -#pragma comment(lib, "libtiff.lib") #pragma comment(lib, "opencv_calib3d249.lib") #pragma comment(lib, "opencv_contrib249.lib") #pragma comment(lib, "opencv_core249.lib") diff --git a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj index 915aba2..88830af 100644 --- a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj +++ b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj @@ -42,12 +42,12 @@ true 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) - 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) + D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\x64\vc12\lib;$(LibraryPath) false 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) - 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) + D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\x64\vc12\lib;$(LibraryPath) @@ -56,7 +56,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL Windows @@ -77,7 +77,7 @@ true true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Windows diff --git a/waifu2x-caffe/waifu2x-caffe.vcxproj b/waifu2x-caffe/waifu2x-caffe.vcxproj index c322d0e..a335c3a 100644 --- a/waifu2x-caffe/waifu2x-caffe.vcxproj +++ b/waifu2x-caffe/waifu2x-caffe.vcxproj @@ -42,12 +42,12 @@ true 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) - 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) + D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\x64\vc12\lib;$(LibraryPath) false 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) - 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) + D:\caffe-build\install\lib;$(CUDA_PATH_V7_5)\lib\$(PlatformName);C:\opencv249\build\x64\vc12\lib;$(LibraryPath) @@ -56,7 +56,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL Console @@ -74,7 +74,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Console