From a450fa75edb927b7568b8a3198f9209c6a4c7f79 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 3 Jun 2018 14:46:18 +0200
Subject: adjusting the form, calling samplernn tasks

---
 app/client/modules/samplernn/samplernn.actions.js  | 15 ++++++++
 app/client/modules/samplernn/samplernn.datasets.js | 45 ++++++++++++++--------
 app/client/modules/samplernn/samplernn.results.js  | 19 ++++-----
 3 files changed, 52 insertions(+), 27 deletions(-)

(limited to 'app/client/modules/samplernn')

diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index e8f8251..25c9699 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -179,3 +179,18 @@ export const fetch_url = (url) => (dispatch) => {
     opt: { url }
   }, { preempt: true, watch: true })
 }
+
+export const train_task_now = (dataset) => (dispatch) => {
+  const task = {
+    module: 'samplernn',
+    activity: 'train',
+    dataset: dataset,
+    epochs: 6,
+    opt: {
+      sample_length: 44100 * 5,
+      n_samples: 6,
+      keep_old_checkpoints: false,
+    }
+  }
+  return actions.queue.start_task(task)
+}
\ No newline at end of file
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index f5f4a1d..dafed79 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -52,7 +52,35 @@ class SampleRNNDatasets extends Component {
   render(){
     const { samplernn } = this.props
     const folder = samplernn.folder
-    if (!folder.name) return
+    if (!folder || !folder.name) return
+    return (
+      <div className='app'>
+        <div class='heading'>
+          <h1>{folder.name}</h1>
+        </div>
+        {folder.name !== 'unsorted' &&
+          <DatasetForm title='Add Files' folder={folder} canUpload canAddURL />
+        }
+        {this.renderDataset()}
+      </div>
+    )
+  }
+  renderDataset(){
+    return (
+      <div class='rows params datasets'>
+        <div class='row dataset'>
+          <div class='col'>input</div>
+          <div class='col'></div>
+          <div class='col'>checkpoint</div>
+          <div class='col'>output</div>
+        </div>
+        {this.renderGroups()}
+      </div>
+    )
+  }
+  renderGroups(){
+    const { samplernn } = this.props
+    const folder = samplernn.folder
     const { mapFn, sortFn } = util.sort.orderByFn('date desc')
     const datasets = folder.datasets.map(mapFn).sort(sortFn).map(pair => {
       const dataset = pair[1]
@@ -92,20 +120,7 @@ class SampleRNNDatasets extends Component {
         </div>
       )
     })
-    return (
-      <div className='app'>
-        <DatasetForm folder={folder} canRename canUpload canAddURL />
-        <div class='rows params datasets'>
-          <div class='row dataset'>
-            <div class='col'>input</div>
-            <div class='col'></div>
-            <div class='col'>checkpoint</div>
-            <div class='col'>output</div>
-          </div>
-          {datasets}
-        </div>
-      </div>
-    )
+    return datasets
   }
 }
 
diff --git a/app/client/modules/samplernn/samplernn.results.js b/app/client/modules/samplernn/samplernn.results.js
index 06092fb..b689106 100644
--- a/app/client/modules/samplernn/samplernn.results.js
+++ b/app/client/modules/samplernn/samplernn.results.js
@@ -43,15 +43,12 @@ class SampleRNNResults extends Component {
   }
   render(){
     if (this.props.samplernn.loading) return <span>Loading</span>
-      console.log(this.props.samplernn.data)
     const { folderLookup } = this.props.samplernn.data
     // const { folderLookup } = samplernn
-    console.log(this.props)
 
     const renders = Object.keys(folderLookup).sort(util.sort.stringSort.asc).map(key => {
       const folder = folderLookup[key]
       let { mapFn, sortFn } = util.sort.orderByFn('epoch desc')
-      console.log(mapFn, sortFn)
       const datasetPairs = folder.datasets.map(mapFn).sort(sortFn)
       const bestRenders = datasetPairs
         .map(pair => pair[1])
@@ -60,17 +57,15 @@ class SampleRNNResults extends Component {
           const { output } = dataset
           return output.map(mapFn).sort(sortFn)[0][1]
         })
-      console.log(bestRenders.map(r => r.epoch))
+      // console.log(bestRenders.map(r => r.epoch))
       return (
         <div className='col'>
-          <h3>{key}</h3>
-          {!!bestRenders.length &&
-            <FileList
-              files={bestRenders}
-              orderBy='date desc'
-              fields={'name date epoch size'}
-            />
-          }
+          <h3>{folder.name}</h3>
+          <FileList
+            files={bestRenders}
+            orderBy='date desc'
+            fields={'name date epoch size'}
+          />
         </div>
       )
     })
-- 
cgit v1.2.3-70-g09d2