Merge commit 'c621f8bceb8d879263c1249b2939bab7af4f3e57'

steineggerlab · Jan 5, 2025 · 9fbf02e · 9fbf02e
2 parents 85b3dcb + c621f8b
commit 9fbf02e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/mmseqs/CMakeLists.txt b/lib/mmseqs/CMakeLists.txt
@@ -84,7 +84,11 @@ elseif (HAVE_S390X)
     set(ZARCH 1 CACHE INTERNAL "")
 endif ()
 
-if (NATIVE_ARCH AND (MMSEQS_ARCH STREQUAL ""))
+if (MMSEQS_ARCH)
+    set(NATIVE_ARCH 0 CACHE INTERNAL "")
+endif ()
+
+if (NATIVE_ARCH)
     if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*|aarch64.*|AARCH64.*)")
         set(ARM 1 CACHE INTERNAL "")
     elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "PPC64*|ppc64*|powerpc64*")

diff --git a/lib/mmseqs/src/commons/Parameters.cpp b/lib/mmseqs/src/commons/Parameters.cpp
@@ -1327,7 +1327,6 @@ Parameters::Parameters():
 
     // createindex workflow
     createlinindex = combineList(kmerindexdb, extractorfs);
-    createlinindex = combineList(createlinindex, translatenucs);
     createlinindex.push_back(&PARAM_REMOVE_TMP_FILES);
 
     // linclust workflow

diff --git a/lib/mmseqs/src/taxonomy/NcbiTaxonomy.cpp b/lib/mmseqs/src/taxonomy/NcbiTaxonomy.cpp
@@ -616,8 +616,8 @@ WeightedTaxResult NcbiTaxonomy::weightedMajorityLCA(const std::vector<WeightedTa
         }
         TaxonNode const *node = taxonNode(currTaxId, false);
         if (node == NULL) {
-            Debug(Debug::ERROR) << "taxonid: " << currTaxId << " does not match a legal taxonomy node.\n";
-            EXIT(EXIT_FAILURE);
+            unassignedSeqs++;
+            continue;
         }
         totalAssignedSeqsWeights += currWeight;
         assignedSeqs++;
@@ -707,6 +707,9 @@ WeightedTaxResult NcbiTaxonomy::weightedMajorityLCA(const std::vector<WeightedTa
             continue;
         }
         TaxonNode const *node = taxonNode(currTaxId, false);
+        if (node == NULL) {
+            continue;
+        }
 
         // iterate all ancestors up to the root
         TaxID currParentTaxId = node->parentTaxId;