Merge branch 'develop' into mar2023_gpu_misc

2023-03-13 19:02:20 -04:00
parent 4b434c9a03 2d8936068e
commit 92302d0f22
135 changed files with 7476 additions and 3189 deletions
--- a/lib/gpu/lal_atom.cpp
+++ b/lib/gpu/lal_atom.cpp
@ -401,7 +401,7 @@ double AtomT::host_memory_usage() const {
  return _max_atoms*atom_bytes*sizeof(numtyp)+sizeof(Atom<numtyp,acctyp>);
 }

-#ifdef USE_CUDPP
+#if defined(USE_CUDPP) || defined(USE_HIP_DEVICE_SORT)
 #define USE_CUDPP_ARG(arg) arg
 #else
 #define USE_CUDPP_ARG(arg)