Skip to content

Commit 7d98d1e

Browse files
committed
Update HeterogeneousCore/AlpakaInterface for alpaka 2.0
1 parent a115465 commit 7d98d1e

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

HeterogeneousCore/AlpakaInterface/interface/CachingAllocator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ namespace cms::alpakatools {
495495
// TODO replace with a tbb::concurrent_map ?
496496
using BusyBlocks = std::map<void*, BlockDescriptor>; // ordered by the address of the allocated memory
497497

498-
inline static const std::string deviceType_ = alpaka::core::demangled<Device>;
498+
inline static const std::string_view deviceType_ = alpaka::core::demangled<Device>;
499499

500500
mutable std::mutex mutex_;
501501
Device device_; // the device where the memory is allocated

HeterogeneousCore/AlpakaInterface/interface/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace alpaka {
6262

6363
template <typename TApi, typename TAcc, typename TDim, typename TIdx, typename TKernelFnObj, typename... TArgs>
6464
class TaskKernelGpuUniformCudaHipRt final {
65-
static_assert(std::is_same_v<TApi, alpaka::ApiCudaRt> and BOOST_LANG_CUDA,
65+
static_assert(std::is_same_v<TApi, alpaka::ApiCudaRt> and ALPAKA_LANG_CUDA,
6666
"You should move this files to a .dev.cc file under the alpaka/ subdirectory.");
6767

6868
public:
@@ -107,7 +107,7 @@ namespace alpaka {
107107

108108
template <typename TApi, typename TAcc, typename TDim, typename TIdx, typename TKernelFnObj, typename... TArgs>
109109
class TaskKernelGpuUniformCudaHipRt final {
110-
static_assert(std::is_same_v<TApi, alpaka::ApiHipRt> and BOOST_LANG_HIP,
110+
static_assert(std::is_same_v<TApi, alpaka::ApiHipRt> and ALPAKA_LANG_HIP,
111111
"You should move this files to a .dev.cc file under the alpaka/ subdirectory.");
112112

113113
public:

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ void checkContents(Hist* h,
8787
ALPAKA_ASSERT_ACC(!l);
8888
}
8989
}
90-
int status;
91-
auto* demangled = abi::__cxa_demangle(typeid(Hist).name(), NULL, NULL, &status);
92-
status || printf("Check contents OK with %s\n", demangled);
93-
std::free(demangled);
90+
std::string_view demangled = alpaka::core::demangled<Hist>;
91+
std::cout << "Check contents OK with " << demangled << '\n';
9492
}
9593

9694
template <typename T>

0 commit comments

Comments
 (0)