From 986adcb3fa79ab32af8c43f098489467d783d18b Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Fri, 8 Jun 2018 00:57:05 +0200
Subject: must be string

---
 app/client/common/index.js                         |  2 ++
 app/client/modules/samplernn/samplernn.tasks.js    |  2 +-
 .../modules/samplernn/views/samplernn.show.js      | 22 +++++++++++++---------
 app/client/system/system.reducer.js                | 14 ++++++++++++++
 app/relay/modules/samplernn.js                     |  4 ++--
 5 files changed, 32 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/client/common/index.js b/app/client/common/index.js
index 471bdd3..6db1184 100644
--- a/app/client/common/index.js
+++ b/app/client/common/index.js
@@ -1,4 +1,5 @@
 import Button from './button.component'
+import CurrentTask from './currentTask.component'
 import { FileList, FileRow } from './fileList.component'
 import FileUpload from './fileUpload.component'
 import FolderList from './folderList.component'
@@ -22,4 +23,5 @@ export {
   Gallery, Player,
   Group, ParamGroup, Param,
   TextInput, Slider, Select, Button,
+  CurrentTask,
 }
\ No newline at end of file
diff --git a/app/client/modules/samplernn/samplernn.tasks.js b/app/client/modules/samplernn/samplernn.tasks.js
index f253047..ee26347 100644
--- a/app/client/modules/samplernn/samplernn.tasks.js
+++ b/app/client/modules/samplernn/samplernn.tasks.js
@@ -10,7 +10,7 @@ export const train_task = (dataset, folder_id, epochs=1) => dispatch => {
     module: 'samplernn',
     activity: 'train',
     dataset: dataset.name,
-    epoch: dataset.checkpoints.length ? dataset.checkpoints[0].epoch || 0 : 0
+    epoch: dataset.checkpoints.length ? dataset.checkpoints[0].epoch || 0 : 0,
     epochs: epochs,
     opt: {
       folder_id: folder_id,
diff --git a/app/client/modules/samplernn/views/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js
index e74de4f..45235b1 100644
--- a/app/client/modules/samplernn/views/samplernn.show.js
+++ b/app/client/modules/samplernn/views/samplernn.show.js
@@ -7,11 +7,10 @@ import * as samplernnActions from '../samplernn.actions'
 import * as samplernnTasks from '../samplernn.tasks'
 import * as audioPlayerActions from '../../../common/audioPlayer/audioPlayer.actions'
 
-import Loading from '../../../common/loading.component'
+import { Loading, CurrentTask, FileList, FileRow } from '../../../common'
+
 import DatasetForm from '../../../dataset/dataset.form'
-import NewDatasetForm from '../../../dataset/dataset.new'
 import UploadStatus from '../../../dataset/upload.status'
-import { FileList, FileRow } from '../../../common/fileList.component'
 
 import DatasetComponent from '../../../dataset/dataset.component'
 
@@ -38,17 +37,16 @@ class SampleRNNShow extends Component {
     }
   }
   render(){
-    const { samplernn, match, history } = this.props
+    const { samplernn, runner, match, history } = this.props
     const { folderLookup } = (samplernn.data || {})
+    console.log(runner)
     const folder = (folderLookup || {})[samplernn.folder_id] || {}
     return (
       <div className='app samplernn'>
-        <div class='heading'>
-          <div class='spaced'>
-            <h1>{folder ? folder.name : <Loading />}</h1>
-            <UploadStatus />
-          </div>
+        <div className='heading'>
+          <h1>{folder ? folder.name : <Loading />}</h1>
         </div>
+        <div className='row'>
         {folder && folder.name && folder.name !== 'unsorted' &&
           <DatasetForm
             title='Add Files'
@@ -57,6 +55,11 @@ class SampleRNNShow extends Component {
             canUpload canAddURL
           />
         }
+          <div>
+            <UploadStatus />
+            <CurrentTask processor='gpu' />
+          </div>
+        </div>
         <DatasetComponent
           loading={samplernn.loading}
           progress={samplernn.progress}
@@ -114,6 +117,7 @@ class SampleRNNShow extends Component {
 
 const mapStateToProps = state => ({
   samplernn: state.module.samplernn,
+  runner: state.system.runner,
 })
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
diff --git a/app/client/system/system.reducer.js b/app/client/system/system.reducer.js
index 8585bba..cc87128 100644
--- a/app/client/system/system.reducer.js
+++ b/app/client/system/system.reducer.js
@@ -216,6 +216,19 @@ const systemReducer = (state = systemInitialState, action) => {
         }
       }
     case types.system.stdout:
+      if (action.data.processor && state.runner[action.data.processor]) {
+        return {
+          ...state,
+          runner: {
+            ...state.runner,
+            [action.data.processor]: {
+              ...state.runner[action.data.processor],
+              last_message: action.data.data,
+            }
+          },
+          stdout: state.stdout + action.data.data,
+        }
+      }
       return {
         ...state,
         stdout: state.stdout + action.data.data,
@@ -223,6 +236,7 @@ const systemReducer = (state = systemInitialState, action) => {
     case types.system.stderr:
       return {
         ...state,
+        last_message: action.data.data,
         stderr: state.stderr + action.data.data,
       }
     default:
diff --git a/app/relay/modules/samplernn.js b/app/relay/modules/samplernn.js
index 668ab24..559ca66 100644
--- a/app/relay/modules/samplernn.js
+++ b/app/relay/modules/samplernn.js
@@ -49,7 +49,7 @@ const train = {
     }
     return null
   }
-  after: publish,
+  after: 'publish',
 }
 const generate = {
   type: 'pytorch',
@@ -65,7 +65,7 @@ const generate = {
       '--keep_old_checkpoints', task.opt.keep_old_checkpoints ? 'True' : 'False',
     ]
   },
-  after: publish,
+  after: 'publish',
 }
 const publish = {
   type: 'perl',
-- 
cgit v1.2.3-70-g09d2