summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/client/common/taskList.component.js35
-rw-r--r--app/client/common/textInput.component.js1
-rw-r--r--app/client/modules/pix2pixhd/views/pix2pixhd.train.js6
3 files changed, 36 insertions, 6 deletions
diff --git a/app/client/common/taskList.component.js b/app/client/common/taskList.component.js
index f6383e0..710753f 100644
--- a/app/client/common/taskList.component.js
+++ b/app/client/common/taskList.component.js
@@ -10,6 +10,15 @@ class TaskList extends Component {
constructor(props){
super()
}
+ shouldComponentUpdate(nextProps){
+ if (nextProps.tasks.length !== this.props.tasks.length) {
+ return true
+ }
+ if (nextProps.tasks[0] !== this.props.tasks[0]) {
+ return true
+ }
+ return false
+ }
render(){
const { title, tasks } = this.props
let time = 0
@@ -17,14 +26,34 @@ class TaskList extends Component {
const taskList = tasks.map(mapFn).sort(sortFn).map(pair => {
const task = pair[1]
const { dataset } = task
- let dataset_link;
+ let dataset_link, label = dataset;
+ console.log(task)
+ switch (task.activity) {
+ case 'train':
+ if (task.epoch === 0) {
+ label += ', latest'
+ } else {
+ label += ', ' + task.epoch
+ }
+ label += ' + ' + task.epochs
+ break
+ case 'augment':
+ try {
+ const opt = JSON.parse(task.opt)
+ label += ', ' + opt.augment_take + ' x ' + opt.augment_make
+ } catch (e) {
+ //
+ }
+ default:
+ break
+ }
if (task.folder_id) {
const href = '/' + task.module +
'/' + (task.module === 'samplernn' ? 'datasets' : 'sequences') +
'/' + task.folder_id + '/'
- dataset_link = <Link to={href}>{dataset}</Link>
+ dataset_link = <Link to={href}>{label}</Link>
} else {
- dataset_link = dataset
+ dataset_link = label
}
return (
<div class='row'>
diff --git a/app/client/common/textInput.component.js b/app/client/common/textInput.component.js
index 44e1349..d429944 100644
--- a/app/client/common/textInput.component.js
+++ b/app/client/common/textInput.component.js
@@ -36,6 +36,7 @@ class TextInput extends Component {
onKeydown={this.handleKeydown}
placeholder={this.props.placeholder}
autofocus={this.props.autofocus}
+ className={this.props.className || ''}
/>
</label>
</div>
diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
index b029eab..4399a60 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
@@ -141,6 +141,7 @@ class Pix2PixHDTrain extends Component {
title="Tag this epoch"
value={this.state.augment_name}
onChange={this.handleChange}
+ className='small'
/>
<Button
title="Augment dataset"
@@ -171,10 +172,9 @@ class Pix2PixHDTrain extends Component {
value={this.props.runner.gpu.status === 'IDLE' ? "Idle" : "Interrupt"}
onClick={() => this.interrupt()}
/>
+ <CurrentTask />
</Group>
- </div>
- <div>
- <CurrentTask />
+
{!!queue.queue.length &&
<Group title='Upcoming Tasks'>
<TaskList tasks={queue.queue.map(id => queue.tasks[id])} sort="date asc" />