Update benchmark

appendix/benchmark.md

@@ -46,34 +46,39 @@ Note: TTA is an ensemble technique that is supported by waifu2x. TTA method is 8
 
 ## Art
 
-command: 
-`th tools/benchmark.lua -dir <dataset_dir> -model1_dir <model_dir> -method scale -filter Lanczos -color y -range_bug 1 -tta <0|1> -force_cudnn 1`
+command: See `appendix/benchmark.sh`
 
 ### Dataset
 
-art_test: This dataset contains 85 various fan-arts. Sorry, This dataset is private. 
+art_test: This dataset contains 84 various fan-arts. Sorry, This dataset is private.
 
 ### 2x - PSNR 
 
-| Dataset/Model | Bicubic       | vgg\_7/art  | upconv\_7/art  | upconv\_7l/art | 
-|---------------|---------------|-------------|----------------|----------------|
-| art_test      | 31.022        | 37.495      | 38.330         | 39.140         |
+| Filter/Model   | Bicubic       | vgg\_7/art  | upconv\_7/art  | cunet/art      | 
+|----------------|---------------|-------------|----------------|----------------|
+| Lanczos        | 31.022        | 37.495      | 38.330         | 39.886         |
+| Sinc           | 30.947        | 37.722      | 38.538         | 40.312         |
+| Catrom(Bicubic)| 30.663        | 37.278      | 37.189         | 40.184         |
+| Box            | 30.891        | 37.709      | 38.410         | 39.672         |
 
 ### 2x with TTA - PSNR 
 
-| Dataset/Model | Bicubic       | vgg\_7/art  | upconv\_7/art  | upconv\_7l/art | 
-|---------------|---------------|-------------|----------------|----------------|
-| art_test      | 31.022        | 37.777      | 38.677         | 39.510         |
+| Filter/Model   | Bicubic       | vgg\_7/art  | upconv\_7/art  | cunet/art      | 
+|----------------|---------------|-------------|----------------|----------------|
+| Lanczos        | 31.022        | 37.777      | 38.677         | 40.289         |
+| Sinc           | 30.947        | 38.005      | 38.883         | 40.707         |
+| Catrom(Bicubic)| 30.663        | 37.498      | 37.417         | 40.592         |
+| Box            | 30.891        | 38.032      | 38.768         | 40.032         |
+
 
 ### 2x - benchmark elapsed time (sec)
 
-| Dataset/Model | vgg\_7/art  | upconv\_7/art  | upconv\_7l/art | 
+| Dataset/Model | vgg\_7/art  | upconv\_7/art  | cunet/art | 
 |---------------|-------------|----------------|----------------|
-| art_test      | 20.681      | 7.683          | 17.667         |
+| art_test      | 24.153      | 10.794         | 24.222         |
 
 ### 2x with TTA - benchmark elapsed time (sec)
 
 | Dataset/Model | vgg\_7/art  | upconv\_7/art  | upconv\_7l/art | 
 |---------------|-------------|----------------|----------------|
-| art_test      | 174.674     | 77.716         | 163.932        |
-
+| art_test      | 207.217     | 99.151         | 211.520        |

appendix/benchmark.sh

@@ -4,7 +4,7 @@ set -x
 benchmark_photo() {
     dir=./benchmarks/${1}/${2}/${3}
     mkdir -p ${dir}
-    th tools/benchmark.lua -dir data/${1} -model1\_dir models/${2}/photo -method scale -filter Catrom -color y -range\_bug 1 -tta ${3} -force_cudnn 1 -output_dir ${dir} -save_info 1 -show_progress 0 
+    th tools/benchmark.lua -dir data/${1} -model1\_dir models/${2}/photo -method scale -filter Catrom -color y -range\_bug 1 -tta ${3} -output_dir ${dir} -save_info 1 -show_progress 0 -force_cudnn 1
 }
 run_benchmark_photo() {
     for tta in 0 1
@@ -18,17 +18,20 @@ run_benchmark_photo() {
     done
 }
 benchmark_art() {
-    dir=./benchmarks/${1}/${2}/${3}
+    dir=./benchmarks/${1}/${2}/${3}/${4}
     mkdir -p ${dir}
-    th tools/benchmark.lua -dir data/${1} -model1\_dir models/${2}/art -method scale -filter Lanczos -color y -range\_bug 1 -tta ${3} -force_cudnn 1 -output_dir ${dir} -save_info 1 -show_progress 0 
+    th tools/benchmark.lua -dir data/${1} -model1\_dir models/${2}/art -method scale -filter ${3} -color y -range\_bug 1 -tta ${4} -output_dir ${dir} -save_info 1 -show_progress 0 -force_cudnn 1
 }
 run_benchmark_art() {
     for tta in 0 1
     do
-	benchmark_art art_test vgg_7 ${tta}
-	benchmark_art art_test upconv_7 ${tta}
-	benchmark_art art_test upconv_7l ${tta}
+	for filter in Sinc Lanczos Catrom Box
+	do 
+	    benchmark_art art_test vgg_7 ${filter} ${tta}
+	    benchmark_art art_test upconv_7 ${filter} ${tta}
+	    benchmark_art art_test cunet ${filter} ${tta}
+	done
     done
 }
-#run_benchmark_photo
+
 run_benchmark_art