Repository: airavata Updated Branches: refs/heads/develop d9a107559 -> 55d2fe92c
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java index 011bef2..2430c4a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java index be56ed5..b25742d 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java index 2e3efe2..a847756 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java index 8a2d800..f664949 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift b/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift index f96fd7a..ab105ae 100644 --- a/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift +++ b/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift @@ -25,13 +25,13 @@ */ include "../../airavata-apis/airavata_commons.thrift" +include "parallelism_model.thrift" namespace java org.apache.airavata.model.appcatalog.appdeployment namespace php Airavata.Model.AppCatalog.AppDeployment namespace cpp apache.airavata.model.appcatalog.appdeployment namespace py apache.airavata.model.appcatalog.appdeployment - /** * Key Value pairs to be used to set environments * @@ -87,30 +87,6 @@ struct ApplicationModule { } /** - * Enumeration of application parallelism supported by Airavata - * - * SERIAL: - * Single processor applications without any parallelization. - * - * MPI: - * Messaging Passing Interface. - * - * OPENMP: - * Shared Memory Implementtaion. - * - * OPENMP_MPI: - * Hybrid Applications. - * -*/ -enum ApplicationParallelismType { - SERIAL, - MPI, - OPENMP, - OPENMP_MPI, - CCM, - CRAY_MPI -} -/** * Application Deployment Description * * appDeploymentId: Airavata Internal Unique Job ID. This is set by the registry. @@ -142,7 +118,7 @@ struct ApplicationDeploymentDescription { 2: required string appModuleId, 3: required string computeHostId, 4: required string executablePath, - 5: required ApplicationParallelismType parallelism = ApplicationParallelismType.SERIAL, + 5: required parallelism_model.ApplicationParallelismType parallelism = parallelism_model.ApplicationParallelismType.SERIAL, 6: optional string appDeploymentDescription, 7: optional list<CommandObject> moduleLoadCmds, 8: optional list<SetEnvPaths> libPrependPaths, http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift b/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift new file mode 100644 index 0000000..31141f3 --- /dev/null +++ b/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +/** + * Application Parallelism Enumerations. + * +*/ + +namespace java org.apache.airavata.model.parallelism +namespace php Airavata.Model.AppCatalog.Parallelism +namespace cpp apache.airavata.model.appcatalog.parallelism +namespace py apache.airavata.model.appcatalog.parallelism + +/** + * Enumeration of application parallelism supported by Airavata + * + * SERIAL: + * Single processor applications without any parallelization. + * + * MPI: + * Messaging Passing Interface. + * + * OPENMP: + * Shared Memory Implementtaion. + * + * OPENMP_MPI: + * Hybrid Applications. + * +*/ +enum ApplicationParallelismType { + SERIAL, + MPI, + OPENMP, + OPENMP_MPI, + CCM, + CRAY_MPI +} http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift index 66b6528..35072fe 100644 --- a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift +++ b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift @@ -19,6 +19,7 @@ */ include "../../airavata-apis/airavata_commons.thrift" +include "../app-catalog-models/parallelism_model.thrift" include "data_movement_models.thrift" namespace java org.apache.airavata.model.appcatalog.computeresource @@ -112,7 +113,8 @@ struct ResourceJobManager { 2: required ResourceJobManagerType resourceJobManagerType, 3: optional string pushMonitoringEndpoint, 4: optional string jobManagerBinPath, - 5: optional map<JobManagerCommand, string> jobManagerCommands + 5: optional map<JobManagerCommand, string> jobManagerCommands, + 6: optional map<parallelism_model.ApplicationParallelismType, string> parallalisimPrefix } /**
