Merge pull request #243 from Kitware/fix-runtime-var-names

fix(SchedulerConfig): Fix key used in configs as well as default hand…
Kitware · Mar 16, 2016 · d84c65e · d84c65e
2 parents a920d39 + 19c6c89
commit d84c65e
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 39 deletions.
diff --git a/src/pages/Preferences/Cluster/ClusterForm.js b/src/pages/Preferences/Cluster/ClusterForm.js
@@ -80,8 +80,6 @@ export default React.createClass({
       this.state.data.config,
       { scheduler: Object.assign({}, this.state.data.config.scheduler, scheduler) });
 
-    console.log(scheduler, '=>', config);
-
     this.mergeData({ config });
   },
 

diff --git a/src/panels/SchedulerConfig/PBS.js b/src/panels/SchedulerConfig/PBS.js
@@ -37,8 +37,8 @@ export default React.createClass({
             className={style.input}
             type="number"
             min="1"
-            value={this.props.config.pbs.numberOfCores}
-            data-key="pbs.numberOfCores"
+            value={this.props.config.pbs.numberOfCoresPerNode}
+            data-key="pbs.numberOfCoresPerNode"
             onChange={this.updateConfig}
           />
         </section>
@@ -48,8 +48,8 @@ export default React.createClass({
             className={style.input}
             type="number"
             min="0"
-            value={this.props.config.pbs.numberOfGpus}
-            data-key="pbs.numberOfGpus"
+            value={this.props.config.pbs.numberOfGpusPerNode}
+            data-key="pbs.numberOfGpusPerNode"
             onChange={this.updateConfig}
           />
         </section>

diff --git a/src/panels/SchedulerConfig/SGE.js b/src/panels/SchedulerConfig/SGE.js
@@ -37,8 +37,8 @@ export default React.createClass({
             className={style.input}
             type="number"
             min="0"
-            value={this.props.config.sge.numberOfGpus}
-            data-key="sge.numberOfGpus"
+            value={this.props.config.sge.numberOfGpusPerNode}
+            data-key="sge.numberOfGpusPerNode"
             onChange={this.updateConfig}
           />
         </section>

diff --git a/src/panels/SchedulerConfig/SLURM.js b/src/panels/SchedulerConfig/SLURM.js
@@ -37,8 +37,8 @@ export default React.createClass({
             className={style.input}
             type="number"
             min="1"
-            value={this.props.config.slurm.numberOfCores}
-            data-key="slurm.numberOfCores"
+            value={this.props.config.slurm.numberOfCoresPerNode}
+            data-key="slurm.numberOfCoresPerNode"
             onChange={this.updateConfig}
           />
         </section>
@@ -48,8 +48,8 @@ export default React.createClass({
             className={style.input}
             type="number"
             min="0"
-            value={this.props.config.slurm.numberOfGpus}
-            data-key="slurm.numberOfGpus"
+            value={this.props.config.slurm.numberOfGpusPerNode}
+            data-key="slurm.numberOfGpusPerNode"
             onChange={this.updateConfig}
           />
         </section>

diff --git a/src/panels/SchedulerConfig/index.js b/src/panels/SchedulerConfig/index.js
@@ -12,6 +12,29 @@ const typeMapping = {
   pbs: PBS,
 };
 
+function addDefaults(config) {
+  return Object.assign(
+    {
+      type: 'sge',
+      maxWallTime: { hours: 0, minutes: 30, seconds: 0 },
+      defaultQueue: 'default',
+      sge: {
+        numberOfGpusPerNode: 0,
+        numberOfSlots: 1,
+      },
+      slurm: {
+        numberOfGpusPerNode: 0,
+        numberOfCoresPerNode: 1,
+        numberOfCores: 1,
+      },
+      pbs: {
+        numberOfGpusPerNode: 0,
+        numberOfCoresPerNode: 1,
+        numberOfCores: 1,
+      },
+    }, config);
+}
+
 export default React.createClass({
 
   displayName: 'SchedulerConfig',
@@ -30,26 +53,7 @@ export default React.createClass({
 
   getInitialState() {
     return {
-      config: Object.assign(
-        {
-          type: 'sge',
-          maxRuntime: 30,
-          defaultQueue: 'default',
-          sge: {
-            numberOfGpus: 0,
-            numberOfSlots: 1,
-          },
-          slurm: {
-            numberOfGpus: 0,
-            numberOfNodes: 1,
-            numberOfCores: 1,
-          },
-          pbs: {
-            numberOfGpus: 0,
-            numberOfNodes: 1,
-            numberOfCores: 1,
-          },
-        }, this.props.config),
+      config: addDefaults(this.props.config),
     };
   },
 
@@ -58,8 +62,8 @@ export default React.createClass({
       oldConfig = this.props.config;
 
     if (!deepEquals(config, oldConfig)) {
-      this.setState({ config });
-      this.props.onChange(config);
+      this.setState({ config: addDefaults(config) });
+      this.props.onChange(addDefaults(config));
     }
   },
 
@@ -111,14 +115,35 @@ export default React.createClass({
           <input
             className={style.input}
             type="number"
-            min="1"
-            value={this.state.config.maxRuntime}
-            data-key="maxRuntime"
+            min="0"
+            value={this.state.config.maxWallTime.hours}
+            title="Number of hours"
+            data-key="maxWallTime.hours"
+            onChange={this.updateConfig}
+          />
+          <input
+            className={style.input}
+            type="number"
+            min="0"
+            max="59"
+            value={this.state.config.maxWallTime.minutes}
+            title="Number of minutes"
+            data-key="maxWallTime.minutes"
+            onChange={this.updateConfig}
+          />
+          <input
+            className={style.input}
+            type="number"
+            min="0"
+            max="59"
+            value={this.state.config.maxWallTime.seconds}
+            title="Number of seconds"
+            data-key="maxWallTime.seconds"
             onChange={this.updateConfig}
           />
         </section>
         <section className={style.group}>
-          <label className={style.label}>Default queue</label>
+          <label className={style.label}>{ this.props.runtime ? 'Queue' : 'Default queue' }</label>
           <input
             className={style.input}
             type="text"

diff --git a/src/panels/run/RunCluster.js b/src/panels/run/RunCluster.js
@@ -55,8 +55,9 @@ export default React.createClass({
   updateRuntimeConfig(config) {
     const runtime = Object.assign({}, config);
     Object.assign(runtime, runtime[runtime.type]);
+    runtime.queue = runtime.defaultQueue;
 
-    ['sge', 'slurm', 'pbs', 'type'].forEach(keyToDelete => {
+    ['sge', 'slurm', 'pbs', 'type', 'defaultQueue'].forEach(keyToDelete => {
       delete runtime[keyToDelete];
     });