From 2d68eebcc1cfdcbf0a0b4fc64d13036157f4468e Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 5 Jun 2018 02:17:25 +0200
Subject: woop seems to be working

---
 app/client/modules/samplernn/samplernn.results.js | 29 -----------------------
 app/client/modules/samplernn/samplernn.tasks.js   |  8 +++++++
 app/relay/runner.js                               | 12 ++++++++--
 3 files changed, 18 insertions(+), 31 deletions(-)

(limited to 'app')

diff --git a/app/client/modules/samplernn/samplernn.results.js b/app/client/modules/samplernn/samplernn.results.js
index 090ab21..d12e856 100644
--- a/app/client/modules/samplernn/samplernn.results.js
+++ b/app/client/modules/samplernn/samplernn.results.js
@@ -13,37 +13,8 @@ import { FileList, FileRow } from '../../common/fileList.component'
 class SampleRNNResults extends Component {
   constructor(props){
     super()
-    this.fileOptions = this.fileOptions.bind(this)
-    this.pickFile = this.pickFile.bind(this)
-    let id = props.match.params.id || localStorage.getItem('samplernn.last_id')
     if (!props.samplernn.data) props.actions.load_directories()
   }
-  pickFile(file){
-    console.log('pick', file)
-  }
-  fileOptions(file){
-    if (file.activity === 'url' && !file.dataset) {
-      if (this.props.runner.cpu.status !== 'IDLE') {
-        return (
-          <div className='gray'>
-            fetching...
-          </div>
-        )
-      } else {
-        return (
-          <div className='link' onClick={() => this.fetchURL(file.url)}>
-            fetch
-          </div>
-        )
-      }
-    }
-    return (
-      <div>
-        <div className='link' onClick={() => this.train(file)}>train</div>
-        {file.epoch == 0 && <div className='epochs'>{file.epochs} ep.</div>}
-      </div>
-    )
-  }
   render(){
     if (this.props.samplernn.loading) return <Loading progress={this.props.samplernn.progress} />
     const { folderLookup, fileLookup, datasetLookup } = this.props.samplernn.data
diff --git a/app/client/modules/samplernn/samplernn.tasks.js b/app/client/modules/samplernn/samplernn.tasks.js
index fa41fe8..ca61ba7 100644
--- a/app/client/modules/samplernn/samplernn.tasks.js
+++ b/app/client/modules/samplernn/samplernn.tasks.js
@@ -27,6 +27,14 @@ export const fetch_task = (dataset) => dispatch => {
   }
   return actions.queue.add_task(task)
 }
+export const log_task = (dataset) => dispatch => {
+  const task = {
+    module: 'samplernn',
+    activity: 'log',
+    dataset: dataset,
+  }
+  return actions.queue.add_task(task)
+}
 export const clear_cache_task = (dataset) => dispatch => {
   const task = {
     module: 'samplernn',
diff --git a/app/relay/runner.js b/app/relay/runner.js
index 1041a94..019f25c 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -184,19 +184,27 @@ export function run_script(task, cb) {
   }, cb)
 }
 
+export function get_processor(task){
+  if (! task) return null
+  const module = modules[task.module]
+  if (! module) return null
+  const activity = module.activities[task.activity]
+  if (! activity) return null
+  const interpreter = interpreters[activity.type]
+  return interpreter.gpu ? 'gpu' : 'cpu'
+}
+
 export function run_task(task, preempt=false, watch=false){
   if (! task) return null
 	const module = modules[task.module]
 	if (! module) return { type: 'error', error: "No such module: " + task.module }
   const activity = module.activities[task.activity]
-console.log(task)
   if (! activity) return { type: 'error', error: 'No such activity in module: ' + task.module + ' ' + task.activity }
   return run_task_with_activity(task, module, activity, preempt, watch)
 }
 
 export function run_task_with_activity(task, module, activity, preempt=false, watch=false) {
 	const { interpreter, params } = build_params(module, activity, task)
-console.log(activity)
   if (! interpreter) return { type: 'error', error: "No such interpreter: " + activity.interpreter }
 
   if (interpreter.gpu && state.current_gpu_task.status !== 'IDLE') {
-- 
cgit v1.2.3-70-g09d2