1 files changed, 17 insertions, 12 deletions
diff --git a/app/relay/modules/pix2pix.js b/app/relay/modules/pix2pix.js
index d580a26..d6a4161 100644
--- a/app/relay/modules/pix2pix.js
+++ b/app/relay/modules/pix2pix.js
@@ -28,16 +28,17 @@ const fetch = {
       return { type: 'progress', action: 'resolve_dataset', task, }
     }
     return null
-  }
+  },
+  after: 'make_folds',
 }
 const make_folds = {
-  type: 'pytorch',
-  script: 'datasets/combine_A_and_B.py',
+  type: 'perl',
+  script: 'scripts/builders/pair-dataset-link.pl',
   params: (task) => {
     return [
-      '--fold_A', task.module + '/a_b/' + task.dataset + '/A',
-      '--fold_B', task.module + '/a_b/' + task.dataset + '/B',
-      '--fold_AB', task.module + '/datasets/' + task.dataset,
+      '--sequence_dir', path.join(cwd, 'sequences', task.module, task.dataset),
+      '--ab_dir', path.join(cwd, 'a_b', task.module, task.dataset),
+      '--dt', task.opt.dt || 1,
     ]
   },
   after: 'combine_folds',
@@ -47,9 +48,9 @@ const combine_folds = {
   script: 'datasets/combine_A_and_B.py',
   params: (task) => {
     return [
-      '--fold_A', task.module + '/a_b/' + task.dataset + '/A',
-      '--fold_B', task.module + '/a_b/' + task.dataset + '/B',
-      '--fold_AB', task.module + '/datasets/' + task.dataset,
+      '--fold_A', path.join(cwd, 'a_b', task.module, task.dataset, 'A'),
+      '--fold_B', path.join(cwd, 'a_b', task.module, task.dataset, 'B'),
+      '--fold_AB', path.join(cwd, 'datasets', task.module, task.dataset),
     ]
   }
 }
@@ -58,10 +59,10 @@ const train = {
   script: 'train.py',
   params: (task) => {
     return [
-      '--dataroot', path.join(cwd, 'datasets', task.dataset),
+      '--dataroot', path.join(cwd, 'datasets', task.module, task.dataset),
       '--name', task.dataset,
       '--model', 'pix2pix',
-      '--loadSize', opt.load_size || 264,
+      '--loadSize', task.opt.load_size || 264,
       '--fineSize', 256,
       '--which_model_netG', 'unet_256',
       '--which_direction', 'AtoB',
@@ -132,6 +133,10 @@ const live = {
 export default {
   name, cwd,
   activities: {
-    fetch, make_folds, combine_folds, train, generate, live,
+    fetch,
+    make_folds, combine_folds,
+    train,
+    generate,
+    live,
   }
 }