Merge pull request #5049 from ye-luo/remove-vendor-name

Avoid mentioning GPU vendor names
QMCPACK · Jun 19, 2024 · 2bfdcec · 2bfdcec
2 parents bc50453 + 95f38fd
commit 2bfdcec
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/QMCWaveFunctions/Fermion/SlaterDetBuilder.cpp b/src/QMCWaveFunctions/Fermion/SlaterDetBuilder.cpp
@@ -393,7 +393,7 @@ std::unique_ptr<DiracDeterminantBase> SlaterDetBuilder::putDeterminant(
 #if defined(ENABLE_CUDA) && defined(ENABLE_OFFLOAD)
       if (CPUOMPTargetVendorSelector::selectPlatform(useGPU) == PlatformKind::CUDA)
       {
-        app_summary() << "      Running on an NVIDIA GPU via CUDA acceleration and OpenMP offload." << std::endl;
+        app_summary() << "      Running on a GPU via CUDA/HIP acceleration and OpenMP offload." << std::endl;
         adet = std::make_unique<DiracDeterminantBatched<PlatformKind::CUDA, QMCTraits::ValueType, QMCTraits::QTFull::ValueType>>(std::move(psi_clone),
                                                                                           firstIndex, lastIndex,
                                                                                           delay_rank,
@@ -404,7 +404,7 @@ std::unique_ptr<DiracDeterminantBase> SlaterDetBuilder::putDeterminant(
 #if defined(ENABLE_SYCL) && defined(ENABLE_OFFLOAD)
       if (CPUOMPTargetVendorSelector::selectPlatform(useGPU) == PlatformKind::SYCL)
       {
-        app_summary() << "      Running on an Intel GPU via SYCL acceleration and OpenMP offload." << std::endl;
+        app_summary() << "      Running on a GPU via SYCL acceleration and OpenMP offload." << std::endl;
         adet = std::make_unique<DiracDeterminantBatched<PlatformKind::SYCL, QMCTraits::ValueType, QMCTraits::QTFull::ValueType>>(std::move(psi_clone),
                                                                                           firstIndex, lastIndex,
                                                                                           delay_rank,
@@ -416,9 +416,9 @@ std::unique_ptr<DiracDeterminantBase> SlaterDetBuilder::putDeterminant(
 #if defined(ENABLE_OFFLOAD)
         if (CPUOMPTargetVendorSelector::selectPlatform(useGPU) == PlatformKind::CPU)
           throw std::runtime_error("No pure CPU implementation of walker-batched Slater determinant.");
-        app_summary() << "      Running OpenMP offload code path on GPU. " << std::endl;
+        app_summary() << "      Running OpenMP offload code path on a GPU. " << std::endl;
 #else
-        app_summary() << "      Running OpenMP offload code path on CPU. " << std::endl;
+        app_summary() << "      Running OpenMP offload code path on a CPU. " << std::endl;
 #endif
         adet = std::make_unique<DiracDeterminantBatched<PlatformKind::OMPTARGET, QMCTraits::ValueType, QMCTraits::QTFull::ValueType>>(std::move(psi_clone), firstIndex, lastIndex, delay_rank,
                                                            matrix_inverter_kind);
@@ -431,11 +431,7 @@ std::unique_ptr<DiracDeterminantBase> SlaterDetBuilder::putDeterminant(
 #if defined(ENABLE_CUDA)
       else if (CPUOMPTargetVendorSelector::selectPlatform(useGPU) == PlatformKind::CUDA)
       {
-#ifdef QMC_CUDA2HIP
-        app_summary() << "      Running on an AMD GPU via HIP acceleration." << std::endl;
-#else
-        app_summary() << "      Running on an NVIDIA GPU via CUDA acceleration." << std::endl;
-#endif
+        app_summary() << "      Running on a GPU via CUDA/HIP acceleration." << std::endl;
         adet = std::make_unique<
             DiracDeterminant<DelayedUpdateCUDA<ValueType, QMCTraits::QTFull::ValueType>>>(std::move(psi_clone),
                                                                                           firstIndex, lastIndex,