diff --git a/caffe b/caffe index 98f9aea..9d5aa36 160000 --- a/caffe +++ b/caffe @@ -1 +1 @@ -Subproject commit 98f9aeafa0760d521b4fe605aecc6e700a05949f +Subproject commit 9d5aa36c65a0082768f10c1d474c56d8a7cc9934 diff --git a/caffe_build.bat b/caffe_build.bat index bf686f0..d0d207a 100644 --- a/caffe_build.bat +++ b/caffe_build.bat @@ -21,7 +21,7 @@ set BUILD_PYTHON_LAYER=0 set RUN_TESTS=0 set CMAKE_INSTALL_PREFIX=../../lib set RUN_INSTALL=1 -set CUDA_ARCH_BIN=30 35 50 52 53 60 61 62 70 75 -set CUDA_ARCH_PTX=75 +set CUDA_ARCH_BIN=35 50 52 53 60 61 62 70 75 80 +set CUDA_ARCH_PTX=80 scripts\build_win.cmd \ No newline at end of file diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp index c4675b4..072cd48 100644 --- a/common/waifu2x.cpp +++ b/common/waifu2x.cpp @@ -462,9 +462,9 @@ Waifu2x::eWaifu2xcuDNNError Waifu2x::can_use_cuDNN() HMODULE hModule = LoadLibrary(TEXT(CUDNN_DLL_NAME)); if (hModule != NULL) { - typedef cudnnStatus_t(__stdcall * cudnnCreateType)(cudnnHandle_t *); - typedef cudnnStatus_t(__stdcall * cudnnDestroyType)(cudnnHandle_t); - typedef uint64_t(__stdcall * cudnnGetVersionType)(); + typedef cudnnStatus_t(CUDNNWINAPI* cudnnCreateType)(cudnnHandle_t *); + typedef cudnnStatus_t(CUDNNWINAPI* cudnnDestroyType)(cudnnHandle_t); + typedef size_t(CUDNNWINAPI* cudnnGetVersionType)(); cudnnCreateType cudnnCreateFunc = (cudnnCreateType)GetProcAddress(hModule, "cudnnCreate"); cudnnDestroyType cudnnDestroyFunc = (cudnnDestroyType)GetProcAddress(hModule, "cudnnDestroy"); diff --git a/common/waifu2x.h b/common/waifu2x.h index 18a7825..e41eacd 100644 --- a/common/waifu2x.h +++ b/common/waifu2x.h @@ -10,9 +10,9 @@ #include #include -#define CUDNN_DLL_NAME "cudnn64_7.dll" -#define CUDNN_REQUIRE_VERION_TEXT "v7.6" -#define CUDNN_REQUIRE_VERION 7600 +#define CUDNN_DLL_NAME "cudnn64_8.dll" +#define CUDNN_REQUIRE_VERION_TEXT "v8.0.3" +#define CUDNN_REQUIRE_VERION 8003 namespace caffe diff --git a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj index 65431ee..c53563e 100644 --- a/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj +++ b/waifu2x-caffe-dll/waifu2x-caffe-dll.vcxproj @@ -42,15 +42,15 @@ true - $(CUDA_PATH_V10_2)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) - $(CUDA_PATH_V10_2)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) + $(CUDA_PATH_V11_0)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) + $(CUDA_PATH_V11_0)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) $(SolutionDir)bin\ $(ProjectName)d false - $(CUDA_PATH_V10_2)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) - $(CUDA_PATH_V10_2)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) + $(CUDA_PATH_V11_0)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) + $(CUDA_PATH_V11_0)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) $(SolutionDir)bin\ @@ -65,7 +65,7 @@ Console true - cudnn64_7.dll;%(DelayLoadDLLs) + cudnn64_8.dll;%(DelayLoadDLLs) Shlwapi.lib;%(AdditionalDependencies) @@ -85,7 +85,7 @@ true true true - cudnn64_7.dll;%(DelayLoadDLLs) + cudnn64_8.dll;%(DelayLoadDLLs) Shlwapi.lib;%(AdditionalDependencies) diff --git a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj index 46b32d1..d685474 100644 --- a/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj +++ b/waifu2x-caffe-gui/waifu2x-caffe-gui.vcxproj @@ -42,15 +42,15 @@ true - $(CUDA_PATH_V10_2)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) - $(CUDA_PATH_V10_2)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) + $(CUDA_PATH_V11_0)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) + $(CUDA_PATH_V11_0)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) $(SolutionDir)bin\ $(ProjectName)d false - $(CUDA_PATH_V10_2)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) - $(CUDA_PATH_V10_2)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) + $(CUDA_PATH_V11_0)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) + $(CUDA_PATH_V11_0)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) $(SolutionDir)bin\ @@ -65,7 +65,7 @@ Windows true - cudnn64_7.dll;%(DelayLoadDLLs) + cudnn64_8.dll;%(DelayLoadDLLs) Shlwapi.lib;%(AdditionalDependencies) @@ -88,7 +88,7 @@ true true true - cudnn64_7.dll;%(DelayLoadDLLs) + cudnn64_8.dll;%(DelayLoadDLLs) Shlwapi.lib;%(AdditionalDependencies) diff --git a/waifu2x-caffe/waifu2x-caffe.vcxproj b/waifu2x-caffe/waifu2x-caffe.vcxproj index 58efa66..3881221 100644 --- a/waifu2x-caffe/waifu2x-caffe.vcxproj +++ b/waifu2x-caffe/waifu2x-caffe.vcxproj @@ -42,15 +42,15 @@ true - $(CUDA_PATH_V10_2)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) - $(CUDA_PATH_V10_2)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) + $(CUDA_PATH_V11_0)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) + $(CUDA_PATH_V11_0)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) $(SolutionDir)bin\ $(ProjectName)d false - $(CUDA_PATH_V10_2)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) - $(CUDA_PATH_V10_2)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) + $(CUDA_PATH_V11_0)\include;$(SolutionDir)lib\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\include\boost-1_61;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(SolutionDir)msgpack-c\include;$(IncludePath) + $(CUDA_PATH_V11_0)\lib\$(PlatformName);$(SolutionDir)lib\$(PlatformName)\vc15\staticlib;$(SolutionDir)lib\lib;$(USERPROFILE)\.caffe\dependencies\libraries_v140_x64_py27_1.1.0\libraries\lib;$(LibraryPath) $(SolutionDir)bin\ @@ -65,7 +65,7 @@ Console true - cudnn64_7.dll;%(DelayLoadDLLs) + cudnn64_8.dll;%(DelayLoadDLLs) Shlwapi.lib;%(AdditionalDependencies) @@ -85,7 +85,7 @@ true true true - cudnn64_7.dll;%(DelayLoadDLLs) + cudnn64_8.dll;%(DelayLoadDLLs) Shlwapi.lib;%(AdditionalDependencies)