diff options
| -rw-r--r-- | app/client/common/fileList.component.js | 2 | ||||
| -rw-r--r-- | app/client/modules/pix2pix/pix2pix.tasks.js | 30 | ||||
| -rw-r--r-- | app/client/modules/pix2pix/views/pix2pix.live.js | 2 | ||||
| -rw-r--r-- | app/client/modules/samplernn/views/samplernn.show.js | 4 | ||||
| -rw-r--r-- | app/client/socket/socket.live.js | 4 | ||||
| -rw-r--r-- | app/relay/modules/pix2pix.js | 29 |
6 files changed, 37 insertions, 34 deletions
diff --git a/app/client/common/fileList.component.js b/app/client/common/fileList.component.js index 0dd22ea..8949eed 100644 --- a/app/client/common/fileList.component.js +++ b/app/client/common/fileList.component.js @@ -41,7 +41,7 @@ export const FileList = props => { </div> ) } - console.log(files) + // console.log(files) return ( <div className={'rows ' + className}> {title && diff --git a/app/client/modules/pix2pix/pix2pix.tasks.js b/app/client/modules/pix2pix/pix2pix.tasks.js index 81f3dd8..c4b79fb 100644 --- a/app/client/modules/pix2pix/pix2pix.tasks.js +++ b/app/client/modules/pix2pix/pix2pix.tasks.js @@ -35,22 +35,20 @@ export const live_task = (sequence, checkpoint) => dispatch => { return actions.queue.add_task(task) } -// export const train_task = (dataset, folder_id, epochs=1) => dispatch => { -// const task = { -// module: 'samplernn', -// activity: 'train', -// dataset: dataset.name, -// epochs: epochs, -// opt: { -// folder_id: folder_id, -// sample_length: 44100 * 5, -// n_samples: 6, -// keep_old_checkpoints: false, -// } -// } -// console.log(task) -// return actions.queue.add_task(task) -// } +export const train_task = (dataset, folder_id, epochs=1) => dispatch => { + const task = { + module: 'pix2pix', + activity: 'train', + dataset: dataset.name, + epochs: epochs, + opt: { + folder_id: folder_id, + load_size: 264, // switch to 256 for pix2wav + } + } + console.log(task) + return actions.queue.add_task(task) +} // export const log_task = (dataset) => dispatch => { // const task = { // module: 'samplernn', diff --git a/app/client/modules/pix2pix/views/pix2pix.live.js b/app/client/modules/pix2pix/views/pix2pix.live.js index be19d15..8c32d0c 100644 --- a/app/client/modules/pix2pix/views/pix2pix.live.js +++ b/app/client/modules/pix2pix/views/pix2pix.live.js @@ -121,7 +121,7 @@ class Pix2PixLive extends Component { /> <Slider live name='frame_delay' - min={0.1} max={5.0} type='float' + min={0.05} max={2.0} type='float' /> {this.renderRestartButton()} <Button diff --git a/app/client/modules/samplernn/views/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js index f2b23fd..8ea37f6 100644 --- a/app/client/modules/samplernn/views/samplernn.show.js +++ b/app/client/modules/samplernn/views/samplernn.show.js @@ -29,7 +29,7 @@ class SampleRNNShow extends Component { if (id) { if (parseInt(id)) localStorage.setItem('samplernn.last_id', id) if (! samplernn.folder || samplernn.folder.id !== id) { - console.log('looooooooooad', id) + // console.log('looooooooooad', id) actions.load_directories(id) } } else { @@ -39,7 +39,7 @@ class SampleRNNShow extends Component { render(){ const { samplernn, runner, match, history } = this.props const { folderLookup } = (samplernn.data || {}) - console.log(runner) + // console.log(runner) const folder = (folderLookup || {})[samplernn.folder_id] || {} return ( <div className='app samplernn'> diff --git a/app/client/socket/socket.live.js b/app/client/socket/socket.live.js index 3780ba6..fc53eb3 100644 --- a/app/client/socket/socket.live.js +++ b/app/client/socket/socket.live.js @@ -15,11 +15,11 @@ socket.on('res', (data) => { } break case 'get_params': - dispatch({ + data.res && dispatch({ type: types.socket.load_params, opt: data.res, }) - player.toggleFPS(data.res.processing) + data.res && player.toggleFPS(data.res.processing) break case 'list_checkpoints': dispatch({ diff --git a/app/relay/modules/pix2pix.js b/app/relay/modules/pix2pix.js index d580a26..d6a4161 100644 --- a/app/relay/modules/pix2pix.js +++ b/app/relay/modules/pix2pix.js @@ -28,16 +28,17 @@ const fetch = { return { type: 'progress', action: 'resolve_dataset', task, } } return null - } + }, + after: 'make_folds', } const make_folds = { - type: 'pytorch', - script: 'datasets/combine_A_and_B.py', + type: 'perl', + script: 'scripts/builders/pair-dataset-link.pl', params: (task) => { return [ - '--fold_A', task.module + '/a_b/' + task.dataset + '/A', - '--fold_B', task.module + '/a_b/' + task.dataset + '/B', - '--fold_AB', task.module + '/datasets/' + task.dataset, + '--sequence_dir', path.join(cwd, 'sequences', task.module, task.dataset), + '--ab_dir', path.join(cwd, 'a_b', task.module, task.dataset), + '--dt', task.opt.dt || 1, ] }, after: 'combine_folds', @@ -47,9 +48,9 @@ const combine_folds = { script: 'datasets/combine_A_and_B.py', params: (task) => { return [ - '--fold_A', task.module + '/a_b/' + task.dataset + '/A', - '--fold_B', task.module + '/a_b/' + task.dataset + '/B', - '--fold_AB', task.module + '/datasets/' + task.dataset, + '--fold_A', path.join(cwd, 'a_b', task.module, task.dataset, 'A'), + '--fold_B', path.join(cwd, 'a_b', task.module, task.dataset, 'B'), + '--fold_AB', path.join(cwd, 'datasets', task.module, task.dataset), ] } } @@ -58,10 +59,10 @@ const train = { script: 'train.py', params: (task) => { return [ - '--dataroot', path.join(cwd, 'datasets', task.dataset), + '--dataroot', path.join(cwd, 'datasets', task.module, task.dataset), '--name', task.dataset, '--model', 'pix2pix', - '--loadSize', opt.load_size || 264, + '--loadSize', task.opt.load_size || 264, '--fineSize', 256, '--which_model_netG', 'unet_256', '--which_direction', 'AtoB', @@ -132,6 +133,10 @@ const live = { export default { name, cwd, activities: { - fetch, make_folds, combine_folds, train, generate, live, + fetch, + make_folds, combine_folds, + train, + generate, + live, } } |