Merge pull request #232 from Kitware/refactor-pyfr

fix(PyFr): Refactor PyFr code base to share as much as possible compo…
Kitware · Mar 14, 2016 · 63177eb · 63177eb
2 parents fdfac5c + d9d26c8
commit 63177eb
Show file tree

Hide file tree

Showing 24 changed files with 140 additions and 78,323 deletions.
diff --git a/dist/HPCCloud.js b/dist/HPCCloud.js
diff --git a/src/panels/run/RunCluster.js b/src/panels/run/RunCluster.js
@@ -6,7 +6,7 @@ import style    from 'HPCCloudStyle/ItemEditor.mcss';
 import theme    from 'HPCCloudStyle/Theme.mcss';
 
 export default React.createClass({
-  displayName: 'run/cluster',
+  displayName: 'panels/run/RunCluster',
 
   propTypes: {
     contents: React.PropTypes.object,
@@ -28,20 +28,21 @@ export default React.createClass({
   updateState() {
     this.setState({ busy: true });
     client.listClusterProfiles()
-      .then(resp => {
-        this.setState({
-          profiles: resp.data,
-          profile: resp.data[0],
-          busy: false,
+      .then(
+        resp => {
+          this.setState({
+            profiles: resp.data,
+            profile: resp.data[0],
+            busy: false,
+          });
+          if (this.props.onChange) {
+            this.props.onChange('profile', resp.data[0]._id, 'Traditional');
+          }
+        },
+        err => {
+          console.log('Error: Sim/RunCluster', err);
+          this.setState({ busy: false });
         });
-        if (this.props.onChange) {
-          this.props.onChange('profile', resp.data[0]._id, 'Traditional');
-        }
-      })
-      .catch(err => {
-        console.log('Error: Sim/RunCluster', err);
-        this.setState({ busy: false });
-      });
   },
 
   dataChange(event) {

diff --git a/src/workflows/index.js b/src/workflows/index.js
@@ -1,6 +1,6 @@
 import CodeSaturn   from './code-saturn';
-import PyFr         from './pyfr';
-import PyFrExec     from './pyfr-exec';
+import PyFr         from './pyfr/pyfr-simput';
+import PyFrExec     from './pyfr/pyfr-exec';
 import Visualizer   from './visualizer';
 
 export default {

diff --git a/src/workflows/pyfr-exec/components/steps/Introduction/index.js b/src/workflows/pyfr-exec/components/steps/Introduction/index.js
diff --git a/src/workflows/pyfr-exec/components/steps/Visualization/View/index.js b/src/workflows/pyfr-exec/components/steps/Visualization/View/index.js
diff --git a/...omponents/helpers/RuntimeBackend/index.js → ...yfr/common/panels/RuntimeBackend/index.js b/...omponents/helpers/RuntimeBackend/index.js → ...yfr/common/panels/RuntimeBackend/index.js
@@ -1,5 +1,6 @@
-import React     from 'react';
-import formStyle from 'HPCCloudStyle/ItemEditor.mcss';
+import React      from 'react';
+import deepEquals from 'mout/src/lang/deepEquals';
+import formStyle  from 'HPCCloudStyle/ItemEditor.mcss';
 
 const TYPES = {
   cuda: 'Cuda',
@@ -23,11 +24,10 @@ export default React.createClass({
   },
 
   componentWillReceiveProps(nextProps) {
-    const { type, types } = this.getStateFromProps(nextProps);
+    const { type, types, profile } = this.getStateFromProps(nextProps);
 
     if (types.indexOf(this.state.type) === -1) {
-      this.setState({ type, types });
-      const profile = this.props.profiles[type][0] ? this.props.profiles[type][0].name : '';
+      this.setState({ type, types, profile });
       this.updateBackend(type, profile, this.state.device);
     } else {
       this.setState({ types });
@@ -37,6 +37,7 @@ export default React.createClass({
 
   getStateFromProps(props) {
     let type = '';
+    let profile = '';
     const types = [];
 
     if (props.profiles) {
@@ -47,13 +48,15 @@ export default React.createClass({
       if (props.profiles.opencl && props.profiles.opencl.length) {
         type = 'opencl';
         types.push(type);
+        profile = props.profiles.opencl[0].name;
       }
       if (props.profiles.openmp && props.profiles.openmp.length) {
         type = 'openmp';
         types.push(type);
+        profile = props.profiles.openmp[0].name;
       }
     }
-    return { type, types };
+    return { type, types, profile };
   },
 
   updateActiveType(event) {
@@ -77,6 +80,10 @@ export default React.createClass({
   },
 
   updateBackend(type, profile, device) {
+    if (!type) {
+      return;
+    }
+
     const backend = { type };
     if (type === 'cuda') {
       backend['device-id'] = device;
@@ -87,7 +94,10 @@ export default React.createClass({
       }
     }
     if (this.props.onChange) {
-      this.props.onChange(backend);
+      if (!deepEquals(this.state.backend, backend)) {
+        this.setState({ backend });
+        this.props.onChange(backend);
+      }
     }
   },
 

diff --git a/...omponents/steps/Introduction/content.html → ...fr/common/steps/Introduction/content.html b/...omponents/steps/Introduction/content.html → ...fr/common/steps/Introduction/content.html
diff --git a/...fr/components/steps/Introduction/index.js → ...s/pyfr/common/steps/Introduction/index.js b/...fr/components/steps/Introduction/index.js → ...s/pyfr/common/steps/Introduction/index.js
@@ -4,7 +4,7 @@ const staticContent = require('./content.html');
 
 export default React.createClass({
 
-  displayName: 'StaticContent',
+  displayName: 'pyfr/common/steps/Introduction',
 
   /* eslint-disable react/no-danger */
   render() {

diff --git a/...omponents/steps/Simulation/Start/index.js → ...fr/common/steps/Simulation/Start/index.js b/...omponents/steps/Simulation/Start/index.js → ...fr/common/steps/Simulation/Start/index.js
@@ -5,7 +5,7 @@ import RunEC2                  from '../../../../../../panels/run/RunEC2';
 import RunCluster              from '../../../../../../panels/run/RunCluster';
 import RunOpenStack            from '../../../../../../panels/run/RunOpenStack';
 import ButtonBar               from '../../../../../../panels/ButtonBar';
-import RuntimeBackend          from '../../../helpers/RuntimeBackend';
+import RuntimeBackend          from '../../../panels/RuntimeBackend';
 
 import client                  from '../../../../../../network';
 import deepClone               from 'mout/src/lang/deepClone';
@@ -14,7 +14,7 @@ import formStyle               from 'HPCCloudStyle/ItemEditor.mcss';
 
 export default React.createClass({
 
-  displayName: 'pyfr-exec/start-sim',
+  displayName: 'pyfr/common/steps/Simulation/Start',
 
   propTypes: {
     location: React.PropTypes.object,

diff --git a/...components/steps/Simulation/View/index.js → ...yfr/common/steps/Simulation/View/index.js b/...components/steps/Simulation/View/index.js → ...yfr/common/steps/Simulation/View/index.js
@@ -24,7 +24,7 @@ const ACTIONS = {
 };
 
 export default React.createClass({
-  displayName: 'pyfr/view-simulation',
+  displayName: 'pyfr/common/steps/Simulation/View',
 
   propTypes: {
     location: React.PropTypes.object,

diff --git a/...onents/steps/Visualization/Start/index.js → ...common/steps/Visualization/Start/index.js b/...onents/steps/Visualization/Start/index.js → ...common/steps/Visualization/Start/index.js
@@ -13,7 +13,7 @@ import formStyle               from 'HPCCloudStyle/ItemEditor.mcss';
 
 export default React.createClass({
 
-  displayName: 'pyfr-exec/run-viz',
+  displayName: 'pyfr/common/steps/Visualization/Start',
 
   propTypes: {
     location: React.PropTypes.object,

diff --git a/...ponents/steps/Visualization/View/index.js → .../common/steps/Visualization/View/index.js b/...ponents/steps/Visualization/View/index.js → .../common/steps/Visualization/View/index.js
@@ -12,7 +12,7 @@ const ACTIONS = {
 };
 
 export default React.createClass({
-  displayName: 'pyfr-exec/view-viz',
+  displayName: 'pyfr/common/steps/Visualization/View',
 
   propTypes: {
     location: React.PropTypes.object,

diff --git a/src/workflows/pyfr/components/steps/Introduction/content.html b/src/workflows/pyfr/components/steps/Introduction/content.html