From f43c057150e5b98e67ff989e2e038b7baa5e414d Mon Sep 17 00:00:00 2001 From: lltcggie Date: Tue, 5 Jul 2016 01:48:53 +0900 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E3=83=8D=E3=83=83=E3=83=88=E3=83=AF?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E5=85=A5=E5=8A=9B=E3=81=AE=E5=88=9D=E6=9C=9F?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E3=82=92crop=5Fsize=20128=E3=81=AB?= =?UTF-8?q?=E9=81=A9=E5=90=88=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../noise1_scale2.0x_model.prototxt | 2 +- .../noise2_scale2.0x_model.prototxt | 2 +- .../noise3_scale2.0x_model.prototxt | 2 +- .../upconv_7_anime_style_art_rgb/scale2.0x_model.prototxt | 2 +- bin/models/upconv_7_photo/noise1_scale2.0x_model.prototxt | 2 +- bin/models/upconv_7_photo/noise2_scale2.0x_model.prototxt | 2 +- bin/models/upconv_7_photo/noise3_scale2.0x_model.prototxt | 2 +- bin/models/upconv_7_photo/scale2.0x_model.prototxt | 2 +- common/cNet.cpp | 3 --- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/bin/models/upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.prototxt b/bin/models/upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.prototxt +++ b/bin/models/upconv_7_anime_style_art_rgb/noise1_scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/bin/models/upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.prototxt b/bin/models/upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.prototxt +++ b/bin/models/upconv_7_anime_style_art_rgb/noise2_scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/bin/models/upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.prototxt b/bin/models/upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.prototxt +++ b/bin/models/upconv_7_anime_style_art_rgb/noise3_scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/bin/models/upconv_7_anime_style_art_rgb/scale2.0x_model.prototxt b/bin/models/upconv_7_anime_style_art_rgb/scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_anime_style_art_rgb/scale2.0x_model.prototxt +++ b/bin/models/upconv_7_anime_style_art_rgb/scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/bin/models/upconv_7_photo/noise1_scale2.0x_model.prototxt b/bin/models/upconv_7_photo/noise1_scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_photo/noise1_scale2.0x_model.prototxt +++ b/bin/models/upconv_7_photo/noise1_scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/bin/models/upconv_7_photo/noise2_scale2.0x_model.prototxt b/bin/models/upconv_7_photo/noise2_scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_photo/noise2_scale2.0x_model.prototxt +++ b/bin/models/upconv_7_photo/noise2_scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/bin/models/upconv_7_photo/noise3_scale2.0x_model.prototxt b/bin/models/upconv_7_photo/noise3_scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_photo/noise3_scale2.0x_model.prototxt +++ b/bin/models/upconv_7_photo/noise3_scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/bin/models/upconv_7_photo/scale2.0x_model.prototxt b/bin/models/upconv_7_photo/scale2.0x_model.prototxt index ac5f684..0373400 100644 --- a/bin/models/upconv_7_photo/scale2.0x_model.prototxt +++ b/bin/models/upconv_7_photo/scale2.0x_model.prototxt @@ -3,7 +3,7 @@ layer { name: "input" type: "Input" top: "input" - input_param { shape: { dim: 1 dim: 3 dim: 142 dim: 142 } } + input_param { shape: { dim: 1 dim: 3 dim: 156 dim: 156 } } } layer { name: "conv1_layer" diff --git a/common/cNet.cpp b/common/cNet.cpp index 8819c53..080f581 100644 --- a/common/cNet.cpp +++ b/common/cNet.cpp @@ -349,9 +349,6 @@ Waifu2x::eWaifu2xError cNet::SetParameter(caffe::NetParameter ¶m, const std: auto mid = input_layer->mutable_input_param()->mutable_shape(); if (mid->size() != 1 || mid->Mutable(0)->dim_size() != 4) return Waifu2x::eWaifu2xError_FailedParseModelFile; - mid->Mutable(0)->set_dim(0, 1); - mid->Mutable(0)->set_dim(2, 142); - mid->Mutable(0)->set_dim(3, 142); } for (int i = 0; i < param.layer_size(); i++)