From c742bf0748c660524e4bce9644463d510fbfdd74 Mon Sep 17 00:00:00 2001 From: Ye Luo Date: Fri, 3 Nov 2023 12:06:08 -0500 Subject: [PATCH 1/2] Simple fix resolving noinline defintion conflict between CUDA header files and GCC. --- src/Platforms/CUDA/CUDADeviceManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Platforms/CUDA/CUDADeviceManager.cpp b/src/Platforms/CUDA/CUDADeviceManager.cpp index 50dbd50dd1..ac028e0cbf 100644 --- a/src/Platforms/CUDA/CUDADeviceManager.cpp +++ b/src/Platforms/CUDA/CUDADeviceManager.cpp @@ -13,8 +13,8 @@ #include "CUDADeviceManager.h" #include -#include "CUDAruntime.hpp" #include "OutputManager.h" +#include "CUDAruntime.hpp" #include "determineDefaultDeviceNum.h" namespace qmcplusplus From 11d7f51cd5cb642ab0d87eddad6dcecf1dc95da4 Mon Sep 17 00:00:00 2001 From: "Paul R. C. Kent" Date: Fri, 3 Nov 2023 13:30:42 -0400 Subject: [PATCH 2/2] Update CUDADeviceManager.cpp Add comment --- src/Platforms/CUDA/CUDADeviceManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Platforms/CUDA/CUDADeviceManager.cpp b/src/Platforms/CUDA/CUDADeviceManager.cpp index ac028e0cbf..e4a8d8428d 100644 --- a/src/Platforms/CUDA/CUDADeviceManager.cpp +++ b/src/Platforms/CUDA/CUDADeviceManager.cpp @@ -14,7 +14,7 @@ #include "CUDADeviceManager.h" #include #include "OutputManager.h" -#include "CUDAruntime.hpp" +#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