From 3ca69b483816e714ed3eb71a5c9d95b4ff635ec2 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Thu, 13 Sep 2018 19:22:02 +0200
Subject: merge

---
 app/client/modules/pix2pixhd/views/pix2pixhd.train.js | 5 +++++
 app/relay/modules/pix2pixhd.js                        | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
index 8ccc7f8..98d5e88 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
@@ -161,6 +161,11 @@ class Pix2PixHDTrain extends Component {
                 value="Augment"
                 onClick={() => this.props.remote.augment_task(this.state.checkpoint_name, this.state)}
               />
+              <Button
+                title="Make a movie without augmenting"
+                value="Generate"
+                onClick={() => this.props.remote.augment_task(this.state.checkpoint_name, { ...this.state, no_symlinks: true, mov: true })}
+              />
             </Group>
             <Group title='Augmentation Presets'>
               <Param title="Short Recursion">
diff --git a/app/relay/modules/pix2pixhd.js b/app/relay/modules/pix2pixhd.js
index 0391480..3bdf705 100644
--- a/app/relay/modules/pix2pixhd.js
+++ b/app/relay/modules/pix2pixhd.js
@@ -207,11 +207,14 @@ const render_recursive = {
   script: 'dir-to-movie.pl',
   params: (task) => {
     if (!!task.opt.mov) {
+      console.log('will not render mov')
       return 'CANCEL'
     }
+    const tag = task.checkpoint + '/' + task.dataset + '_' + pad(task.augment_take, 5) + '_' + pad(task.augment_make, 5)
+    console.log('rendering recursve path:', tag)
     return [
       '--path', 'recursive',
-      '--tag', task.checkpoint + '/' + task.dataset + '_' + pad(task.augment_take, 5) + '_' + pad(task.augment_make, 5),
+      '--tag', tag,
       '--module', task.module,
       '--endpoint', process.env.API_REMOTE + '/api/folder/' + task.opt.folder_id + '/upload/',
     ]
-- 
cgit v1.2.3-70-g09d2