Mirror/waifu2x-caffe
1
0
Fork 0
mirror of https://github.com/lltcggie/waifu2x-caffe.git synced 2025-06-26 05:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

コメント追加

Browse Source
This commit is contained in:
lltcggie 2016-07-11 00:40:47 +09:00
parent 0c61e9814b
commit d8a3564640
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/waifu2x.cpp
View File

@ -869,7 +869,7 @@ double Waifu2x::CalcScaleRatio(const boost::optional<double> scale_ratio, const
int Waifu2x::GetcuDNNAlgorithm(const char * layer_name, int num_input, int num_output, int batch_size, int Waifu2x::GetcuDNNAlgorithm(const char * layer_name, int num_input, int num_output, int batch_size,
int width, int height, int kernel_w, int kernel_h, int pad_w, int pad_h, int stride_w, int stride_h) int width, int height, int kernel_w, int kernel_h, int pad_w, int pad_h, int stride_w, int stride_h)
{ {
// ExeDir; // g_ConvCcuDNNAlgorithmとg_DeconvCcuDNNAlgorithmが逆になってしまっているが、ファイル名にしか影響がないのと互換性がなくなるのでこのまま仕様とする
if (strcmp(layer_name, "Deconvolution") == 0) if (strcmp(layer_name, "Deconvolution") == 0)
return g_ConvCcuDNNAlgorithm.GetAlgorithm(num_input, num_output, batch_size, width, height, kernel_w, kernel_h, pad_w, pad_h, stride_w, stride_h); return g_ConvCcuDNNAlgorithm.GetAlgorithm(num_input, num_output, batch_size, width, height, kernel_w, kernel_h, pad_w, pad_h, stride_w, stride_h);
else if (strcmp(layer_name, "Convolution") == 0) else if (strcmp(layer_name, "Convolution") == 0)
@ -881,6 +881,7 @@ int Waifu2x::GetcuDNNAlgorithm(const char * layer_name, int num_input, int num_o
void Waifu2x::SetcuDNNAlgorithm(int algo, const char * layer_name, int num_input, int num_output, int batch_size, void Waifu2x::SetcuDNNAlgorithm(int algo, const char * layer_name, int num_input, int num_output, int batch_size,
int width, int height, int kernel_w, int kernel_h, int pad_w, int pad_h, int stride_w, int stride_h) int width, int height, int kernel_w, int kernel_h, int pad_w, int pad_h, int stride_w, int stride_h)
{ {
// g_ConvCcuDNNAlgorithmとg_DeconvCcuDNNAlgorithmが逆になってしまっているが、ファイル名にしか影響がないのと互換性がなくなるのでこのまま仕様とする
if (strcmp(layer_name, "Deconvolution") == 0) if (strcmp(layer_name, "Deconvolution") == 0)
return g_ConvCcuDNNAlgorithm.SetAlgorithm(algo, num_input, num_output, batch_size, width, height, kernel_w, kernel_h, pad_w, pad_h, stride_w, stride_h); return g_ConvCcuDNNAlgorithm.SetAlgorithm(algo, num_input, num_output, batch_size, width, height, kernel_w, kernel_h, pad_w, pad_h, stride_w, stride_h);
else if (strcmp(layer_name, "Convolution") == 0) else if (strcmp(layer_name, "Convolution") == 0)