Merge pull request #49042 from fwyzard/alpaka_2.0

Update HeterogeneousCore/AlpakaInterface for alpaka 2.0

Author: cmsbuild

HeterogeneousCore/AlpakaInterface/interface/CachingAllocator.h

@@ -495,7 +495,7 @@ namespace cms::alpakatools {
     // TODO replace with a tbb::concurrent_map ?
     using BusyBlocks = std::map<void*, BlockDescriptor>;  // ordered by the address of the allocated memory
 
-    inline static const std::string deviceType_ = alpaka::core::demangled<Device>;
+    inline static const std::string_view deviceType_ = alpaka::core::demangled<Device>;
 
     mutable std::mutex mutex_;
     Device device_;  // the device where the memory is allocated

HeterogeneousCore/AlpakaInterface/interface/config.h

@@ -62,7 +62,7 @@ namespace alpaka {
 
   template <typename TApi, typename TAcc, typename TDim, typename TIdx, typename TKernelFnObj, typename... TArgs>
   class TaskKernelGpuUniformCudaHipRt final {
-    static_assert(std::is_same_v<TApi, alpaka::ApiCudaRt> and BOOST_LANG_CUDA,
+    static_assert(std::is_same_v<TApi, alpaka::ApiCudaRt> and ALPAKA_LANG_CUDA,
                   "You should move this files to a .dev.cc file under the alpaka/ subdirectory.");
 
   public:
@@ -107,7 +107,7 @@ namespace alpaka {
 
   template <typename TApi, typename TAcc, typename TDim, typename TIdx, typename TKernelFnObj, typename... TArgs>
   class TaskKernelGpuUniformCudaHipRt final {
-    static_assert(std::is_same_v<TApi, alpaka::ApiHipRt> and BOOST_LANG_HIP,
+    static_assert(std::is_same_v<TApi, alpaka::ApiHipRt> and ALPAKA_LANG_HIP,
                   "You should move this files to a .dev.cc file under the alpaka/ subdirectory.");
 
   public:

HeterogeneousCore/AlpakaInterface/test/alpaka/testHistoContainer.dev.cc

@@ -87,10 +87,8 @@ void checkContents(Hist* h,
       ALPAKA_ASSERT_ACC(!l);
     }
   }
-  int status;
-  auto* demangled = abi::__cxa_demangle(typeid(Hist).name(), NULL, NULL, &status);
-  status || printf("Check contents OK with %s\n", demangled);
-  std::free(demangled);
+  std::string_view demangled = alpaka::core::demangled<Hist>;
+  std::cout << "Check contents OK with " << demangled << '\n';
 }
 
 template <typename T>