train dataroot

1 files changed, 63 insertions, 39 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 3d50d97..595a2c4 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -5191,18 +5191,18 @@ var set_param = exports.set_param = function set_param(key, value) {
   return { type: _types2.default.player.set_param, key: key, value: value };
 };
 
-var list_checkpoints = exports.list_checkpoints = function list_checkpoints() {
-  _socket2.default.live.list_checkpoints();
+var list_checkpoints = exports.list_checkpoints = function list_checkpoints(module) {
+  _socket2.default.live.list_checkpoints(module);
   return { type: _types2.default.player.loading_checkpoints };
 };
 
-var list_epochs = exports.list_epochs = function list_epochs(path) {
-  _socket2.default.live.list_epochs(path);
+var list_epochs = exports.list_epochs = function list_epochs(module, checkpoint) {
+  _socket2.default.live.list_epochs(module, checkpoint);
   return { type: _types2.default.player.loading_epochs };
 };
 
-var list_sequences = exports.list_sequences = function list_sequences() {
-  _socket2.default.live.list_sequences();
+var list_sequences = exports.list_sequences = function list_sequences(module) {
+  _socket2.default.live.list_sequences(module);
   return { type: _types2.default.player.loading_sequences };
 };
 
@@ -5284,7 +5284,7 @@ var liveReducer = function liveReducer() {
   var results = void 0;
 
   switch (action.type) {
-    case _types2.default.player.load_params:
+    case _types2.default.socket.load_params:
       if (!action.opt || !Object.keys(action.opt).length) {
         return state;
       }
@@ -5299,13 +5299,13 @@ var liveReducer = function liveReducer() {
         opt: _extends({}, state.opt, _defineProperty({}, action.key, action.value))
       });
 
-    case _types2.default.player.list_checkpoints:
+    case _types2.default.socket.list_checkpoints:
       return _extends({}, state, {
         checkpoints: action.checkpoints,
         epochs: []
       });
 
-    case _types2.default.player.list_epochs:
+    case _types2.default.socket.list_epochs:
       return _extends({}, state, {
         epochs: (action.epochs || []).map(function (a) {
           return [a == 'latest' ? Infinity : a, a];
@@ -5316,7 +5316,7 @@ var liveReducer = function liveReducer() {
         })
       });
 
-    case _types2.default.player.list_sequences:
+    case _types2.default.socket.list_sequences:
       return _extends({}, state, {
         sequences: action.sequences
       });
@@ -6306,6 +6306,8 @@ var load_directories = exports.load_directories = function load_directories(id)
         dataset.hasCheckpoints = true;
       });
 
+      console.log(res);
+
       // flatDatasets.forEach(file => {
       //   file.uuid = uuidv1()
       //   fileLookup[file.uuid] = file
@@ -6496,16 +6498,16 @@ var _actions2 = _interopRequireDefault(_actions);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var live_task = exports.live_task = function live_task(dataset, checkpoint) {
-  var epochs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+var live_task = exports.live_task = function live_task(sequence, checkpoint) {
   return function (dispatch) {
     var task = {
       module: 'pix2pix',
       activity: 'live',
-      dataset: dataset.name,
+      dataset: sequence,
       checkpoint: checkpoint
     };
     console.log(task);
+    console.log('add live task');
     return _actions2.default.queue.add_task(task);
   };
 };
@@ -6617,8 +6619,8 @@ var Pix2PixLive = function (_Component) {
       props.pix2pixActions.load_directories();
     }
     props.actions.get_params();
-    // props.actions.list_checkpoints()
-    // props.actions.list_sequences()
+    props.actions.list_checkpoints('pix2pix');
+    props.actions.list_sequences('pix2pix');
     _this.changeCheckpoint = _this.changeCheckpoint.bind(_this);
     _this.changeEpoch = _this.changeEpoch.bind(_this);
     _this.changeSequence = _this.changeSequence.bind(_this);
@@ -6632,7 +6634,7 @@ var Pix2PixLive = function (_Component) {
     key: 'componentWillUpdate',
     value: function componentWillUpdate(nextProps) {
       if (nextProps.opt.checkpoint_name && nextProps.opt.checkpoint_name !== this.props.opt.checkpoint_name) {
-        this.props.actions.list_epochs(nextProps.opt.checkpoint_name);
+        this.props.actions.list_epochs('pix2pix', nextProps.opt.checkpoint_name);
       }
     }
   }, {
@@ -6660,16 +6662,24 @@ var Pix2PixLive = function (_Component) {
   }, {
     key: 'start',
     value: function start() {
-      // pix2pixTasks.live_task()
+      // console.log(this.props)
+      console.log('starting up!');
+      var sequence = this.props.pix2pix.data.sequences[0].name;
+      console.log(sequence);
+      var checkpoint = this.props.pix2pix.data.checkpoints[0].name;
+      console.log(checkpoint);
+      console.log(sequence, checkpoint);
+      this.props.pix2pixTasks.live_task(sequence, checkpoint);
     }
   }, {
-    key: 'kill',
-    value: function kill() {
+    key: 'interrupt',
+    value: function interrupt() {
       //
     }
   }, {
     key: 'togglePlaying',
     value: function togglePlaying() {
+      console.log('are we..........', this.props.opt.processing);
       if (this.props.opt.processing) {
         this.props.actions.pause();
       } else {
@@ -6689,7 +6699,7 @@ var Pix2PixLive = function (_Component) {
   }, {
     key: 'render',
     value: function render() {
-      console.log(this.props);
+      // console.log(this.props)
       if (this.props.pix2pix.loading) {
         return (0, _preact.h)(_common.Loading, null);
       }
@@ -6718,13 +6728,17 @@ var Pix2PixLive = function (_Component) {
               (0, _preact.h)(_common.Select, {
                 name: 'sequence_name',
                 title: 'sequence',
-                options: this.props.pix2pix.data.sequences,
+                options: this.props.pix2pix.data.sequences.map(function (file) {
+                  return file.name;
+                }),
                 onChange: this.changeSequence
               }),
               (0, _preact.h)(_common.Select, {
                 name: 'checkpoint_name',
                 title: 'checkpoint',
-                options: this.props.pix2pix.data.checkpoints,
+                options: this.props.pix2pix.data.checkpoints.map(function (file) {
+                  return file.name;
+                }),
                 onChange: this.changeCheckpoint
               }),
               (0, _preact.h)(_common.Select, {
@@ -6881,12 +6895,16 @@ var Pix2PixLive = function (_Component) {
   }, {
     key: 'renderRestartButton',
     value: function renderRestartButton() {
+      var _this2 = this;
+
       if (this.props.runner.gpu.status === 'IDLE') {
         return (0, _preact.h)(
           _common.Button,
           {
             title: 'GPU Idle',
-            onClick: this.start
+            onClick: function onClick() {
+              return _this2.start();
+            }
           },
           'Start'
         );
@@ -6896,9 +6914,11 @@ var Pix2PixLive = function (_Component) {
           _common.Button,
           {
             title: 'GPU Busy',
-            onClick: this.kill
+            onClick: function onClick() {
+              return _this2.interrupt();
+            }
           },
-          'Kill'
+          'Interrupt'
         );
       }
       if (!this.props.opt.processing) {
@@ -6917,7 +6937,7 @@ var Pix2PixLive = function (_Component) {
           title: 'Processing',
           onClick: this.togglePlaying
         },
-        'Restart'
+        'Pause'
       );
     }
   }]);
@@ -6943,7 +6963,8 @@ var mapStateToProps = function mapStateToProps(state) {
 var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
   return {
     actions: (0, _redux.bindActionCreators)(liveActions, dispatch),
-    pix2pixActions: (0, _redux.bindActionCreators)(pix2pixActions, dispatch)
+    pix2pixActions: (0, _redux.bindActionCreators)(pix2pixActions, dispatch),
+    pix2pixTasks: (0, _redux.bindActionCreators)(pix2pixTasks, dispatch), s: s
   };
 };
 
@@ -10283,7 +10304,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 _socket.socket.on('res', function (data) {
-  console.log('socket:', data.cmd);
+  // console.log('socket:', data.cmd)
   switch (data.cmd) {
     case 'get_last_frame':
       if (data.res !== 'working') {
@@ -10304,35 +10325,36 @@ _socket.socket.on('res', function (data) {
         checkpoints: data.res
       });
       break;
-    case 'list_sequences':
-      (0, _store.dispatch)({
-        type: _types2.default.socket.list_sequences,
-        sequences: data.res
-      });
-      break;
     case 'list_epochs':
       (0, _store.dispatch)({
         type: _types2.default.socket.list_epochs,
         epochs: data.res
       });
       break;
+    case 'list_sequences':
+      (0, _store.dispatch)({
+        type: _types2.default.socket.list_sequences,
+        sequences: data.res
+      });
+      break;
     default:
       break;
   }
-  console.log(data);
+  // console.log(data)
 });
 
 _socket.socket.on('frame', player.onFrame);
 
-function list_checkpoints() {
+function list_checkpoints(module) {
   _socket.socket.emit('cmd', {
-    cmd: 'list_checkpoints'
+    cmd: 'list_checkpoints',
+    payload: module
   });
 }
-function list_epochs(checkpoint_name) {
+function list_epochs(module, checkpoint_name) {
   _socket.socket.emit('cmd', {
     cmd: 'list_epochs',
-    payload: checkpoint_name
+    payload: module + '/' + checkpoint_name
   });
 }
 function list_sequences(module) {
@@ -11460,9 +11482,11 @@ exports.default = {
 		set_param: 'SET_PARAM',
 
 		loading_checkpoints: 'LOADING_CHECKPOINTS',
+		loading_checkpoint: 'LOADING_CHECKPOINT',
 		list_checkpoints: 'LIST_CHECKPOINTS',
 
 		loading_sequences: 'LOADING_SEQUENCES',
+		loading_sequence: 'LOADING_SEQUENCE',
 		load_sequence: 'LOAD_SEQUENCE',
 
 		loading_epochs: 'LOADING_EPOCHS',