CUDAが使えない環境でCPUでUpResNet10を動作させるとクラッシュするのを修正 resolved #126

lltcggie · lltcggie · commit 7d1973c3148a · 2018-10-25T20:57:45.000+09:00
diff --git a/common/cNet.cpp b/common/cNet.cpp
@@ -390,6 +390,13 @@ Waifu2x::eWaifu2xError cNet::SetParameter(caffe::NetParameter &param, const std:
 			else
 				layer_param->mutable_relu_param()->set_engine(caffe::ReLUParameter_Engine_CAFFE);
 		}
+		else if (type == "Sigmoid")
+		{
+			if (process == "cudnn")
+				layer_param->mutable_sigmoid_param()->set_engine(caffe::SigmoidParameter_Engine_CUDNN);
+			else
+				layer_param->mutable_sigmoid_param()->set_engine(caffe::SigmoidParameter_Engine_CAFFE);
+		}
 	}
 
 	return Waifu2x::eWaifu2xError_OK;

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,13 @@ Waifu2x::eWaifu2xError cNet::SetParameter(caffe::NetParameter &param, const std:`
`390`	`390`	`else`
`391`	`391`	`layer_param->mutable_relu_param()->set_engine(caffe::ReLUParameter_Engine_CAFFE);`
`392`	`392`	`}`
	`393`	`+ else if (type == "Sigmoid")`
	`394`	`+ {`
	`395`	`+ if (process == "cudnn")`
	`396`	`+ layer_param->mutable_sigmoid_param()->set_engine(caffe::SigmoidParameter_Engine_CUDNN);`
	`397`	`+ else`
	`398`	`+ layer_param->mutable_sigmoid_param()->set_engine(caffe::SigmoidParameter_Engine_CAFFE);`
	`399`	`+ }`
`393`	`400`	`}`
`394`	`401`
`395`	`402`	`return Waifu2x::eWaifu2xError_OK;`