Repository: airavata Updated Branches: refs/heads/master 2e2868f73 -> a216a736a
Adding LSF to supported job managers, addressing - AIRAVATA-1600 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a216a736 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a216a736 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a216a736 Branch: refs/heads/master Commit: a216a736ad56f6e88edae9994686bf28a5d85fcc Parents: 2e2868f Author: smarru <sooner> Authored: Sun Mar 1 12:29:58 2015 -0500 Committer: smarru <sooner> Committed: Sun Mar 1 12:29:58 2015 -0500 ---------------------------------------------------------------------- .../lib/airavata/computeResourceModel_types.cpp | 12 +++--- .../lib/airavata/computeResourceModel_types.h | 5 ++- .../Model/AppCatalog/ComputeResource/Types.php | 10 +++-- .../computeresource/ResourceJobManagerType.java | 42 +++++++++++--------- .../computeResourceModel.thrift | 14 ++++--- 5 files changed, 49 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a216a736/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp index b202d83..d54c519 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp @@ -30,16 +30,18 @@ namespace apache { namespace airavata { namespace model { namespace appcatalog { int _kResourceJobManagerTypeValues[] = { ResourceJobManagerType::FORK, ResourceJobManagerType::PBS, - ResourceJobManagerType::UGE, - ResourceJobManagerType::SLURM + ResourceJobManagerType::SLURM, + ResourceJobManagerType::LSF, + ResourceJobManagerType::UGE }; const char* _kResourceJobManagerTypeNames[] = { "FORK", "PBS", - "UGE", - "SLURM" + "SLURM", + "LSF", + "UGE" }; -const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kResourceJobManagerTypeValues, _kResourceJobManagerTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); +const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kResourceJobManagerTypeValues, _kResourceJobManagerTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); int _kJobManagerCommandValues[] = { JobManagerCommand::SUBMISSION, http://git-wip-us.apache.org/repos/asf/airavata/blob/a216a736/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h index f6f0298..76037b2 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h @@ -38,8 +38,9 @@ struct ResourceJobManagerType { enum type { FORK = 0, PBS = 1, - UGE = 2, - SLURM = 3 + SLURM = 2, + LSF = 3, + UGE = 4 }; }; http://git-wip-us.apache.org/repos/asf/airavata/blob/a216a736/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php index fbc66ab..2280d94 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -20,13 +20,15 @@ use Thrift\Exception\TApplicationException; final class ResourceJobManagerType { const FORK = 0; const PBS = 1; - const UGE = 2; - const SLURM = 3; + const SLURM = 2; + const LSF = 3; + const UGE = 4; static public $__names = array( 0 => 'FORK', 1 => 'PBS', - 2 => 'UGE', - 3 => 'SLURM', + 2 => 'SLURM', + 3 => 'LSF', + 4 => 'UGE', ); } http://git-wip-us.apache.org/repos/asf/airavata/blob/a216a736/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java index 028fef5..db086fe 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java @@ -29,26 +29,30 @@ import java.util.HashMap; import org.apache.thrift.TEnum; /** - * Enumeration of local resource job manager types supported by Airavata - * - * FORK: - * Forking of commands without any job manager - * - * PBS: - * Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine. - * - * UGE: - * Univa Grid Engine, a variation of PBS implementation. - * - * SLURM: - * The Simple Linux Utility for Resource Management is a open source workload manager. - * + * * Enumeration of local resource job manager types supported by Airavata + * * + * * FORK: + * * Forking of commands without any job manager + * * + * * PBS: + * * Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine. + * * + * * SLURM: + * * The Simple Linux Utility for Resource Management is a open source workload manager. + * * + * * UGE: + * * Univa Grid Engine, a variation of PBS implementation. + * * + * * LSF: + * * IBM Platform Load Sharing Facility is dominantly installed on IBM clusters. + * * */ @SuppressWarnings("all") public enum ResourceJobManagerType implements org.apache.thrift.TEnum { FORK(0), PBS(1), - UGE(2), - SLURM(3); + SLURM(2), + LSF(3), + UGE(4); private final int value; @@ -74,9 +78,11 @@ import org.apache.thrift.TEnum; case 1: return PBS; case 2: - return UGE; - case 3: return SLURM; + case 3: + return LSF; + case 4: + return UGE; default: return null; } http://git-wip-us.apache.org/repos/asf/airavata/blob/a216a736/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift index 525e1b9..4747fbc 100644 --- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift +++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift @@ -33,18 +33,22 @@ const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" * PBS: * Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine. * - * UGE: - * Univa Grid Engine, a variation of PBS implementation. - * * SLURM: * The Simple Linux Utility for Resource Management is a open source workload manager. + * + * UGE: + * Univa Grid Engine, a variation of PBS implementation. + * + * LSF: + * IBM Platform Load Sharing Facility is dominantly installed on IBM clusters. * */ enum ResourceJobManagerType { FORK, PBS, - UGE, - SLURM + SLURM, + LSF, + UGE } /**
