Merge branch 'develop' into reference_points

QMCPACK · Nov 6, 2023 · fb52fb1 · fb52fb1
2 parents 4f99340 + 3875da0
commit fb52fb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Platforms/CUDA/CUDADeviceManager.cpp b/src/Platforms/CUDA/CUDADeviceManager.cpp
@@ -13,8 +13,8 @@
 
 #include "CUDADeviceManager.h"
 #include <stdexcept>
-#include "CUDAruntime.hpp"
 #include "OutputManager.h"
+#include "CUDAruntime.hpp" // Positioned here to avoid conflict between CUDA and GCC >= 12 headers. https://github.com/QMCPACK/qmcpack/pull/4814 
 #include "determineDefaultDeviceNum.h"
 
 namespace qmcplusplus

diff --git a/src/Platforms/OMPTarget/CMakeLists.txt b/src/Platforms/OMPTarget/CMakeLists.txt
@@ -9,7 +9,10 @@
 #// File created by: Ye Luo, [email protected], Argonne National Laboratory
 #//////////////////////////////////////////////////////////////////////////////////////
 
-set(OMP_RT_SRCS OMPallocator.cpp OMPDeviceManager.cpp)
+set(OMP_RT_SRCS OMPallocator.cpp)
+if(ENABLE_OFFLOAD)
+  set(OMP_RT_SRCS ${OMP_RT_SRCS} OMPDeviceManager.cpp)
+endif(ENABLE_OFFLOAD)
 set(OMP_LA_SRCS ompBLAS.cpp)
 
 add_library(platform_omptarget_runtime ${OMP_RT_SRCS})