Merge pull request #1485 from lattice/hotfix/ccomplex

Hotfix/ccomplex

Author: maddyscientist

CMakeLists.txt

@@ -425,6 +425,15 @@ if(QUDA_DOWNLOAD_EIGEN)
     SYSTEM YES)
   target_include_directories(Eigen SYSTEM INTERFACE ${Eigen_SOURCE_DIR})
   install(DIRECTORY ${Eigen_SOURCE_DIR}/Eigen TYPE INCLUDE)
+
+  # Eigen 3.4 needs to be patched on Neon with nvc++
+  if (${CMAKE_CXX_COMPILER_ID} MATCHES "NVHPC")
+    set(CMAKE_PATCH_EIGEN OFF CACHE BOOL "Internal use only; do not modify")
+    if (NOT CMAKE_PATCH_EIGEN)
+      execute_process(COMMAND patch -N "${Eigen_SOURCE_DIR}/Eigen/src/Core/arch/NEON/Complex.h" "${CMAKE_SOURCE_DIR}/cmake/eigen34_neon.diff")
+      set(CMAKE_PATCH_EIGEN ON CACHE BOOL "Internal use only; do not modify" FORCE)
+    endif()
+  endif()
 else()
   # fall back to using find_package
   find_package(Eigen QUIET)

cmake/eigen34_neon.diff

@@ -0,0 +1,8 @@
+21c21
+< #if EIGEN_COMP_CLANG || EIGEN_COMP_CASTXML
+---
+> #if EIGEN_COMP_CLANG || EIGEN_COMP_CASTXML || __NVCOMPILER_LLVM__
+393c393
+< #if EIGEN_COMP_CLANG || EIGEN_COMP_CASTXML
+---
+> #if EIGEN_COMP_CLANG || EIGEN_COMP_CASTXML || __NVCOMPILER_LLVM__

include/kernels/spinor_dilute.cuh

@@ -29,7 +29,7 @@ namespace quda {
     static constexpr int nColor = nColor_;
     static constexpr QudaDilutionType type = type_;
     static constexpr int max_dilution_size = get_size<nSpin, nColor>(type);
-    using V = typename colorspinor_mapper<store_t, nSpin, nColor>::type;
+    using V = typename colorspinor_mapper<store_t, nSpin, nColor, false, false, true>::type;
     int dilution_size;
     V v[max_dilution_size];
     V src;

lib/communicator_stack.cpp

@@ -27,14 +27,20 @@ namespace quda
   static Communicator &get_default_communicator()
   {
     auto search = communicator_stack.find(default_comm_key);
-    if (search == communicator_stack.end()) { errorQuda("Default communicator can't be found."); }
+    if (search == communicator_stack.end()) {
+      fprintf(getOutputFile(), "Default communicator can't be found\n");
+      comm_abort(1);
+    }
     return search->second;
   }
 
   Communicator &get_current_communicator()
   {
     auto search = communicator_stack.find(current_key);
-    if (search == communicator_stack.end()) { errorQuda("Current communicator can't be found."); }
+    if (search == communicator_stack.end()) {
+      fprintf(getOutputFile(), "Current communicator can't be found\n");
+      comm_abort(1);
+    }
     return search->second;
   }
 

lib/interface_quda.cpp

@@ -4,7 +4,6 @@
 #include <cstring>
 #include <iostream>
 #include <sys/time.h>
-#include <complex.h>
 
 #include <quda.h>
 #include <quda_internal.h>

lib/spinor_dilute.in.cu

@@ -87,13 +87,7 @@ namespace quda
                     const lat_dim_t &local_block, IntList<Nc, N...>)
   {
     if (src.Ncolor() == Nc) {
-      if constexpr (Nc <= 32) {
-        SpinorDilute<real, Ns, Nc>(src, v, type, local_block);
-      } else {
-        errorQuda(
-          "nColor = %d is too large to compile, see QUDA issue #1422 (https://github.com/lattice/quda/issues/1422)",
-          src.Ncolor());
-      }
+      SpinorDilute<real, Ns, Nc>(src, v, type, local_block);
     } else {
       if constexpr (sizeof...(N) > 0)
         spinorDilute<real, Ns>(src, v, type, local_block, IntList<N...>());

lib/targets/cuda/blas_lapack_cublas.cpp

@@ -1,4 +1,3 @@
-#include <complex.h>
 #include <blas_lapack.h>
 #include <timer.h>
 #ifdef NATIVE_LAPACK_LIB

tests/staggered_eigensolve_test_gtest.hpp

@@ -65,8 +65,7 @@ bool skip_test(test_t test_param)
     case QUDA_EIG_IR_ARNOLDI:
       // if (spectrum == QUDA_SPECTRUM_LI_EIG || spectrum == QUDA_SPECTRUM_SI_EIG) return true;
       return true; // we skip this because it takes an unnecessarily long time and it's covered elsewhere
-      break;
-    default: return true; break;
+    default: return true;
     }
   } else if (combo_solve_type == QUDA_DIRECT_SOLVE) {
     // mat
@@ -94,10 +93,10 @@ bool skip_test(test_t test_param)
       case QUDA_EIG_IR_ARNOLDI:
         if (spectrum == QUDA_SPECTRUM_LI_EIG || spectrum == QUDA_SPECTRUM_SI_EIG) return true;
         break;
-      default: return true; break;
+      default: return true;
       }
       break;
-    default: return true; break;
+    default: return true;
     }
   }
   return false;