mirror of
https://github.com/lltcggie/waifu2x-caffe.git
synced 2025-06-26 13:42:48 +00:00
Caffeをcaffe-builderでビルドした最新版に変更
This commit is contained in:
lltcggie
parent
e7a80b3a5e
commit
8507992855
@ -19,15 +19,62 @@
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#ifdef _DEBUG
|
||||
#pragma comment(lib, "libcaffed.lib")
|
||||
#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, "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, "cudart.lib")
|
||||
#pragma comment(lib, "curand.lib")
|
||||
#pragma comment(lib, "cublas.lib")
|
||||
#pragma comment(lib, "cudnn.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")
|
||||
#pragma comment(lib, "opencv_highgui249d.lib")
|
||||
#pragma comment(lib, "opencv_imgproc249d.lib")
|
||||
#else
|
||||
#pragma comment(lib, "libcaffe.lib")
|
||||
#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, "glog.lib")
|
||||
#pragma comment(lib, "gflags.lib")
|
||||
#pragma comment(lib, "libprotobuf.lib")
|
||||
#endif
|
||||
#pragma comment(lib, "libprotoc.lib")
|
||||
#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, "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")
|
||||
#pragma comment(lib, "opencv_highgui249.lib")
|
||||
#pragma comment(lib, "opencv_imgproc249.lib")
|
||||
#endif
|
||||
|
||||
// “ü—͉摜‚Ě<E2809A>I<EFBFBD>t<EFBFBD>Z<EFBFBD>b<EFBFBD>g
|
||||
@ -45,6 +92,15 @@ 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‚Ì<E2809A>‰Šú‰»<E280B0>A<EFBFBD>I—¹ŠÖ<C5A0>”
|
||||
extern "C"
|
||||
{
|
||||
void __cdecl gotoblas_init(void);
|
||||
void __cdecl gotoblas_quit(void);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef CUDA_CHECK_WAIFU2X
|
||||
#define CUDA_CHECK_WAIFU2X(condition) \
|
||||
do { \
|
||||
@ -107,7 +163,7 @@ Waifu2x::eWaifu2xcuDNNError Waifu2x::can_use_cuDNN()
|
||||
std::call_once(waifu2x_cudnn_once_flag, [&]()
|
||||
{
|
||||
#if defined(WIN32) || defined(WIN64)
|
||||
HMODULE hModule = LoadLibrary(TEXT("cudnn64_65.dll"));
|
||||
HMODULE hModule = LoadLibrary(TEXT(CUDNN_DLL_NAME));
|
||||
if (hModule != NULL)
|
||||
{
|
||||
typedef cudnnStatus_t(__stdcall * cudnnCreateType)(cudnnHandle_t *);
|
||||
@ -178,6 +234,20 @@ Waifu2x::eWaifu2xCudaError Waifu2x::can_use_CUDA()
|
||||
return CudaFlag;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
cv::Mat mat;
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <opencv2/opencv.hpp>
|
||||
|
||||
#define CUDNN_DLL_NAME "cudnn64_70"
|
||||
|
||||
|
||||
namespace caffe
|
||||
{
|
||||
@ -116,6 +118,9 @@ public:
|
||||
static eWaifu2xcuDNNError can_use_cuDNN();
|
||||
static eWaifu2xCudaError can_use_CUDA();
|
||||
|
||||
static void init_liblary();
|
||||
static void quit_liblary();
|
||||
|
||||
// mode: noise or scale or noise_scale or auto_scale
|
||||
// process: cpu or gpu or cudnn
|
||||
eWaifu2xError init(int argc, char** argv, const std::string &mode, const int noise_level, const double scale_ratio, const std::string &model_dir, const std::string &process,
|
||||
|
||||
@ -41,14 +41,14 @@
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)caffe\build\include;$(SolutionDir)caffe\3rdparty\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.0\include;C:\boost_1_56_0;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)caffe\build\lib;$(SolutionDir)caffe\3rdparty\lib;C:\boost_1_56_0\lib64-msvc-12.0;$(LibraryPath)</LibraryPath>
|
||||
<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>
|
||||
<TargetName>waifu2x-caffe</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)caffe\build\include;$(SolutionDir)caffe\3rdparty\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.0\include;C:\boost_1_56_0;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)caffe\build\lib;$(SolutionDir)caffe\3rdparty\lib;C:\boost_1_56_0\lib64-msvc-12.0;$(LibraryPath)</LibraryPath>
|
||||
<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>
|
||||
<TargetName>waifu2x-caffe</TargetName>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
@ -58,11 +58,13 @@
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<DelayLoadDLLs>cudnn64_65.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>cudnn64_70.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
@ -74,13 +76,15 @@
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<DelayLoadDLLs>cudnn64_65.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>cudnn64_70.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@ -9,15 +9,62 @@
|
||||
#include <cuda_runtime.h>
|
||||
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#ifdef _DEBUG
|
||||
#pragma comment(lib, "libcaffed.lib")
|
||||
#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, "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, "cudart.lib")
|
||||
#pragma comment(lib, "curand.lib")
|
||||
#pragma comment(lib, "cublas.lib")
|
||||
#pragma comment(lib, "cudnn.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")
|
||||
#pragma comment(lib, "opencv_highgui249d.lib")
|
||||
#pragma comment(lib, "opencv_imgproc249d.lib")
|
||||
#else
|
||||
#pragma comment(lib, "libcaffe.lib")
|
||||
#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, "glog.lib")
|
||||
#pragma comment(lib, "gflags.lib")
|
||||
#pragma comment(lib, "libprotobuf.lib")
|
||||
#endif
|
||||
#pragma comment(lib, "libprotoc.lib")
|
||||
#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, "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")
|
||||
#pragma comment(lib, "opencv_highgui249.lib")
|
||||
#pragma comment(lib, "opencv_imgproc249.lib")
|
||||
#endif
|
||||
|
||||
// 入力画像のオフセット
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/math/common_factor_rt.hpp>
|
||||
#include <opencv2/opencv.hpp>
|
||||
#include <cblas.h>
|
||||
#include "resource.h"
|
||||
#include "../common/waifu2x.h"
|
||||
|
||||
@ -830,10 +831,10 @@ public:
|
||||
MessageBox(dh, TEXT("cuDNNが使えます。"), TEXT("結果"), MB_OK | MB_ICONINFORMATION);
|
||||
break;
|
||||
case Waifu2x::eWaifu2xcuDNNError_NotFind:
|
||||
MessageBox(dh, TEXT("cuDNNは使えません。\r\n「cudnn64_65.dll」が見つかりません。"), TEXT("結果"), MB_OK | MB_ICONERROR);
|
||||
MessageBox(dh, TEXT("cuDNNは使えません。\r\n「") TEXT(CUDNN_DLL_NAME) TEXT("」が見つかりません。"), TEXT("結果"), MB_OK | MB_ICONERROR);
|
||||
break;
|
||||
case Waifu2x::eWaifu2xcuDNNError_OldVersion:
|
||||
MessageBox(dh, TEXT("cuDNNは使えません。\r\n「cudnn64_65.dll」のバージョンが古いです。v2を使って下さい。"), TEXT("結果"), MB_OK | MB_ICONERROR);
|
||||
MessageBox(dh, TEXT("cuDNNは使えません。\r\n「") TEXT(CUDNN_DLL_NAME) TEXT("」のバージョンが古いです。v2を使って下さい。"), TEXT("結果"), MB_OK | MB_ICONERROR);
|
||||
break;
|
||||
case Waifu2x::eWaifu2xcuDNNError_CannotCreate:
|
||||
MessageBox(dh, TEXT("cuDNNは使えません。\r\ncuDNNを初期化出来ません。"), TEXT("結果"), MB_OK | MB_ICONERROR);
|
||||
@ -934,6 +935,8 @@ int WINAPI WinMain(HINSTANCE hInstance,
|
||||
LPSTR lpCmdLine,
|
||||
int nCmdShow)
|
||||
{
|
||||
Waifu2x::init_liblary();
|
||||
|
||||
// CDialogクラスでダイアログを作成する
|
||||
CDialog cDialog;
|
||||
CDialog cDialog2;
|
||||
@ -992,5 +995,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
|
||||
// ダイアログを表示
|
||||
cDialog.DoModal(hInstance, IDD_DIALOG);
|
||||
|
||||
Waifu2x::quit_liblary();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -41,13 +41,13 @@
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)caffe\build\include;$(SolutionDir)caffe\3rdparty\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.0\include;C:\boost_1_56_0;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)caffe\build\lib;$(SolutionDir)caffe\3rdparty\lib;C:\boost_1_56_0\lib64-msvc-12.0;$(LibraryPath)</LibraryPath>
|
||||
<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>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)caffe\build\include;$(SolutionDir)caffe\3rdparty\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.0\include;C:\boost_1_56_0;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)caffe\build\lib;$(SolutionDir)caffe\3rdparty\lib;C:\boost_1_56_0\lib64-msvc-12.0;$(LibraryPath)</LibraryPath>
|
||||
<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>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
@ -56,11 +56,13 @@
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<DelayLoadDLLs>cudnn64_65.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>cudnn64_70.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>manifest.manifest</AdditionalManifestFiles>
|
||||
@ -75,13 +77,15 @@
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<DelayLoadDLLs>cudnn64_65.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>cudnn64_70.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>manifest.manifest</AdditionalManifestFiles>
|
||||
|
||||
@ -50,6 +50,8 @@ boost::filesystem::path relativePath(const boost::filesystem::path &path, const
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
Waifu2x::init_liblary();
|
||||
|
||||
// definition of command line arguments
|
||||
TCLAP::CmdLine cmd("waifu2x reimplementation using Caffe", ' ', "1.0.0");
|
||||
|
||||
@ -312,5 +314,7 @@ int main(int argc, char** argv)
|
||||
|
||||
printf("変換に成功しました\n");
|
||||
|
||||
Waifu2x::quit_liblary();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -41,13 +41,13 @@
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)caffe\build\include;$(SolutionDir)caffe\3rdparty\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.0\include;C:\boost_1_56_0;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)caffe\build\lib;$(SolutionDir)caffe\3rdparty\lib;C:\boost_1_56_0\lib64-msvc-12.0;$(LibraryPath)</LibraryPath>
|
||||
<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>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IncludePath>$(SolutionDir)caffe\build\include;$(SolutionDir)caffe\3rdparty\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.0\include;C:\boost_1_56_0;C:\opencv249\build\include;$(SolutionDir)rapidjson\include;$(SolutionDir)stb;$(SolutionDir)include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(SolutionDir)caffe\build\lib;$(SolutionDir)caffe\3rdparty\lib;C:\boost_1_56_0\lib64-msvc-12.0;$(LibraryPath)</LibraryPath>
|
||||
<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>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
@ -56,11 +56,13 @@
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<DelayLoadDLLs>cudnn64_65.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>cudnn64_70.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
@ -72,13 +74,15 @@
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<DelayLoadDLLs>cudnn64_65.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<DelayLoadDLLs>cudnn64_70.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user