You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/03/13 20:37:41 UTC
[1/2] git commit: Added output folder properties.
Repository: airavata
Updated Branches:
refs/heads/master 7437e11d0 -> 12c605453
Added output folder properties.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/25e5e917
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/25e5e917
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/25e5e917
Branch: refs/heads/master
Commit: 25e5e917590ad47ee91c4cd3690e0ec25dd4948d
Parents: b1b5178
Author: raminder <ra...@apache.org>
Authored: Thu Mar 13 15:37:17 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Thu Mar 13 15:37:17 2014 -0400
----------------------------------------------------------------------
.../samples/CreateLaunchExperimentUS3.java | 26 ++++++++++++++------
.../client/tools/UltrascanDocumentCreator.java | 5 +---
2 files changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/25e5e917/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index 41601d1..eb76412 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -19,6 +19,7 @@ import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.common.utils.ClientSettings;
import org.apache.airavata.model.util.ExperimentModelUtil;
+import org.apache.airavata.model.workspace.experiment.AdvancedOutputDataHandling;
import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
import org.apache.airavata.model.workspace.experiment.DataObjectType;
import org.apache.airavata.model.workspace.experiment.Experiment;
@@ -45,9 +46,9 @@ public class CreateLaunchExperimentUS3 {
System.out.println("API version is " + airavata.GetAPIVersion());
// addDescriptors();
// final String expId = createExperimentForTrestles(airavata);
-// final String expId = createUS3ExperimentForTrestles(airavata);
+ final String expId = createUS3ExperimentForTrestles(airavata);
// final String expId = createExperimentForStampede(airavata);
- final String expId = createUS3ExperimentForStampede(airavata);
+// final String expId = createUS3ExperimentForStampede(airavata);
System.out.println("Experiment ID : " + expId);
launchExperiment(airavata, expId);
System.out.println("Launched successfully");
@@ -149,7 +150,7 @@ public class CreateLaunchExperimentUS3 {
ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3EchoExperimentTrestles", "US3EchoTrestles", "US3EchoTrestles", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "shared", 0, 0, 1, "sds128");
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "shared", 0, 0, 1, "uot111");
scheduling.setResourceHostId("gsissh-trestles");
UserConfigurationData userConfigurationData = new UserConfigurationData();
userConfigurationData.setAiravataAutoSchedule(false);
@@ -203,12 +204,16 @@ public class CreateLaunchExperimentUS3 {
simpleExperiment.setExperimentOutputs(exOut);
ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 2, 32, 0, "shared", 0, 0, 0, "uot111");
-
-
- scheduling.setResourceHostId("gsissh-trestles");
UserConfigurationData userConfigurationData = new UserConfigurationData();
+
+ scheduling.setResourceHostId("gsissh-trestles");
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
+
+ AdvancedOutputDataHandling dataHandling = new AdvancedOutputDataHandling();
+ dataHandling.setOutputDataDir("/home/airavata/output/");
+ userConfigurationData.setAdvanceOutputDataHandling(dataHandling);
+
userConfigurationData.setComputationalResourceScheduling(scheduling);
simpleExperiment.setUserConfigurationData(userConfigurationData);
return client.createExperiment(simpleExperiment);
@@ -256,14 +261,19 @@ public class CreateLaunchExperimentUS3 {
Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3ExperimentStampede", "US3AppStampede", "US3AppStampede", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 2, 32, 0, "development", 0, 0, 0, "TG-MCB070039N");
-
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 2, 32, 0, "normal", 0, 0, 0, "TG-MCB070039N");
scheduling.setResourceHostId("gsissh-stampede");
UserConfigurationData userConfigurationData = new UserConfigurationData();
+
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
userConfigurationData.setComputationalResourceScheduling(scheduling);
+
+ AdvancedOutputDataHandling dataHandling = new AdvancedOutputDataHandling();
+ dataHandling.setOutputDataDir("/home/airavata/output/");
+ userConfigurationData.setAdvanceOutputDataHandling(dataHandling);
+
simpleExperiment.setUserConfigurationData(userConfigurationData);
return client.createExperiment(simpleExperiment);
} catch (AiravataSystemException e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/25e5e917/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/UltrascanDocumentCreator.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/UltrascanDocumentCreator.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/UltrascanDocumentCreator.java
index e1152aa..ef0d10b 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/UltrascanDocumentCreator.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/UltrascanDocumentCreator.java
@@ -26,12 +26,9 @@ public class UltrascanDocumentCreator {
private AiravataAPI airavataAPI = null;
private String hpcHostAddress = "trestles.sdsc.edu";
- private String gramHostName = "gram-trestles";
private String gsiSshHostNameTrestles = "gsissh-trestles";
private String gsiSshHostNameStampede = "gsissh-stampede";
- private String gridftpAddress = "gsiftp://trestles-dm1.sdsc.edu:2811";
- private String gramAddress = "trestles-login1.sdsc.edu:2119/jobmanager-pbstest2";
-
+
public UltrascanDocumentCreator(AiravataAPI airavataAPI) {
this.airavataAPI = airavataAPI;
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/12c60545
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/12c60545
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/12c60545
Branch: refs/heads/master
Commit: 12c605453a31617fd4d0c99bce3a47516799c25a
Parents: 25e5e91 7437e11
Author: raminder <ra...@apache.org>
Authored: Thu Mar 13 15:37:30 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Thu Mar 13 15:37:30 2014 -0400
----------------------------------------------------------------------
.../registry/jpa/impl/ExperimentRegistry.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------