InteractEngine::InteractEngine(string path){
globaldata = GlobalData::getInstance();
- globaldata->argv = path;
+ string temppath = path.substr(0, (path.find_last_of('m')));
+
+ //this will happen if you set the path variable to contain mothur's exe location
+ if (temppath == "") {
+
+ string envPath = getenv("PATH");
+
+ //delimiting path char
+ char delim;
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ delim = ':';
+ #else
+ delim = ';';
+ #endif
+
+ //break apart path variable by ':'
+ vector<string> dirs;
+ splitAtChar(envPath, dirs, delim);
+
+ //get path related to mothur
+ string mothurPath = "";
+ for (int i = 0; i < dirs.size(); i++) {
+ //to lower so we can find it
+ string tempLower = "";
+ for (int j = 0; j < dirs[i].length(); j++) { tempLower += tolower(dirs[i][j]); }
+
+ //is this mothurs path?
+ if (tempLower.find("mothur") != -1) { mothurPath = dirs[i]; break; }
+ }
+
+ //add mothur so it looks like what argv would look like
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ mothurPath += "/mothur";
+ #else
+ mothurPath += "\\mothur";
+ #endif
+
+ path = mothurPath;
+ }
+
+ globaldata->argv = path;
}
/***********************************************************************/
while(quitCommandCalled != 1){
+ #ifdef USE_MPI
+ int pid, processors;
+ MPI_Status status;
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+ MPI_Comm_size(MPI_COMM_WORLD, &processors);
+
+ if (pid == 0) {
+
+ #endif
+
mout->mothurOutEndLine();
input = getCommand();
//allow user to omit the () on the quit command
if (input == "quit") { input = "quit()"; }
+
+ #ifdef USE_MPI
+ //send commandName
+ for(int i = 1; i < processors; i++) {
+ int length = input.length();
+ MPI_Send(&length, 1, MPI_INT, i, 2001, MPI_COMM_WORLD);
+ MPI_Send(&input[0], length, MPI_CHAR, i, 2001, MPI_COMM_WORLD);
+
+ }
+ }else {
+ int length;
+ MPI_Recv(&length, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status);
+ //recieve container
+ char* tempBuf = new char[length];
+ MPI_Recv(&tempBuf[0], length, MPI_CHAR, 0, 2001, MPI_COMM_WORLD, &status);
+
+ input = tempBuf;
+ if (input.length() > length) { input = input.substr(0, length); }
+ delete tempBuf;
+ }
+
+
+ #endif
+
CommandOptionParser parser(input);
commandName = parser.getCommandString();
options = parser.getOptionString();
if (commandName != "") {
- mout->executing = true;
-
- #ifdef USE_MPI
- int pid;
- MPI_Comm_rank(MPI_COMM_WORLD, &pid);
-
- 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("Your input contains errors. Please try again.");
- mout->mothurOutEndLine();
- }
+ mout->executing = true;
+ #ifdef USE_MPI
+ int pid;
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+
+ if ((cFactory->MPIEnabled(commandName)) || (pid == 0)) {
+ //cout << pid << " is in execute " << commandName << endl;
+ #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 //mpirun doesn't work with readline
- string nextCommand = "";
-
- mout->mothurOut("mothur > ");
- getline(cin, nextCommand);
- mout->mothurOutJustToLog(toString(nextCommand));
-
- return nextCommand;
- #else
+
#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
#ifdef USE_READLINE
char* nextCommand = NULL;
return nextCommand;
#endif
- #endif
+
}
catch(exception& e) {
globaldata = GlobalData::getInstance();
openedBatch = openInputFile(batchFileName, inputBatchFile);
+
+ string temppath = path.substr(0, (path.find_last_of('m')));
+
+ //this will happen if you set the path variable to contain mothur's exe location
+ if (temppath == "") {
+
+ string envPath = getenv("PATH");
+
+ //delimiting path char
+ char delim;
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ delim = ':';
+ #else
+ delim = ';';
+ #endif
+
+ //break apart path variable by ':'
+ vector<string> dirs;
+ splitAtChar(envPath, dirs, delim);
+
+ //get path related to mothur
+ string mothurPath = "";
+ for (int i = 0; i < dirs.size(); i++) {
+ //to lower so we can find it
+ string tempLower = "";
+ for (int j = 0; j < dirs[i].length(); j++) { tempLower += tolower(dirs[i][j]); }
+
+ //is this mothurs path?
+ if (tempLower.find("mothur") != -1) { mothurPath = dirs[i]; break; }
+ }
+
+ //add mothur so it looks like what argv would look like
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ mothurPath += "/mothur";
+ #else
+ mothurPath += "\\mothur";
+ #endif
+
+ path = mothurPath;
+ }
+
globaldata->argv = path;
}
//CommandFactory cFactory;
int quitCommandCalled = 0;
-
+ int count = 0;
while(quitCommandCalled == 0){
+
+ #ifdef USE_MPI
+ int pid, processors;
+ MPI_Status status;
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+ MPI_Comm_size(MPI_COMM_WORLD, &processors);
+
+ if (pid == 0) {
+
+ #endif
+
+ input = getNextCommand(inputBatchFile);
+ count++;
+
+ #ifdef USE_MPI
+ //send commandName
+ for(int i = 1; i < processors; i++) {
+ int length = input.length();
+ MPI_Send(&length, 1, MPI_INT, i, 2001, MPI_COMM_WORLD);
+ MPI_Send(&input[0], length, MPI_CHAR, i, 2001, MPI_COMM_WORLD);
- if (inputBatchFile.eof()) { input = "quit()"; }
- else { input = getline(inputBatchFile); }
+ }
+ }else {
+ int length;
+ MPI_Recv(&length, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status);
+ //recieve container
+ char* tempBuf = new char[length];
+ MPI_Recv(&tempBuf[0], length, MPI_CHAR, 0, 2001, MPI_COMM_WORLD, &status);
+
+ input = tempBuf;
+ if (input.length() > length) { input = input.substr(0, length); }
+ delete tempBuf;
+ }
+
+
+ #endif
+
+
if (input[0] != '#') {
#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
quitCommandCalled = command->execute();
mout->control_pressed = 0;
mout->executing = false;
-
+
#ifdef USE_MPI
}
#endif
exit(1);
}
}
-
+/***********************************************************************/
+string BatchEngine::getNextCommand(ifstream& inputBatchFile) {
+ try {
+
+ string nextcommand = "";
+
+ if (inputBatchFile.eof()) { nextcommand = "quit()"; }
+ else { nextcommand = getline(inputBatchFile); }
+
+ return nextcommand;
+ }
+ catch(exception& e) {
+ mout->errorOut(e, "BatchEngine", "getNextCommand");
+ exit(1);
+ }
+}
/***********************************************************************/
/***********************************************************************/
//remove quotes
listOfCommands = commandString.substr(1, (commandString.length()-1));
+
+ string temppath = path.substr(0, (path.find_last_of('m')));
+
+ //this will happen if you set the path variable to contain mothur's exe location
+ if (temppath == "") {
+
+ string envPath = getenv("PATH");
+
+ //delimiting path char
+ char delim;
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ delim = ':';
+ #else
+ delim = ';';
+ #endif
+
+ //break apart path variable by ':'
+ vector<string> dirs;
+ splitAtChar(envPath, dirs, delim);
+
+ //get path related to mothur
+ string mothurPath = "";
+ for (int i = 0; i < dirs.size(); i++) {
+ //to lower so we can find it
+ string tempLower = "";
+ for (int j = 0; j < dirs[i].length(); j++) { tempLower += tolower(dirs[i][j]); }
+
+ //is this mothurs path?
+ if (tempLower.find("mothur") != -1) { mothurPath = dirs[i]; break; }
+ }
+
+ //add mothur so it looks like what argv would look like
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ mothurPath += "/mothur";
+ #else
+ mothurPath += "\\mothur";
+ #endif
+
+ path = mothurPath;
+ }
globaldata->argv = path;
int quitCommandCalled = 0;
while(quitCommandCalled == 0){
-
+
+ #ifdef USE_MPI
+ int pid, processors;
+ MPI_Status status;
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+ MPI_Comm_size(MPI_COMM_WORLD, &processors);
+
+ if (pid == 0) {
+
+ #endif
+
input = getNextCommand(listOfCommands);
if (input == "") { input = "quit()"; }
mout->mothurOut("mothur > " + input);
mout->mothurOutEndLine();
+ #ifdef USE_MPI
+ //send commandName
+ for(int i = 1; i < processors; i++) {
+ int length = input.length();
+ MPI_Send(&length, 1, MPI_INT, i, 2001, MPI_COMM_WORLD);
+ MPI_Send(&input[0], length, MPI_CHAR, i, 2001, MPI_COMM_WORLD);
+
+ }
+ }else {
+ int length;
+ MPI_Recv(&length, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status);
+ //recieve container
+ char* tempBuf = new char[length];
+ MPI_Recv(&tempBuf[0], length, MPI_CHAR, 0, 2001, MPI_COMM_WORLD, &status);
+
+ input = tempBuf;
+ if (input.length() > length) { input = input.substr(0, length); }
+ delete tempBuf;
+ }
+
+
+ #endif
+
+
if (mout->control_pressed) { input = "quit()"; }
//allow user to omit the () on the quit command
options = parser.getOptionString();
if (commandName != "") {
- mout->executing = true;
- #ifdef USE_MPI
- int pid;
- MPI_Comm_rank(MPI_COMM_WORLD, &pid);
+ 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);
- 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();
- }
+//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 {
+
string nextcommand = "";
int count = 0;
if (commandString.length() == 0) { break; }
}
}
-
+
return nextcommand;
}
catch(exception& e) {
projects / mothur.git / blobdiff