overspecifying everything lol

7 files changed, 32 insertions, 11 deletions

diff --git a/app/client/common/select.component.js b/app/client/common/select.component.js
index b768336..f1e441f 100644
--- a/app/client/common/select.component.js
+++ b/app/client/common/select.component.js
@@ -14,6 +14,7 @@ class Select extends Component {
   }
   render() {
     const value = this.props.opt[this.props.name]
+    let lastValue
     const options = (this.props.options || []).map((key,i) => {
       let name, value
       if (typeof key === 'object' && key.length) {
@@ -27,6 +28,7 @@ class Select extends Component {
         name = key.name.replace(/_/g, ' ') + ' (' + frames + ')'
         value = key.name
       }
+      lastValue = value
       return (
         <option value={value} key={i}>
           {name}
@@ -39,7 +41,7 @@ class Select extends Component {
           <span>{this.props.title}</span>
           <select
             onChange={this.handleChange}
-            value={value}
+            value={value || lastValue}
           >
             {options}
           </select>
diff --git a/app/client/dashboard/dashboard.reducer.js b/app/client/dashboard/dashboard.reducer.js
index b3ee05e..72aece6 100644
--- a/app/client/dashboard/dashboard.reducer.js
+++ b/app/client/dashboard/dashboard.reducer.js
@@ -23,7 +23,6 @@ const dashboardInitialState = {
     },
   ],
   files: [
-    { id: 2, module: 'samplernn', checkpoint: 'jwcglassbeat', dataset: 'jwcglassbeat', epoch: 18, duration: 30, batch_size: 5, filename: 'jwcglassbeat-ep18.mp3', size: 3 * 1024 * 1024, date: Date.now(), opt: "{}", }
   ]
 }
 
diff --git a/app/client/live/live.reducer.js b/app/client/live/live.reducer.js
index 3731506..16f491c 100644
--- a/app/client/live/live.reducer.js
+++ b/app/client/live/live.reducer.js
@@ -46,6 +46,7 @@ const liveReducer = (state = liveInitialState, action) => {
       }
 
     case types.socket.list_epochs:
+      if (action.epochs === "not found") return { ...state, epochs: [] }
       return {
         ...state,
         epochs: (action.epochs || []).map(a => [ a == 'latest' ? Infinity : a, a ])
diff --git a/app/client/modules/pix2wav/pix2wav.actions.js b/app/client/modules/pix2wav/pix2wav.actions.js
index 9d819a3..48d0496 100644
--- a/app/client/modules/pix2wav/pix2wav.actions.js
+++ b/app/client/modules/pix2wav/pix2wav.actions.js
@@ -15,17 +15,19 @@ export const load_directories = (id) => (dispatch) => {
   const module = pix2wavModule.name
   util.allProgress([
     datasetLoader.load(module),
-    actions.socket.list_directory({ module, dir: 'sequences/pix2wav/' }),
-    actions.socket.list_directory({ module, dir: 'datasets/pix2wav/' }),
-    actions.socket.list_directory({ module, dir: 'checkpoints/pix2wav/' }),
+    actions.socket.list_directory({ module: 'pix2pix', dir: 'sequences/pix2wav/' }),
+    actions.socket.list_directory({ module: 'pix2pix', dir: 'datasets/pix2wav/' }),
+    actions.socket.list_directory({ module: 'pix2pix', dir: 'checkpoints/pix2wav/' }),
+    actions.socket.list_directory({ module: 'pix2pix', dir: 'checkpoints/pix2pix/' }),
     // actions.socket.list_directory({ module, dir: 'datasets' }),
     // actions.socket.list_directory({ module, dir: 'results' }),
     // actions.socket.list_directory({ module, dir: 'output' }),
     // actions.socket.disk_usage({ module, dir: 'datasets' }),
   ], (percent, i, n) => {
+    console.log('progress', i, n)
     dispatch({ type: types.app.load_progress, progress: { i, n }})
   }).then(res => {
-    const [datasetApiReport, sequences, datasets, checkpoints] = res
+    const [datasetApiReport, sequences, datasets, checkpoints, pix2pixCheckpoints] = res
     const {
       folderLookup,
       fileLookup,
@@ -50,8 +52,20 @@ export const load_directories = (id) => (dispatch) => {
     checkpointDirectories.forEach(dir => {
       const dataset = datasetLoader.getDataset(module, datasetLookup, dir.name)
       dataset.hasCheckpoints = true
+      dir.module = 'pix2wav'
     })
 
+    const pix2pixCheckpointDirectories = pix2pixCheckpoints.filter(s => s.dir)
+    pix2pixCheckpointDirectories.forEach(dir => {
+      const dataset = datasetLoader.getDataset(module, datasetLookup, dir.name)
+      dataset.hasCheckpoints = true
+      dir.module = 'pix2pix'
+    })
+
+    console.log(res)
+    console.log(checkpointDirectories)
+    console.log(pix2pixCheckpointDirectories)
+
     dispatch({
       type: types.dataset.load,
       data: {
@@ -62,7 +76,7 @@ export const load_directories = (id) => (dispatch) => {
         folders, files,
         sequences: sequenceDirectories,
         datasets,
-        checkpoints: checkpointDirectories,
+        checkpoints: checkpointDirectories.concat(pix2pixCheckpointDirectories),
       },
     })
 
diff --git a/app/client/modules/pix2wav/views/pix2wav.live.js b/app/client/modules/pix2wav/views/pix2wav.live.js
index 2902bff..9a61e60 100644
--- a/app/client/modules/pix2wav/views/pix2wav.live.js
+++ b/app/client/modules/pix2wav/views/pix2wav.live.js
@@ -28,6 +28,7 @@ class Pix2WavLive extends Component {
   }
   componentWillUpdate(nextProps) {
     if (nextProps.opt.checkpoint_name && nextProps.opt.checkpoint_name !== this.props.opt.checkpoint_name) {
+      console.log('fetch checkpoint', nextProps.opt.checkpoint_name)
       this.props.actions.live.list_epochs('pix2wav', nextProps.opt.checkpoint_name)
     }
   }
@@ -47,8 +48,9 @@ class Pix2WavLive extends Component {
   }
   start(){
     // console.log(this.props)
-    const sequence = this.props.pix2wav.data.sequences[0].name
-    const checkpoint = this.props.pix2wav.data.checkpoints[0].name
+    console.log(this.props.pix2wav.data)
+    const sequence = this.props.pix2wav.data.sequences[0].name || ''
+    const checkpoint = this.props.pix2wav.data.checkpoints[0].name || ''
     console.log('starting up!', sequence, checkpoint)
     this.props.actions.tasks.live_task(sequence, checkpoint)
   }
@@ -75,6 +77,8 @@ class Pix2WavLive extends Component {
     if (this.props.pix2wav.loading) {
       return <Loading />
     }
+    // console.log('sequence', this.props.opt)
+    console.log(this.props.pix2wav.data.checkpoints)
     return (
       <div className='app centered'>
         <Player width={424} height={256} />
@@ -255,7 +259,7 @@ class Pix2WavLive extends Component {
         >Start</Button>
       )
     }
-    if (this.props.runner.gpu.task.module !== 'pix2wav') {
+    if (this.props.runner.gpu.task.module !== 'pix2pix' && this.props.runner.gpu.task.module !== 'pix2wav') {
       return (
         <Button
           title={'GPU Busy'}
diff --git a/app/relay/modules/pix2pix.js b/app/relay/modules/pix2pix.js
index bb4226b..848c859 100644
--- a/app/relay/modules/pix2pix.js
+++ b/app/relay/modules/pix2pix.js
@@ -97,6 +97,7 @@ const live = {
       '--experiment', task.checkpoint,
       '--name', task.checkpoint,
       '--module-name', task.module,
+      '--sequence-name', task.dataset,
       '--recursive', '--recursive-frac', 0.1,
       '--sequence', '--sequence-frac', 0.3,
       '--process-frac', 0.5,
diff --git a/app/relay/runner.js b/app/relay/runner.js
index c0a3b56..3ad73a2 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -356,6 +356,6 @@ export function terminate(processor){
     return
   }
   console.log('kill pid', processor.subprocess.pid)
-  processor.task.preempted = true
+  processor.task.cancelled = true
 	kill(processor.subprocess.pid)
 }
\ No newline at end of file