Merge branch 'master' of ghghgh.us:pix2pix

2 files changed, 142 insertions, 141 deletions

diff --git a/test-mogrify-recursive.sh b/test-mogrify-recursive.sh
index 861fda4..d481a37 100644
--- a/test-mogrify-recursive.sh
+++ b/test-mogrify-recursive.sh
@@ -19,7 +19,7 @@ how_many=200
   python test-mogrify.py \
     --dataroot "/home/lens/Desktop/woods_videos/processed/combined" \
     --start_img "/home/lens/Desktop/woods_videos/processed/combined/frame_00003.png" \
-    --experiment "spin_sequence_blur" \
+    --experiment "spin_sequence_canny" \
     --name pcfade \
     --sequence --sequence-frac 0.04 \
     --recursive --recursive-frac 0.3 \
@@ -27,7 +27,7 @@ how_many=200
     --loadSize 256 --fineSize 256 --how_many 200 \
     --model test --which_model_netG unet_256  \
     --which_direction AtoB --dataset_mode recursive  \
-    --blur \
+    --blur --canny \
     --norm batch
 
 
@@ -41,158 +41,158 @@ python test-mogrify.py \
   --model test --which_model_netG unet_256  \
   --which_direction AtoB --dataset_mode recursive  \
   --recursive --recursive-frac 0.0005 \
-  --norm batch
-  # --clahe --process-frac 0.001 \
-  # --sequence --sequence-frac 0.49 \
+  --norm batch \
+  --clahe --process-frac 0.001 \
+  --sequence --sequence-frac 0.49 \
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_00003.png" \
-#   --experiment "sequence_process_less" \
-#   --name pcfade \
-#   --sequence --sequence-frac 0.999 \
-#   --loadSize 256 --fineSize 256 --how_many 200 \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.0005 \
-#   --norm batch --tag "pcfade_spin_sequence_process_less_201805150450" \
-#   --render-frames --mov
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_00003.png" \
+  --experiment "sequence_process_less" \
+  --name pcfade \
+  --sequence --sequence-frac 0.999 \
+  --loadSize 256 --fineSize 256 --how_many 200 \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.0005 \
+  --norm batch --tag "pcfade_spin_sequence_process_less_201805150450" \
+  --render-frames --mov
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_00003.png" \
-#   --experiment "${tag}_dark_reverse" \
-#   --name pcfade \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction BtoA --dataset_mode recursive  \
-#   --recursive --clahe --posterize \
-#   --recursive-frac $recursive_frac \
-#   --sequence \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_00003.png" \
+  --experiment "${tag}_dark_reverse" \
+  --name pcfade \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction BtoA --dataset_mode recursive  \
+  --recursive --clahe --posterize \
+  --recursive-frac $recursive_frac \
+  --sequence \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_00003.png" \
-#   --experiment "${tag}_sequence_posterize" \
-#   --name pcfade \
-#   --sequence \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction BtoA --dataset_mode recursive  \
-#   --recursive --clahe --posterize \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_00003.png" \
+  --experiment "${tag}_sequence_posterize" \
+  --name pcfade \
+  --sequence \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction BtoA --dataset_mode recursive  \
+  --recursive --clahe --posterize \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_00003.png" \
-#   --experiment "${tag}_sequence_blur" \
-#   --name pcfade \
-#   --sequence \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction BtoA --dataset_mode recursive  \
-#   --recursive --blur \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_00003.png" \
+  --experiment "${tag}_sequence_blur" \
+  --name pcfade \
+  --sequence \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction BtoA --dataset_mode recursive  \
+  --recursive --blur \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_01003.png" \
-#   --experiment "${tag}_1003" \
-#   --name pcfade \
-#   --sequence \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --clahe --posterize \
-#   --recursive-frac $recursive_frac \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_01003.png" \
+  --experiment "${tag}_1003" \
+  --name pcfade \
+  --sequence \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --clahe --posterize \
+  --recursive-frac $recursive_frac \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_01003.png" \
-#   --experiment "${tag}_1003_0_1frac" \
-#   --name pcfade \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.1 \
-#   --sequence --sequence-frac 0.1 \
-#   --clahe --posterize \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_01003.png" \
+  --experiment "${tag}_1003_0_1frac" \
+  --name pcfade \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.1 \
+  --sequence --sequence-frac 0.1 \
+  --clahe --posterize \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_01003.png" \
-#   --experiment "${tag}_1003_0_8frac" \
-#   --name pcfade \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.2 \
-#   --sequence --sequence-frac 0.3 \
-#   --clahe --posterize \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_01003.png" \
+  --experiment "${tag}_1003_0_8frac" \
+  --name pcfade \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.2 \
+  --sequence --sequence-frac 0.3 \
+  --clahe --posterize \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_05003.png" \
-#   --experiment "${tag}_5003" \
-#   --name pcfade \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.1 \
-#   --sequence --sequence-frac 0.3 \
-#   --blur --posterize \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_05003.png" \
+  --experiment "${tag}_5003" \
+  --name pcfade \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.1 \
+  --sequence --sequence-frac 0.3 \
+  --blur --posterize \
+  --norm batch
 
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/train/frame_05005.png" \
-#   --experiment "${tag}_5005_rec_poster_blur" \
-#   --name pcfade \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.3 \
-#   --sequence --sequence-frac 0.2 \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/train/frame_05005.png" \
+  --experiment "${tag}_5005_rec_poster_blur" \
+  --name pcfade \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.3 \
+  --sequence --sequence-frac 0.2 \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/train/frame_05005.png" \
-#   --experiment "${tag}_5005_rec_4" \
-#   --name pcfade \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.4 \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/train/frame_05005.png" \
+  --experiment "${tag}_5005_rec_4" \
+  --name pcfade \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.4 \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/test/frame_10003.png" \
-#   --experiment "${tag}_10003" \
-#   --name pcfade \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.5 \
-#   --clahe --posterize --blur \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/test/frame_10003.png" \
+  --experiment "${tag}_10003" \
+  --name pcfade \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.5 \
+  --clahe --posterize --blur \
+  --norm batch
 
-# python test-mogrify.py \
-#   --dataroot "$dataset/train/" \
-#   --start_img "$dataset/train/frame_05005.png" \
-#   --experiment "${tag}_5005_just_copy" \
-#   --name pcfade --just-copy \
-#   --loadSize 256 --fineSize 256 --how_many $how_many \
-#   --model test --which_model_netG unet_256  \
-#   --which_direction AtoB --dataset_mode recursive  \
-#   --recursive --recursive-frac 0.4 \
-#   --norm batch
+python test-mogrify.py \
+  --dataroot "$dataset/train/" \
+  --start_img "$dataset/train/frame_05005.png" \
+  --experiment "${tag}_5005_just_copy" \
+  --name pcfade --just-copy \
+  --loadSize 256 --fineSize 256 --how_many $how_many \
+  --model test --which_model_netG unet_256  \
+  --which_direction AtoB --dataset_mode recursive  \
+  --recursive --recursive-frac 0.4 \
+  --norm batch
 
 
 
diff --git a/test-mogrify.py b/test-mogrify.py
index be74ba8..676b1ad 100644
--- a/test-mogrify.py
+++ b/test-mogrify.py
@@ -92,6 +92,7 @@ if __name__ == '__main__':
     if data_opt.canny is True:
       processed = True
       img = cv2.Canny(img, data_opt.canny_lo, data_opt.canny_hi)
+      img = cv2.cvtColor(img, cv2.COLOR_GRAY2BGR)
 
     if processed is False or data_opt.process_frac == 0:
       return img