From 128eebf05e9b0770c66cf47798ce908cac928201 Mon Sep 17 00:00:00 2001 From: Antonio Sánchez Date: Fri, 19 Feb 2021 17:09:16 +0000 Subject: Revert "add EIGEN_DEVICE_FUNC to EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF macros (only if not HIPCC)." This reverts commit 12fd3dd655e37ba26e7ab236d32163e0aa35da39 --- Eigen/src/Core/util/Memory.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'Eigen/src/Core/util') diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index bb9144d2f..14713aaa7 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -781,48 +781,31 @@ template void swap(scoped_array &a,scoped_array &b) #else #if EIGEN_MAX_ALIGN_BYTES!=0 -#if !defined(EIGEN_HIPCC) - #define EIGEN_DEVICE_FUNC_NO_HIPCC EIGEN_DEVICE_FUNC -#else - #define EIGEN_DEVICE_FUNC_NO_HIPCC -#endif #define EIGEN_MAKE_ALIGNED_OPERATOR_NEW_NOTHROW(NeedsToAlign) \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void* operator new(std::size_t size, const std::nothrow_t&) EIGEN_NO_THROW { \ EIGEN_TRY { return Eigen::internal::conditional_aligned_malloc(size); } \ EIGEN_CATCH (...) { return 0; } \ } #define EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF(NeedsToAlign) \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void *operator new(std::size_t size) { \ return Eigen::internal::conditional_aligned_malloc(size); \ } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void *operator new[](std::size_t size) { \ return Eigen::internal::conditional_aligned_malloc(size); \ } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void operator delete(void * ptr) EIGEN_NO_THROW { Eigen::internal::conditional_aligned_free(ptr); } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void operator delete[](void * ptr) EIGEN_NO_THROW { Eigen::internal::conditional_aligned_free(ptr); } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void operator delete(void * ptr, std::size_t /* sz */) EIGEN_NO_THROW { Eigen::internal::conditional_aligned_free(ptr); } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void operator delete[](void * ptr, std::size_t /* sz */) EIGEN_NO_THROW { Eigen::internal::conditional_aligned_free(ptr); } \ /* in-place new and delete. since (at least afaik) there is no actual */ \ /* memory allocated we can safely let the default implementation handle */ \ /* this particular case. */ \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ static void *operator new(std::size_t size, void *ptr) { return ::operator new(size,ptr); } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ static void *operator new[](std::size_t size, void* ptr) { return ::operator new[](size,ptr); } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void operator delete(void * memory, void *ptr) EIGEN_NO_THROW { return ::operator delete(memory,ptr); } \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void operator delete[](void * memory, void *ptr) EIGEN_NO_THROW { return ::operator delete[](memory,ptr); } \ /* nothrow-new (returns zero instead of std::bad_alloc) */ \ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_NOTHROW(NeedsToAlign) \ - EIGEN_DEVICE_FUNC_NO_HIPCC \ void operator delete(void *ptr, const std::nothrow_t&) EIGEN_NO_THROW { \ Eigen::internal::conditional_aligned_free(ptr); \ } \ -- cgit v1.2.3