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

パラメータファイルがjsonしかない場合、バイナリに変換する機能が動いていなかったのを修正

Browse Source
This commit is contained in:
lltcggie 2015-12-26 18:31:36 +09:00
parent 7fb34eb6c8
commit 1c944e01ea
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/waifu2x.cpp
View File

@ -242,10 +242,19 @@ static Waifu2x::eWaifu2xError readProtoText(const boost::filesystem::path &path,
static Waifu2x::eWaifu2xError readProtoBinary(const boost::filesystem::path &path, ::google::protobuf::Message* proto) static Waifu2x::eWaifu2xError readProtoBinary(const boost::filesystem::path &path, ::google::protobuf::Message* proto)
{ {
boost::iostreams::stream<boost::iostreams::file_descriptor_source> is(path, std::ios_base::in | std::ios_base::binary); boost::iostreams::stream<boost::iostreams::file_descriptor_source> is;
try
{
is.open(path, std::ios_base::in | std::ios_base::binary);
}
catch (...)
{
return Waifu2x::eWaifu2xError_FailedOpenModelFile;
}
if (!is) if (!is)
return Waifu2x::eWaifu2xError_FailedParseModelFile; return Waifu2x::eWaifu2xError_FailedOpenModelFile;
std::vector<char> tmp; std::vector<char> tmp;
if (!readFile(is, tmp)) if (!readFile(is, tmp))
@ -617,7 +626,12 @@ Waifu2x::eWaifu2xError Waifu2x::ConstractNet(boost::shared_ptr<caffe::Net<float>
modelbin_path += ".protobin"; modelbin_path += ".protobin";
caffe::NetParameter param; caffe::NetParameter param;
if (readProtoBinary(modelbin_path, &param) == eWaifu2xError_OK) caffe::NetParameter param_caffemodel;
const auto retModelBin = readProtoBinary(caffemodel_path, &param);
const auto retParamBin = readProtoBinary(modelbin_path, &param_caffemodel);
if (retModelBin == eWaifu2xError_OK && retParamBin == eWaifu2xError_OK)
{ {
Waifu2x::eWaifu2xError ret; Waifu2x::eWaifu2xError ret;
@ -625,11 +639,6 @@ Waifu2x::eWaifu2xError Waifu2x::ConstractNet(boost::shared_ptr<caffe::Net<float>
if (ret != eWaifu2xError_OK) if (ret != eWaifu2xError_OK)
return ret; return ret;
caffe::NetParameter param_caffemodel;
ret = readProtoBinary(caffemodel_path, &param_caffemodel);
if (ret != eWaifu2xError_OK)
return ret;
if (!caffe::UpgradeNetAsNeeded(caffemodel_path.string(), &param_caffemodel)) if (!caffe::UpgradeNetAsNeeded(caffemodel_path.string(), &param_caffemodel))
return Waifu2x::eWaifu2xError_FailedParseModelFile; return Waifu2x::eWaifu2xError_FailedParseModelFile;