Merge branch 'HXOptims' of https://bitbucket.org/dftfedevelopers/dftfe …

…into HXOptims
Rudra2302 · Mar 15, 2024 · e017c2f · e017c2f
2 parents 413cfc5 + b297588
commit e017c2f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/include/MPICommunicatorP2P.h b/include/MPICommunicatorP2P.h
@@ -28,9 +28,12 @@
 #include <MemoryStorage.h>
 #include <DataTypeOverloads.h>
 #include <dftfeDataTypes.h>
-#if defined(DFTFE_WITH_CUDA_NCCL) || defined(DFTFE_WITH_HIP_RCCL)
+#if defined(DFTFE_WITH_CUDA_NCCL)
 # include <nccl.h>
 # include <DeviceTypeConfig.h>
+#elif defined(DFTFE_WITH_HIP_RCCL)
+# include <rccl.h>
+# include <DeviceTypeConfig.h>
 #endif
 
 

diff --git a/include/deviceDirectCCLWrapper.h b/include/deviceDirectCCLWrapper.h
@@ -22,9 +22,15 @@
 # include <complex>
 # include <mpi.h>
 # include <DeviceTypeConfig.h>
-# if defined(DFTFE_WITH_CUDA_NCCL) || defined(DFTFE_WITH_HIP_RCCL)
-# include <nccl.h>
-# endif
+
+# if defined(DFTFE_WITH_CUDA_NCCL)
+# include <nccl.h>
+# include <DeviceTypeConfig.h>
+# elif defined(DFTFE_WITH_HIP_RCCL)
+# include <rccl.h>
+# include <DeviceTypeConfig.h>
+# endif
+
 namespace dftfe
 {
  namespace utils