small fix

jinluchang · Jan 5, 2025 · 9dac145 · 9dac145
1 parent 6f1227b
commit 9dac145
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/nixpkgs/qlat_utils.nix b/nixpkgs/qlat_utils.nix
@@ -97,7 +97,11 @@ in
         cp -pv "${../qcore/bin/NVCC.py}" "$PWD/NVCC.py"
         patchShebangs --build "$PWD/NVCC.py"
         #
-        export NVCC_OPTIONS="-w -std=c++17 -arch=${nvcc-arch} --expt-extended-lambda --expt-relaxed-constexpr -fopenmp -fno-strict-aliasing" # -D__DEBUG_VECUTILS__
+        GXX=""
+        GXX+=" -Xcudafe '--diag_suppress=20014'"
+        GXX="-w"
+        #
+        export NVCC_OPTIONS="-std=c++17 -arch=${nvcc-arch} --expt-extended-lambda --expt-relaxed-constexpr -fopenmp -fno-strict-aliasing $GXX" # -D__DEBUG_VECUTILS__
         export QLAT_CXX="$PWD/NVCC.py -ccbin c++ $NVCC_OPTIONS"
         export QLAT_MPICXX="$PWD/NVCC.py -ccbin mpic++ $NVCC_OPTIONS"
         export QLAT_CXXFLAGS="--NVCC-compile -D__QLAT_BARYON_SHARED_SMALL__" # -fPIC

diff --git a/qcore/bin/NVCC.py b/qcore/bin/NVCC.py
@@ -231,6 +231,7 @@ def parse_omit_flags(self):
             "-Wextra",
             "-Wpedantic",
             "-Xcompiler",
+            "-Xcudafe",
             "-MD",
             ])
         opt1_pool = set([

diff --git a/qlat/qlat/include/qlat/qm-action.h b/qlat/qlat/include/qlat/qm-action.h
@@ -222,7 +222,7 @@ struct QMAction {
     return rtn;
   }
 
-  qacc double action_point(QMAction& qma, const Field<double>& f, const Geometry& geo, Coordinate xl)
+  inline double action_point(QMAction& qma, const Field<double>& f, const Geometry& geo, Coordinate xl)
   {
     // Returns the contribution to the total action from a single lattice
     // point (including the relavent neighbor interactions)
@@ -250,7 +250,7 @@ struct QMAction {
     fd.init(geo_r);
     // Loops over every lattice point in the current node
     QMAction& qma = *this;
-    qacc_for(index, geo_r.local_volume(), {
+    qthread_for(index, geo_r.local_volume(), {
       const Geometry& geo = f.geo();
       const Coordinate xl = geo.coordinate_from_index(index);
       fd.get_elem(index) = qma.action_point(qma, f, geo, xl);
@@ -306,7 +306,7 @@ struct QMAction {
     // from each point
     FieldM<double, 1> fd;
     fd.init(geo_r);
-    qacc_for(index, geo_r.local_volume(), {
+    qthread_for(index, geo_r.local_volume(), {
       const Geometry& geo_r = fd.geo();
       Coordinate xl = geo_r.coordinate_from_index(index);
       double s=0;
@@ -368,7 +368,7 @@ struct QMAction {
   {
     TIMER("QMAction.hmc_field_evolve");
     const Geometry& geo = f.geo();
-    qacc_for(index, geo.local_volume(), {
+    qthread_for(index, geo.local_volume(), {
       const Geometry& geo = f.geo();
       const Coordinate xl = geo.coordinate_from_index(index);
       Vector<double> f_v = f.get_elems(xl);