airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [2/2] airavata-php-gateway git commit: fixing parallelism not set issue
Date Tue, 14 Jul 2015 16:38:43 GMT
fixing parallelism not set issue


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/54ec9806
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/54ec9806
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/54ec9806

Branch: refs/heads/master
Commit: 54ec98065182026de229630b6a00a87f9af5752f
Parents: d31ecac
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Tue Jul 14 22:08:18 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Tue Jul 14 22:08:18 2015 +0530

----------------------------------------------------------------------
 app/controllers/ApplicationController.php     | 15 ++++++++++++++-
 app/views/partials/deployment-block.blade.php |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/54ec9806/app/controllers/ApplicationController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ApplicationController.php b/app/controllers/ApplicationController.php
index 78b51ff..82a1317 100644
--- a/app/controllers/ApplicationController.php
+++ b/app/controllers/ApplicationController.php
@@ -114,7 +114,20 @@ class ApplicationController extends BaseController {
 		{
 			$update = true;
 			$appDeploymentValues = Input::all();
-
+            switch($appDeploymentValues["parallelism"]){
+                case "MPI":
+                    $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::MPI;
+                    break;
+                case "SERIAL":
+                    $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::SERIAL;
+                    break;
+                case "OPENMP":
+                    $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::OPENMP;
+                    break;
+                case "OPENMP_MPI":
+                    $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::OPENMP_MPI;
+                    break;
+            }
 			AppUtilities::create_or_update_appDeployment( $appDeploymentValues, $update);
 			$message = "Application Deployment has been updated!";
 		}

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/54ec9806/app/views/partials/deployment-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/deployment-block.blade.php b/app/views/partials/deployment-block.blade.php
index 58722a1..2792a36 100644
--- a/app/views/partials/deployment-block.blade.php
+++ b/app/views/partials/deployment-block.blade.php
@@ -36,7 +36,7 @@
     <label class="control-label">Application Parallelism Type</label>
     <select name="parallelism" class="form-control" readonly>
         @foreach( $applicationParallelismTypes as $index=>$parallelismType)
-        <option value="{{$index}}"
+        <option value="{{$parallelismType}}"
         @if( isset( $deploymentObject) ) @if( $index == $deploymentObject->parallelism)
selected @endif @endif>{{
         $parallelismType }}</option>
         @endforeach


Mime
View raw message