Merge branch 'master' into dev

README.md

@@ -30,6 +30,11 @@ Created at: 2016-03-22
 ```
 See ~/README.md
 
+Please update the git repo first.
+```
+git pull
+```
+
 ## Third Party Software
 
 [Third-Party](https://github.com/nagadomi/waifu2x/wiki/Third-Party)
@@ -117,6 +122,7 @@ th waifu2x.lua -m noise -noise_level 1 -i input_image.png -o output_image.png
 ```
 ```
 th waifu2x.lua -m noise -noise_level 2 -i input_image.png -o output_image.png
+th waifu2x.lua -m noise -noise_level 3 -i input_image.png -o output_image.png
 ```
 
 ### 2x Upscaling
@@ -130,6 +136,7 @@ th waifu2x.lua -m noise_scale -noise_level 1 -i input_image.png -o output_image.
 ```
 ```
 th waifu2x.lua -m noise_scale -noise_level 2 -i input_image.png -o output_image.png
+th waifu2x.lua -m noise_scale -noise_level 3 -i input_image.png -o output_image.png
 ```
 
 ### Batch conversion

train.sh

@@ -2,6 +2,7 @@
 
 th convert_data.lua
 
-th train.lua -method scale -model_dir models/anime_style_art_rgb -test images/miku_small.png -thread 4
-th train.lua -method noise -noise_level 1 -style art -model_dir models/anime_style_art_rgb -test images/miku_noisy.png -thread 4
-th train.lua -method noise -noise_level 2 -style art -model_dir models/anime_style_art_rgb -test images/miku_noisy.png -thread 4
+th train.lua -method scale -downsampling_filters "Box,Box,Blackman,Sinc,Lanczos" -model_dir models/anime_style_art_rgb -test images/miku_small.png # -thread 4 -backend cudnn
+th train.lua -method noise -noise_level 1 -style art -model_dir models/anime_style_art_rgb -test images/miku_noisy.png
+th train.lua -method noise -noise_level 2 -style art -model_dir models/anime_style_art_rgb -test images/miku_noisy.png
+th train.lua -method noise -noise_level 3 -style art -model_dir models/anime_style_art_rgb -test images/miku_noisy.png -nr_rate 1

train_photo.sh

@@ -2,8 +2,7 @@
 
 th convert_data.lua -style photo -data_dir ./data/photo -model_dir models/photo
 
-th train.lua -style photo -method scale -data_dir ./data/photo -model_dir models/photo -test work/scale_test_photo.png -color rgb -thread 4 -backend cudnn -random_unsharp_mask_rate 0.1 -validation_crops 160
-
-th train.lua -style photo -method noise -noise_level 1 -data_dir ./data/photo -model_dir models/photo -test work/noise_test_photo.jpg -color rgb -thread 4 -backend cudnn -random_unsharp_mask_rate 0.5 -validation_crops 160 -nr_rate 0.6 -epoch 33
-
-th train.lua -style photo -method noise -noise_level 2 -data_dir ./data/photo -model_dir models/photo -test work/noise_test_photo.jpg -color rgb -thread 4 -backend cudnn -random_unsharp_mask_rate 0.5 -validation_crops 160 -nr_rate 0.8 -epoch 38
+th train.lua -style photo -method scale -data_dir ./data/photo -model_dir models/photo -test work/scale_test_photo.png -color rgb -random_unsharp_mask_rate 0.1 #-thread 4 -backend cudnn 
+th train.lua -style photo -method noise -noise_level 1 -data_dir ./data/photo -model_dir models/photo -test work/noise_test_photo.jpg -color rgb -random_unsharp_mask_rate 0.5 -nr_rate 0.6
+th train.lua -style photo -method noise -noise_level 2 -data_dir ./data/photo -model_dir models/photo -test work/noise_test_photo.jpg -color rgb -random_unsharp_mask_rate 0.5 -nr_rate 0.8
+th train.lua -style photo -method noise -noise_level 3 -data_dir ./data/photo -model_dir models/photo -test work/noise_test_photo.jpg -color rgb -random_unsharp_mask_rate 0.5 -nr_rate 1