diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/client/common/index.js | 3 | ||||
| -rw-r--r-- | app/client/common/numberInput.component.js | 2 | ||||
| -rw-r--r-- | app/client/common/taskList.component.js (renamed from app/client/dashboard/tasklist.component.js) | 28 | ||||
| -rw-r--r-- | app/client/dashboard/dashboard.component.js | 4 | ||||
| -rw-r--r-- | app/client/modules/pix2pixhd/pix2pixhd.tasks.js | 6 | ||||
| -rw-r--r-- | app/client/modules/pix2pixhd/views/pix2pixhd.train.js | 19 |
6 files changed, 39 insertions, 23 deletions
diff --git a/app/client/common/index.js b/app/client/common/index.js index eeb8bfc..13b3189 100644 --- a/app/client/common/index.js +++ b/app/client/common/index.js @@ -17,6 +17,7 @@ import Select from './select.component' import SelectGroup from './selectGroup.component' import Slider from './slider.component' import TextInput from './textInput.component' +import TaskList from './taskList.component' import * as Views from './views' export { @@ -27,5 +28,5 @@ export { Group, ParamGroup, Param, TextInput, NumberInput, Slider, Select, SelectGroup, Button, Checkbox, - CurrentTask, + CurrentTask, TaskList, }
\ No newline at end of file diff --git a/app/client/common/numberInput.component.js b/app/client/common/numberInput.component.js index 43f9878..53fbf45 100644 --- a/app/client/common/numberInput.component.js +++ b/app/client/common/numberInput.component.js @@ -13,7 +13,7 @@ class NumberInput extends Component { changed: true, }) this.props.onInput && this.props.onInput(e.target.value, e.target.name) - this.props.onChange && this.props.onInput(e.target.name, e.target.value) + this.props.onChange && this.props.onChange(e.target.name, e.target.value) } handleKeydown(e){ if (e.keyCode === 13) { diff --git a/app/client/dashboard/tasklist.component.js b/app/client/common/taskList.component.js index 3de6efe..f6383e0 100644 --- a/app/client/dashboard/tasklist.component.js +++ b/app/client/common/taskList.component.js @@ -13,8 +13,8 @@ class TaskList extends Component { render(){ const { title, tasks } = this.props let time = 0 - const { mapFn, sortFn } = util.sort.orderByFn('date desc') - const taskList = tasks.map(mapFn).sort(sortFn).map(pair => { + const { mapFn, sortFn } = util.sort.orderByFn(this.props.sort || 'date desc') + const taskList = tasks.map(mapFn).sort(sortFn).map(pair => { const task = pair[1] const { dataset } = task let dataset_link; @@ -26,22 +26,22 @@ class TaskList extends Component { } else { dataset_link = dataset } - return ( - <div class='row'> - <div class='activity'>{task.activity} {task.module}</div> - <div class='dataset'>{dataset_link}</div> + return ( + <div class='row'> + <div class='activity'>{task.activity} {task.module}</div> + <div class='dataset'>{dataset_link}</div> <div className={"age " + util.carbon_date(task.updated_at)}>{util.get_age(task.updated_at)}</div> <div class='options'> <span class='destroy' onClick={() => this.handleDestroy(task)}>x</span> </div> - </div> - ) - }) - return ( - <div class='tasklist rows'> - {taskList} - </div> - ) + </div> + ) + }) + return ( + <div class='tasklist rows'> + {taskList} + </div> + ) } handleDestroy(task) { const yes = confirm('Are you sure you want to delete this task?') diff --git a/app/client/dashboard/dashboard.component.js b/app/client/dashboard/dashboard.component.js index 0c15f99..cbfdd33 100644 --- a/app/client/dashboard/dashboard.component.js +++ b/app/client/dashboard/dashboard.component.js @@ -10,9 +10,7 @@ import Select from '../common/select.component' import Button from '../common/button.component' import DashboardHeader from './dashboardheader.component' -import TaskList from './tasklist.component' -import { Loading, FolderList, FileList } from '../common' -import Gallery from '../common/gallery.component' +import { Loading, FolderList, FileList, TaskList, Gallery } from '../common' import * as dashboardActions from './dashboard.actions' import * as audioPlayerActions from '../common/audioPlayer/audioPlayer.actions' diff --git a/app/client/modules/pix2pixhd/pix2pixhd.tasks.js b/app/client/modules/pix2pixhd/pix2pixhd.tasks.js index bd51f2b..412f066 100644 --- a/app/client/modules/pix2pixhd/pix2pixhd.tasks.js +++ b/app/client/modules/pix2pixhd/pix2pixhd.tasks.js @@ -26,13 +26,17 @@ export const train_task = (dataset, folder_id, epochs=1) => dispatch => { const task = { module: module.name, activity: 'train', - dataset: dataset.name, + dataset: dataset.name || dataset, epoch: 0, epochs: epochs, opt: { folder_id: folder_id, } } + if (!task.dataset) { + console.error("train task: no dataset specified") + return + } console.log(task) return actions.queue.add_task(task) } diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js index ace93e4..b029eab 100644 --- a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js +++ b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js @@ -64,6 +64,10 @@ class Pix2PixHDTrain extends Component { console.log('name', name, 'value', value) this.setState({ [name]: value }) } + interrupt(){ + this.props.actions.queue.stop_task('gpu') + } + render(){ if (this.props.pix2pixhd.loading) { return <Loading progress={this.props.pix2pixhd.progress} /> @@ -89,9 +93,9 @@ class Pix2PixHDTrain extends Component { } }).filter(n => !!n && !!n.options.length).sort((a,b) => a.name.localeCompare(b.name)) - console.log('state', this.props.pix2pixhd.data.epochs) + // console.log('state', this.props.pix2pixhd.data.epochs) // console.log(this.state.checkpoint_name, this.state.epoch) - + console.log(queue) return ( <div className='app pix2pixhd'> <div class='heading'> @@ -160,12 +164,20 @@ class Pix2PixHDTrain extends Component { onClick={() => this.props.remote.clear_recursive_task(this.state.checkpoint_name)} /> </Group> + + <Group title='Status'> + <Button + title="GPU" + value={this.props.runner.gpu.status === 'IDLE' ? "Idle" : "Interrupt"} + onClick={() => this.interrupt()} + /> + </Group> </div> <div> <CurrentTask /> {!!queue.queue.length && <Group title='Upcoming Tasks'> - <TaskList tasks={queue.queue.map(id => queue.tasks[id])} /> + <TaskList tasks={queue.queue.map(id => queue.tasks[id])} sort="date asc" /> </Group> } </div> @@ -176,6 +188,7 @@ class Pix2PixHDTrain extends Component { const mapStateToProps = state => ({ pix2pixhd: state.module.pix2pixhd, + runner: state.system.runner, queue: state.queue, }) |