while(quitCommandCalled != 1){
+
mout->mothurOutEndLine();
input = getCommand();
mout->mothurOutEndLine();
-
+
if (mout->control_pressed) { input = "quit()"; }
//allow user to omit the () on the quit command
options = parser.getOptionString();
if (commandName != "") {
- mout->executing = true;
- //executes valid command
- Command* command = cFactory->getCommand(commandName, options);
- quitCommandCalled = command->execute();
- mout->control_pressed = 0;
- mout->executing = false;
- }else {
- mout->mothurOut("Your input contains errors. Please try again.");
- mout->mothurOutEndLine();
- }
+ mout->executing = true;
+ #ifdef USE_MPI
+ int pid;
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+
+//cout << pid << " is here " << commandName << endl;
+ if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
+ #endif
+ //executes valid command
+ Command* command = cFactory->getCommand(commandName, options);
+ quitCommandCalled = command->execute();
+ mout->control_pressed = 0;
+ mout->executing = false;
+
+ #ifdef USE_MPI
+ }
+ #endif
+ }else {
+ mout->mothurOut("Invalid.");
+ mout->mothurOutEndLine();
+ }
}
return 1;
}
/***********************************************************************/
string Engine::getCommand() {
try {
+ #ifdef USE_MPI
+ MPI_Barrier(MPI_COMM_WORLD);
+ #endif
+
#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
#ifdef USE_READLINE
char* nextCommand = NULL;
if(nextCommand != NULL) { add_history(nextCommand); }
else{ //^D causes null string and we want it to quit mothur
nextCommand = "quit";
- cout << nextCommand << endl;
+ mout->mothurOut(nextCommand);
}
mout->mothurOutJustToLog("mothur > " + toString(nextCommand));
mout->mothurOut("mothur > ");
getline(cin, nextCommand);
mout->mothurOutJustToLog("mothur > " + toString(nextCommand));
+
return nextCommand;
#endif
#else
- string nextCommand = "";
- mout->mothurOut("mothur > ");
- getline(cin, nextCommand);
- mout->mothurOutJustToLog("mothur > " + toString(nextCommand));
- return nextCommand;
+ string nextCommand = "";
+
+ mout->mothurOut("mothur > ");
+ getline(cin, nextCommand);
+ mout->mothurOutJustToLog(toString(nextCommand));
+
+ return nextCommand;
#endif
-
- mout->mothurOutEndLine();
+
}
catch(exception& e) {
//CommandFactory cFactory;
int quitCommandCalled = 0;
-
+ int count = 0;
while(quitCommandCalled == 0){
- if (inputBatchFile.eof()) { input = "quit()"; }
- else { input = getline(inputBatchFile); }
+ input = getNextCommand(inputBatchFile);
+ count++;
if (input[0] != '#') {
mout->mothurOutEndLine();
mout->mothurOut("mothur > " + input);
mout->mothurOutEndLine();
-
+
if (mout->control_pressed) { input = "quit()"; }
//allow user to omit the () on the quit command
if (commandName != "") {
mout->executing = true;
+ #ifdef USE_MPI
+ int pid;
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+
+//cout << pid << " is here " << commandName << '\t' << count << endl;
+ if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
+ #endif
//executes valid command
Command* command = cFactory->getCommand(commandName, options);
quitCommandCalled = command->execute();
mout->control_pressed = 0;
mout->executing = false;
+
+ #ifdef USE_MPI
+ }
+ #endif
}else {
mout->mothurOut("Invalid.");
mout->mothurOutEndLine();
exit(1);
}
}
-
+/***********************************************************************/
+string BatchEngine::getNextCommand(ifstream& inputBatchFile) {
+ try {
+
+ #ifdef USE_MPI
+ int err = MPI_Barrier(MPI_COMM_WORLD);
+//cout << "barrier = " << err << '\t' << MPI_SUCCESS << endl;
+ #endif
+
+ string nextcommand = "";
+
+ if (inputBatchFile.eof()) { nextcommand = "quit()"; }
+ else { nextcommand = getline(inputBatchFile); }
+
+ return nextcommand;
+ }
+ catch(exception& e) {
+ mout->errorOut(e, "BatchEngine", "getNextCommand");
+ exit(1);
+ }
+}
/***********************************************************************/
/***********************************************************************/
if (input == "") { input = "quit()"; }
-
mout->mothurOutEndLine();
mout->mothurOut("mothur > " + input);
mout->mothurOutEndLine();
-
+
if (mout->control_pressed) { input = "quit()"; }
//allow user to omit the () on the quit command
options = parser.getOptionString();
if (commandName != "") {
- mout->executing = true;
- //executes valid command
- Command* command = cFactory->getCommand(commandName, options);
- quitCommandCalled = command->execute();
- mout->control_pressed = 0;
- mout->executing = false;
- }else {
- mout->mothurOut("Invalid.");
- mout->mothurOutEndLine();
- }
+ mout->executing = true;
+ #ifdef USE_MPI
+ int pid, numProcesses;
+ MPI_Status status;
+
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+ MPI_Comm_size(MPI_COMM_WORLD, &numProcesses);
+
+//cout << pid << " is here " << commandName << endl;
+ if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
+ //cout << pid << " is in execute" << endl;
+ #endif
+ //executes valid command
+ Command* command = cFactory->getCommand(commandName, options);
+ quitCommandCalled = command->execute();
+ mout->control_pressed = 0;
+ mout->executing = false;
+
+ #ifdef USE_MPI
+ //cout << pid << " is done in execute" << endl;
+ }
+ #endif
+ }else {
+ mout->mothurOut("Invalid.");
+ mout->mothurOutEndLine();
+ }
+
}
/***********************************************************************/
string ScriptEngine::getNextCommand(string& commandString) {
try {
+
+ #ifdef USE_MPI
+ MPI_Barrier(MPI_COMM_WORLD);
+ #endif
+
string nextcommand = "";
int count = 0;
if (commandString.length() == 0) { break; }
}
}
-
+
return nextcommand;
}
catch(exception& e) {