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

caffemodelとprototxtのみが存在してjsonとprototxt.protobinが存在しない状況でもエラーを吐かないようにした

Browse Source
This commit is contained in:
lltcggie 2018-10-25 03:54:07 +09:00
parent b280d34413
commit a17ad89116
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/cNet.cpp
View File

@ -280,8 +280,20 @@ Waifu2x::eWaifu2xError cNet::ConstractNet(const Waifu2x::eWaifu2xModelType mode,
const auto retModelBin = readProtoBinary(modelbin_path, &param_model);
const auto retParamBin = readProtoBinary(caffemodel_path, &param_caffemodel);
if (retModelBin == Waifu2x::eWaifu2xError_OK && retParamBin == Waifu2x::eWaifu2xError_OK)
if ( retParamBin == Waifu2x::eWaifu2xError_OK &&
(retModelBin == Waifu2x::eWaifu2xError_OK || retModelBin == Waifu2x::eWaifu2xError_FailedOpenModelFile))
{
if (retModelBin == Waifu2x::eWaifu2xError_FailedOpenModelFile) // protobinのみが読み込めなかったときはprototxtから読み込む(ついでにprotobinも書き込む)
{
ret = readProtoText(model_path, &param_model);
if (ret != Waifu2x::eWaifu2xError_OK)
return ret;
ret = writeProtoBinary(param_model, modelbin_path);
if (ret != Waifu2x::eWaifu2xError_OK)
return ret;
}
ret = SetParameter(param_model, process);
if (ret != Waifu2x::eWaifu2xError_OK)
return ret;