mogrify and so

3 files changed, 24 insertions, 25 deletions

diff --git a/options/base_options.py b/options/base_options.py
index d569928..b04216d 100644
--- a/options/base_options.py
+++ b/options/base_options.py
@@ -50,7 +50,6 @@ class BaseOptions():
             self.initialize()
         self.opt = self.parser.parse_args()
         self.opt.isTrain = self.isTrain   # train or test
-        return self.opt
 
         str_ids = self.opt.gpu_ids.split(',')
         self.opt.gpu_ids = []
diff --git a/run.sh b/run.sh
index 5f49b7d..05c5eb2 100755
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,4 @@
-dataset="woodcanny"
+dataset="pcfade"
 
 #/home/lens/Desktop/dataset-random.pl
 
@@ -17,21 +17,21 @@ python train.py \
    --which_direction AtoB  \
    --lambda_B 100  \
    --dataset_mode aligned  \
-   --which_epoch latest \
-   --continue_train \
    --no_lsgan --norm batch --pool_size 0
+#   --which_epoch latest \
+#   --continue_train \
 
-python test.py \
-  --dataroot "/home/lens/Desktop/thumbs/$dataset/A/train/" \
-  --name "$dataset" \
-  --start_img "/home/lens/Desktop/thumbs/$dataset/A/train/frame_1008.png" \
-  --how_many 1000 \
-  --model test  \
-  --aspect_ratio 1.777777 \
-  --which_model_netG unet_256  \
-  --which_direction AtoB  \
-  --dataset_mode recursive  \
-  --norm batch
+#python test.py \
+#  --dataroot "/home/lens/Desktop/thumbs/$dataset/A/train/" \
+#  --name "$dataset" \
+#  --start_img "/home/lens/Desktop/thumbs/$dataset/A/train/frame_1008.png" \
+#  --how_many 1000 \
+#  --model test  \
+#  --aspect_ratio 1.777777 \
+#  --which_model_netG unet_256  \
+#  --which_direction AtoB  \
+#  --dataset_mode recursive  \
+#  --norm batch
 #  --loadSize 256 \
 #  --fineSize 256 \
 
diff --git a/scripts/builders/mogrify-dir.py b/scripts/builders/mogrify-dir.py
index 2794ee6..4453322 100755
--- a/scripts/builders/mogrify-dir.py
+++ b/scripts/builders/mogrify-dir.py
@@ -26,15 +26,15 @@ if os.path.exists(out_dir):
 
 os.makedirs(out_dir)
 if opt.split is True:
-  os.makedirs(out_dir + "A/")
-  os.makedirs(out_dir + "A/train/")
-  os.makedirs(out_dir + "A/test/")
-  os.makedirs(out_dir + "A/val/")
+  os.makedirs(os.path.join(out_dir, "A/"))
+  os.makedirs(os.path.join(out_dir, "A/train/"))
+  os.makedirs(os.path.join(out_dir, "A/test/"))
+  os.makedirs(os.path.join(out_dir, "A/val/"))
   if opt.ab is True:
-    os.makedirs(out_dir + "B/")
-    os.makedirs(out_dir + "B/train/")
-    os.makedirs(out_dir + "B/test/")
-    os.makedirs(out_dir + "B/val/")
+    os.makedirs(os.path.join(out_dir, "B/"))
+    os.makedirs(os.path.join(out_dir, "B/train/"))
+    os.makedirs(os.path.join(out_dir, "B/test/"))
+    os.makedirs(os.path.join(out_dir, "B/val/"))
 
 file = open(os.path.join(out_dir, "opt.txt"), "w") 
 for arg in vars(opt):
@@ -87,9 +87,9 @@ for i, fn in enumerate(images):
     else:
       wd = "train/"
 
-    cv2.imwrite(out_dir + "A/" + wd + out_file, img)
+    cv2.imwrite(os.path.join(out_dir, "A/", wd, out_file), img)
     if opt.ab is True:
-      copyfile(fn, out_dir + "B/" + wd + out_file)
+      copyfile(fn, os.path.join(out_dir, "B/", wd, out_file))
 
   else:
     cv2.imwrite(os.path.join(out_dir, out_file), img)