}
else if (templateFileName == "not open") { abort = true; }
- groupfile = validParameter.validFile(parameters, "group", true);
- if (groupfile == "not open") { abort = true; }
- else if (groupfile == "not found") { groupfile = ""; }
-
+
fastaFileName = validParameter.validFile(parameters, "fasta", false);
if (fastaFileName == "not found") { m->mothurOut("fasta is a required parameter for the classify.seqs command."); m->mothurOutEndLine(); abort = true; }
else {
if (namefileNames.size() != fastaFileNames.size()) { abort = true; m->mothurOut("If you provide a name file, you must have one for each fasta file."); m->mothurOutEndLine(); }
}
+ groupfile = validParameter.validFile(parameters, "group", false);
+ if (groupfile == "not found") { groupfile = ""; }
+ else {
+ splitAtDash(groupfile, groupfileNames);
+
+ //go through files and make sure they are good, if not, then disregard them
+ for (int i = 0; i < groupfileNames.size(); i++) {
+ if (inputDir != "") {
+ string path = hasPath(groupfileNames[i]);
+ //if the user has not given a path then, add inputdir. else leave path alone.
+ if (path == "") { groupfileNames[i] = inputDir + groupfileNames[i]; }
+ }
+ int ableToOpen;
+
+ #ifdef USE_MPI
+ int pid;
+ MPI_Comm_size(MPI_COMM_WORLD, &processors); //set processors to the number of mpi processes running
+ MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are
+
+ if (pid == 0) {
+ #endif
+
+ ifstream in;
+ ableToOpen = openInputFile(groupfileNames[i], in);
+ in.close();
+
+ #ifdef USE_MPI
+ for (int j = 1; j < processors; j++) {
+ MPI_Send(&ableToOpen, 1, MPI_INT, j, 2001, MPI_COMM_WORLD);
+ }
+ }else{
+ MPI_Status status;
+ MPI_Recv(&ableToOpen, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status);
+ }
+
+ #endif
+ if (ableToOpen == 1) { m->mothurOut("Unable to match group file with fasta file, not using " + groupfileNames[i] + "."); m->mothurOutEndLine(); groupfileNames[i] = ""; }
+
+ }
+ }
+
+ if (groupfile != "") {
+ if (groupfileNames.size() != fastaFileNames.size()) { abort = true; m->mothurOut("If you provide a group file, you must have one for each fasta file."); m->mothurOutEndLine(); }
+ }else {
+ for (int i = 0; i < fastaFileNames.size(); i++) { groupfileNames.push_back(""); }
+ }
+
//check for optional parameter and set defaults
// ...at some point should added some additional type checking...
string temp;
//delete inFileName;
if (m->control_pressed) { MPI_File_close(&inMPI); MPI_File_close(&outMPINewTax); MPI_File_close(&outMPITempTax); delete classify; return 0; }
-
- if(namefile != "") { MPIReadNamesFile(namefileNames[s]); }
if (pid == 0) { //you are the root process
//figure out how many sequences you have to align
numSeqsPerProcessor = numFastaSeqs / processors;
- if(pid == (processors - 1)){ numSeqsPerProcessor = numFastaSeqs - pid * numSeqsPerProcessor; }
int startIndex = pid * numSeqsPerProcessor;
+ if(pid == (processors - 1)){ numSeqsPerProcessor = numFastaSeqs - pid * numSeqsPerProcessor; }
+
//align your part
driverMPI(startIndex, numSeqsPerProcessor, inMPI, outMPINewTax, outMPITempTax, MPIPos);
//figure out how many sequences you have to align
numSeqsPerProcessor = numFastaSeqs / processors;
- if(pid == (processors - 1)){ numSeqsPerProcessor = numFastaSeqs - pid * numSeqsPerProcessor; }
int startIndex = pid * numSeqsPerProcessor;
+ if(pid == (processors - 1)){ numSeqsPerProcessor = numFastaSeqs - pid * numSeqsPerProcessor; }
+
//align your part
driverMPI(startIndex, numSeqsPerProcessor, inMPI, outMPINewTax, outMPITempTax, MPIPos);
MPI_File_close(&outMPITempTax);
#else
- //read namefile
- if(namefile != "") {
- nameMap.clear(); //remove old names
-
- ifstream inNames;
- openInputFile(namefileNames[s], inNames);
-
- string firstCol, secondCol;
- while(!inNames.eof()) {
- inNames >> firstCol >> secondCol; gobble(inNames);
- nameMap[firstCol] = getNumNames(secondCol); //ex. seq1 seq1,seq3,seq5 -> seq1 = 3.
- }
- inNames.close();
- }
-
- #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
if(processors == 1){
ifstream inFASTA;
openInputFile(fastaFileNames[s], inFASTA);
#endif
#endif
+ m->mothurOutEndLine();
+ m->mothurOut("It took " + toString(time(NULL) - start) + " secs to classify " + toString(numFastaSeqs) + " sequences."); m->mothurOutEndLine(); m->mothurOutEndLine();
+ start = time(NULL);
+
+
#ifdef USE_MPI
if (pid == 0) { //this part does not need to be paralellized
+
+ if(namefile != "") { m->mothurOut("Reading " + namefileNames[s] + "..."); cout.flush(); MPIReadNamesFile(namefileNames[s]); m->mothurOut(" Done."); m->mothurOutEndLine(); }
+ #else
+ //read namefile
+ if(namefile != "") {
+
+ m->mothurOut("Reading " + namefileNames[s] + "..."); cout.flush();
+
+ nameMap.clear(); //remove old names
+
+ ifstream inNames;
+ openInputFile(namefileNames[s], inNames);
+
+ string firstCol, secondCol;
+ while(!inNames.eof()) {
+ inNames >> firstCol >> secondCol; gobble(inNames);
+
+ vector<string> temp;
+ splitAtComma(secondCol, temp);
+
+ nameMap[firstCol] = temp;
+ }
+ inNames.close();
+
+ m->mothurOut(" Done."); m->mothurOutEndLine();
+ }
#endif
- m->mothurOutEndLine();
- m->mothurOut("It took " + toString(time(NULL) - start) + " secs to classify " + toString(numFastaSeqs) + " sequences."); m->mothurOutEndLine(); m->mothurOutEndLine();
- start = time(NULL);
+ string group = "";
+ if (groupfile != "") { group = groupfileNames[s]; }
- PhyloSummary taxaSum(taxonomyFileName, groupfile);
+ PhyloSummary taxaSum(taxonomyFileName, group);
if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } delete classify; return 0; }
-
+
if (namefile == "") { taxaSum.summarize(tempTaxonomyFile); }
else {
ifstream in;
//read in users taxonomy file and add sequences to tree
string name, taxon;
+
while(!in.eof()){
in >> name >> taxon; gobble(in);
if (itNames == nameMap.end()) {
m->mothurOut(name + " is not in your name file please correct."); m->mothurOutEndLine(); exit(1);
}else{
- for (int i = 0; i < itNames->second; i++) {
- taxaSum.addSeqToTree(name+toString(i), taxon); //add it as many times as there are identical seqs
+ for (int i = 0; i < itNames->second.size(); i++) {
+ taxaSum.addSeqToTree(itNames->second[i], taxon); //add it as many times as there are identical seqs
}
+ itNames->second.clear();
+ nameMap.erase(itNames->first);
}
}
in.close();
m->mothurOut("Output File Names: "); m->mothurOutEndLine();
for (int i = 0; i < outputNames.size(); i++) { m->mothurOut(outputNames[i]); m->mothurOutEndLine(); }
m->mothurOutEndLine();
-
}
delete classify;
string firstCol, secondCol;
while(!iss.eof()) {
iss >> firstCol >> secondCol; gobble(iss);
- nameMap[firstCol] = getNumNames(secondCol); //ex. seq1 seq1,seq3,seq5 -> seq1 = 3.
+
+ vector<string> temp;
+ splitAtComma(secondCol, temp);
+
+ nameMap[firstCol] = temp;
}
MPI_File_close(&inMPI);
projects / mothur.git / blobdiff