You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/03 20:47:41 UTC
[16/51] [abbrv] airavata git commit: adding CCM and CRAY_MPI for
gausian
adding CCM and CRAY_MPI for gausian
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/84bf6215
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/84bf6215
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/84bf6215
Branch: refs/heads/master
Commit: 84bf6215e2b8b06ab353836ed03e713a678016b0
Parents: 496eff4
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Oct 13 13:58:34 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Oct 20 14:49:06 2015 -0400
----------------------------------------------------------------------
.../lib/airavata/application_deployment_model_types.cpp | 10 +++++++---
.../lib/airavata/application_deployment_model_types.h | 4 +++-
.../lib/Airavata/Model/AppCatalog/AppDeployment/Types.php | 4 ++++
.../airavata/model/appcatalog/appdeployment/ttypes.py | 6 ++++++
.../appdeployment/ApplicationParallelismType.java | 8 +++++++-
.../java/org/apache/airavata/gfac/core/GFacUtils.java | 10 ++++++++--
.../airavata-api/application_deployment_model.thrift | 4 +++-
7 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/84bf6215/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
index 2795d62..2548d43 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
@@ -34,15 +34,19 @@ int _kApplicationParallelismTypeValues[] = {
ApplicationParallelismType::SERIAL,
ApplicationParallelismType::MPI,
ApplicationParallelismType::OPENMP,
- ApplicationParallelismType::OPENMP_MPI
+ ApplicationParallelismType::OPENMP_MPI,
+ ApplicationParallelismType::CCM,
+ ApplicationParallelismType::CRAY_MPI
};
const char* _kApplicationParallelismTypeNames[] = {
"SERIAL",
"MPI",
"OPENMP",
- "OPENMP_MPI"
+ "OPENMP_MPI",
+ "CCM",
+ "CRAY_MPI"
};
-const std::map<int, const char*> _ApplicationParallelismType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kApplicationParallelismTypeValues, _kApplicationParallelismTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _ApplicationParallelismType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kApplicationParallelismTypeValues, _kApplicationParallelismTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
SetEnvPaths::~SetEnvPaths() throw() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/84bf6215/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
index f4bbb61..7f19352 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
@@ -42,7 +42,9 @@ struct ApplicationParallelismType {
SERIAL = 0,
MPI = 1,
OPENMP = 2,
- OPENMP_MPI = 3
+ OPENMP_MPI = 3,
+ CCM = 4,
+ CRAY_MPI = 5
};
};
http://git-wip-us.apache.org/repos/asf/airavata/blob/84bf6215/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
index 1a237c4..61d4c5a 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -38,11 +38,15 @@ final class ApplicationParallelismType {
const MPI = 1;
const OPENMP = 2;
const OPENMP_MPI = 3;
+ const CCM = 4;
+ const CRAY_MPI = 5;
static public $__names = array(
0 => 'SERIAL',
1 => 'MPI',
2 => 'OPENMP',
3 => 'OPENMP_MPI',
+ 4 => 'CCM',
+ 5 => 'CRAY_MPI',
);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/84bf6215/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
index 5c2ece0..e6ecf98 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
@@ -39,12 +39,16 @@ class ApplicationParallelismType:
MPI = 1
OPENMP = 2
OPENMP_MPI = 3
+ CCM = 4
+ CRAY_MPI = 5
_VALUES_TO_NAMES = {
0: "SERIAL",
1: "MPI",
2: "OPENMP",
3: "OPENMP_MPI",
+ 4: "CCM",
+ 5: "CRAY_MPI",
}
_NAMES_TO_VALUES = {
@@ -52,6 +56,8 @@ class ApplicationParallelismType:
"MPI": 1,
"OPENMP": 2,
"OPENMP_MPI": 3,
+ "CCM": 4,
+ "CRAY_MPI": 5,
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/84bf6215/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
index 5ed2eed..28c4003 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
@@ -48,7 +48,9 @@ public enum ApplicationParallelismType implements org.apache.thrift.TEnum {
SERIAL(0),
MPI(1),
OPENMP(2),
- OPENMP_MPI(3);
+ OPENMP_MPI(3),
+ CCM(4),
+ CRAY_MPI(5);
private final int value;
@@ -77,6 +79,10 @@ public enum ApplicationParallelismType implements org.apache.thrift.TEnum {
return OPENMP;
case 3:
return OPENMP_MPI;
+ case 4:
+ return CCM;
+ case 5:
+ return CRAY_MPI;
default:
return null;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/84bf6215/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 320f58f..52f8e61 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -585,12 +585,18 @@ public class GFacUtils {
ApplicationParallelismType parallelism = appDepDescription.getParallelism();
if (parallelism != null) {
- if (parallelism == ApplicationParallelismType.MPI || parallelism == ApplicationParallelismType.OPENMP || parallelism == ApplicationParallelismType.OPENMP_MPI) {
+ if (parallelism != ApplicationParallelismType.SERIAL) {
// FIXME this needs to be fixed once parallaliasation retrieved by app catalog
if (appDepDescription.getComputeHostId().contains("stampede")){
jobDescriptor.setJobSubmitter("ibrun");
}else if (appDepDescription.getComputeHostId().contains("bigred2")){
- jobDescriptor.setJobSubmitter("aprun -n");
+ if (parallelism == ApplicationParallelismType.CRAY_MPI){
+ jobDescriptor.setJobSubmitter("aprun -n");
+ }else if (parallelism == ApplicationParallelismType.CCM){
+ jobDescriptor.setJobSubmitter("ccmrun");
+ }else {
+ jobDescriptor.setJobSubmitter("aprun -n");
+ }
}else if (appDepDescription.getComputeHostId().contains("comet")){
jobDescriptor.setJobSubmitter("mpiexec");
}else if (appDepDescription.getComputeHostId().contains("gordon")){
http://git-wip-us.apache.org/repos/asf/airavata/blob/84bf6215/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift b/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift
index 916cc6a..75a2be8 100644
--- a/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift
@@ -88,7 +88,9 @@ enum ApplicationParallelismType {
SERIAL,
MPI,
OPENMP,
- OPENMP_MPI
+ OPENMP_MPI,
+ CCM,
+ CRAY_MPI
}
/**
* Application Deployment Description