diff options
| -rw-r--r-- | app/relay/interpreters.js | 7 | ||||
| -rw-r--r-- | app/relay/modules/morph.js | 19 |
2 files changed, 19 insertions, 7 deletions
diff --git a/app/relay/interpreters.js b/app/relay/interpreters.js index 4671988..2cc8622 100644 --- a/app/relay/interpreters.js +++ b/app/relay/interpreters.js @@ -19,7 +19,7 @@ export default { params: ['-u'], gpu: true, }, - pytorch_cpu: { + pytorch_cpu: { // "cpu" pytorch tasks can use the gpu, but not intensively cmd: process.env.PYTORCH_BIN, params: ['-u'], gpu: false, @@ -29,4 +29,9 @@ export default { params: ['-u'], gpu: true, }, + tensorflow_cpu: { + cmd: process.env.TENSORFLOW_BIN, + params: ['-u'], + gpu: false, + }, }
\ No newline at end of file diff --git a/app/relay/modules/morph.js b/app/relay/modules/morph.js index 5523bb3..8625b70 100644 --- a/app/relay/modules/morph.js +++ b/app/relay/modules/morph.js @@ -5,20 +5,27 @@ const name = 'morph' const cwd = process.env.MORPH_CWD || path.join(process.cwd(), '..', 'pytorch-sepconv') const morph = { - type: 'pytorch', - script: 'test.pl', + type: 'pytorch_cpu', + script: 'run.py', params: (task) => { + console.log(task) let params = [ '--dataset', task.opt.a, - '--first', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.a), - '--second', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.b), - '--a-offset', task.opt.a_offset, - '--b-offset', task.opt.b_offset, '--steps', task.opt.steps, '--dilate', task.opt.dilate, '--video-out', ['morph', task.opt.mode, task.opt.dataset, moment().format('%YYYY%MM%DD_%hh%mm')].join('_') + '.mp4', '--endpoint', process.env.API_REMOTE + '/api/folder/' + task.folder_id + '/upload/', ] + if (task.opt.mode === 'image') { + // + } else { + params = params.concat([ + '--first', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.a), + '--second', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.b), + '--a-offset', task.opt.a_offset, + '--b-offset', task.opt.b_offset, + ]) + } if (task.opt.mode === 'average') { params.push('--average-videos') params.push('True') |