From 742be328ce076e6c8f7c8bd0842055b8f7a5ef37 Mon Sep 17 00:00:00 2001 From: Benjamin Worpitz Date: Wed, 13 Mar 2019 10:37:11 +0100 Subject: [PATCH] Replace BOOST_CURRENT_FUNCTION with C++11 __func__ --- include/alpaka/core/Debug.hpp | 6 ++--- include/alpaka/kernel/TaskKernelCpuFibers.hpp | 4 ++-- .../alpaka/kernel/TaskKernelCpuOmp2Blocks.hpp | 8 +++---- .../kernel/TaskKernelCpuOmp2Threads.hpp | 2 +- include/alpaka/kernel/TaskKernelCpuOmp4.hpp | 6 ++--- include/alpaka/kernel/TaskKernelCpuSerial.hpp | 2 +- .../alpaka/kernel/TaskKernelCpuTbbBlocks.hpp | 2 +- .../alpaka/kernel/TaskKernelCpuThreads.hpp | 2 +- include/alpaka/kernel/TaskKernelGpuCudaRt.hpp | 22 +++++++++---------- include/alpaka/kernel/TaskKernelGpuHipRt.hpp | 22 +++++++++---------- include/alpaka/kernel/Traits.hpp | 2 +- include/alpaka/mem/buf/BufCpu.hpp | 2 +- include/alpaka/mem/buf/BufCudaRt.hpp | 6 ++--- include/alpaka/mem/buf/BufHipRt.hpp | 6 ++--- include/alpaka/mem/buf/cpu/Copy.hpp | 2 +- include/alpaka/mem/buf/cpu/Set.hpp | 2 +- include/alpaka/mem/buf/cuda/Copy.hpp | 8 +++---- include/alpaka/mem/buf/hip/Copy.hpp | 8 +++---- include/alpaka/pltf/PltfCudaRt.hpp | 2 +- include/alpaka/pltf/PltfHipRt.hpp | 2 +- test/integ/axpy/src/axpy.cpp | 13 +++++------ 21 files changed, 62 insertions(+), 67 deletions(-) diff --git a/include/alpaka/core/Debug.hpp b/include/alpaka/core/Debug.hpp index 8fd04e0efe7b..e0be7900b695 100644 --- a/include/alpaka/core/Debug.hpp +++ b/include/alpaka/core/Debug.hpp @@ -12,8 +12,6 @@ #include -#include - #include #include @@ -76,7 +74,7 @@ namespace alpaka // Define ALPAKA_DEBUG_MINIMAL_LOG_SCOPE. #if ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL #define ALPAKA_DEBUG_MINIMAL_LOG_SCOPE\ - ::alpaka::core::detail::ScopeLogStdOut const scopeLogStdOut(BOOST_CURRENT_FUNCTION) + ::alpaka::core::detail::ScopeLogStdOut const scopeLogStdOut(__func__) #else #define ALPAKA_DEBUG_MINIMAL_LOG_SCOPE #endif @@ -85,7 +83,7 @@ namespace alpaka // Define ALPAKA_DEBUG_FULL_LOG_SCOPE. #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL #define ALPAKA_DEBUG_FULL_LOG_SCOPE\ - ::alpaka::core::detail::ScopeLogStdOut const scopeLogStdOut(BOOST_CURRENT_FUNCTION) + ::alpaka::core::detail::ScopeLogStdOut const scopeLogStdOut(__func__) #else #define ALPAKA_DEBUG_FULL_LOG_SCOPE #endif diff --git a/include/alpaka/kernel/TaskKernelCpuFibers.hpp b/include/alpaka/kernel/TaskKernelCpuFibers.hpp index fdd4790833ba..2670f935a239 100644 --- a/include/alpaka/kernel/TaskKernelCpuFibers.hpp +++ b/include/alpaka/kernel/TaskKernelCpuFibers.hpp @@ -135,7 +135,7 @@ namespace alpaka m_args)); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " blockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif acc::AccCpuFibers acc( @@ -143,7 +143,7 @@ namespace alpaka blockSharedMemDynSizeBytes); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " Fiber stack idx: " << boost::fibers::fixedsize_stack::traits_type::default_size() << " B" << std::endl; #endif diff --git a/include/alpaka/kernel/TaskKernelCpuOmp2Blocks.hpp b/include/alpaka/kernel/TaskKernelCpuOmp2Blocks.hpp index dc7ecb507b1a..a77859af6595 100644 --- a/include/alpaka/kernel/TaskKernelCpuOmp2Blocks.hpp +++ b/include/alpaka/kernel/TaskKernelCpuOmp2Blocks.hpp @@ -113,7 +113,7 @@ namespace alpaka m_args)); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " blockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif // Bind all arguments except the accelerator. @@ -140,7 +140,7 @@ namespace alpaka if(::omp_in_parallel() != 0) { #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION << " already within a parallel region." << std::endl; + std::cout << __func__ << " already within a parallel region." << std::endl; #endif parallelFn( boundKernelFnObj, @@ -151,7 +151,7 @@ namespace alpaka else { #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION << " opening new parallel region." << std::endl; + std::cout << __func__ << " opening new parallel region." << std::endl; #endif #pragma omp parallel parallelFn( @@ -182,7 +182,7 @@ namespace alpaka } #if ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL - std::cout << BOOST_CURRENT_FUNCTION << " omp_get_num_threads: " << ::omp_get_num_threads() << std::endl; + std::cout << __func__ << " omp_get_num_threads: " << ::omp_get_num_threads() << std::endl; #endif } diff --git a/include/alpaka/kernel/TaskKernelCpuOmp2Threads.hpp b/include/alpaka/kernel/TaskKernelCpuOmp2Threads.hpp index 5648fb3f0a2c..752214d11141 100644 --- a/include/alpaka/kernel/TaskKernelCpuOmp2Threads.hpp +++ b/include/alpaka/kernel/TaskKernelCpuOmp2Threads.hpp @@ -112,7 +112,7 @@ namespace alpaka m_args)); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " blockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif // Bind all arguments except the accelerator. diff --git a/include/alpaka/kernel/TaskKernelCpuOmp4.hpp b/include/alpaka/kernel/TaskKernelCpuOmp4.hpp index e0a03c09dde9..6b9cea6d37e4 100644 --- a/include/alpaka/kernel/TaskKernelCpuOmp4.hpp +++ b/include/alpaka/kernel/TaskKernelCpuOmp4.hpp @@ -112,7 +112,7 @@ namespace alpaka m_args)); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " blockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif // Bind all arguments except the accelerator. @@ -158,7 +158,7 @@ namespace alpaka if((::omp_get_team_num() == 0)) { int const iNumTeams(::omp_get_num_teams()); - printf("%s omp_get_num_teams: %d\n", BOOST_CURRENT_FUNCTION, iNumTeams); + printf("%s omp_get_num_teams: %d\n", __func__, iNumTeams); } #endif acc::AccCpuOmp4 acc( @@ -190,7 +190,7 @@ namespace alpaka if((::omp_get_thread_num() == 0) && (b == 0)) { int const numThreads(::omp_get_num_threads()); - printf("%s omp_get_num_threads: %d\n", BOOST_CURRENT_FUNCTION, numThreads); + printf("%s omp_get_num_threads: %d\n", __func__, numThreads); if(numThreads != static_cast(blockThreadCount)) { throw std::runtime_error("ERROR: The OpenMP runtime did not use the number of threads that had been required!"); diff --git a/include/alpaka/kernel/TaskKernelCpuSerial.hpp b/include/alpaka/kernel/TaskKernelCpuSerial.hpp index 72fd7142d475..4533073d96cd 100644 --- a/include/alpaka/kernel/TaskKernelCpuSerial.hpp +++ b/include/alpaka/kernel/TaskKernelCpuSerial.hpp @@ -105,7 +105,7 @@ namespace alpaka m_args)); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " blockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif // Bind all arguments except the accelerator. diff --git a/include/alpaka/kernel/TaskKernelCpuTbbBlocks.hpp b/include/alpaka/kernel/TaskKernelCpuTbbBlocks.hpp index 24eb9b39adc2..1fcc8b117166 100644 --- a/include/alpaka/kernel/TaskKernelCpuTbbBlocks.hpp +++ b/include/alpaka/kernel/TaskKernelCpuTbbBlocks.hpp @@ -111,7 +111,7 @@ namespace alpaka m_args)); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " blockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif // Bind all arguments except the accelerator. diff --git a/include/alpaka/kernel/TaskKernelCpuThreads.hpp b/include/alpaka/kernel/TaskKernelCpuThreads.hpp index 8d5d79f97165..69e1983efb21 100644 --- a/include/alpaka/kernel/TaskKernelCpuThreads.hpp +++ b/include/alpaka/kernel/TaskKernelCpuThreads.hpp @@ -134,7 +134,7 @@ namespace alpaka m_args)); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " blockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif acc::AccCpuThreads acc( diff --git a/include/alpaka/kernel/TaskKernelGpuCudaRt.hpp b/include/alpaka/kernel/TaskKernelGpuCudaRt.hpp index d42444f2b617..08826419609e 100644 --- a/include/alpaka/kernel/TaskKernelGpuCudaRt.hpp +++ b/include/alpaka/kernel/TaskKernelGpuCudaRt.hpp @@ -302,10 +302,10 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL //std::size_t printfFifoSize; //cudaDeviceGetLimit(&printfFifoSize, cudaLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; //cudaDeviceSetLimit(cudaLimitPrintfFifoSize, printfFifoSize*10); //cudaDeviceGetLimit(&printfFifoSize, cudaLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; #endif auto const gridBlockExtent( workdiv::getWorkDiv(task)); @@ -319,7 +319,7 @@ namespace alpaka kernel::cuda::detail::checkVecOnly3Dim(threadElemExtent); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " gridDim: " << gridDim.z << " " << gridDim.y << " " << gridDim.x << " blockDim: " << blockDim.z << " " << blockDim.y << " " << blockDim.x << std::endl; @@ -350,7 +350,7 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL // Log the block shared memory idx. - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " BlockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif @@ -358,7 +358,7 @@ namespace alpaka // Log the function attributes. cudaFuncAttributes funcAttrs; cudaFuncGetAttributes(&funcAttrs, kernel::cuda::detail::cudaKernel); - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " binaryVersion: " << funcAttrs.binaryVersion << " constSizeBytes: " << funcAttrs.constSizeBytes << " B" << " localSizeBytes: " << funcAttrs.localSizeBytes << " B" @@ -424,10 +424,10 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL //std::size_t printfFifoSize; //cudaDeviceGetLimit(&printfFifoSize, cudaLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; //cudaDeviceSetLimit(cudaLimitPrintfFifoSize, printfFifoSize*10); //cudaDeviceGetLimit(&printfFifoSize, cudaLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; #endif auto const gridBlockExtent( workdiv::getWorkDiv(task)); @@ -441,8 +441,8 @@ namespace alpaka kernel::cuda::detail::checkVecOnly3Dim(threadElemExtent); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION << "gridDim: " << gridDim.z << " " << gridDim.y << " " << gridDim.x << std::endl; - std::cout << BOOST_CURRENT_FUNCTION << "blockDim: " << blockDim.z << " " << blockDim.y << " " << blockDim.x << std::endl; + std::cout << __func__ << "gridDim: " << gridDim.z << " " << gridDim.y << " " << gridDim.x << std::endl; + std::cout << __func__ << "blockDim: " << blockDim.z << " " << blockDim.y << " " << blockDim.x << std::endl; #endif #if ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL @@ -470,7 +470,7 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL // Log the block shared memory idx. - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " BlockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif @@ -478,7 +478,7 @@ namespace alpaka // Log the function attributes. cudaFuncAttributes funcAttrs; cudaFuncGetAttributes(&funcAttrs, kernel::cuda::detail::cudaKernel); - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " binaryVersion: " << funcAttrs.binaryVersion << " constSizeBytes: " << funcAttrs.constSizeBytes << " B" << " localSizeBytes: " << funcAttrs.localSizeBytes << " B" diff --git a/include/alpaka/kernel/TaskKernelGpuHipRt.hpp b/include/alpaka/kernel/TaskKernelGpuHipRt.hpp index 05062682f437..5586eed76de6 100644 --- a/include/alpaka/kernel/TaskKernelGpuHipRt.hpp +++ b/include/alpaka/kernel/TaskKernelGpuHipRt.hpp @@ -306,10 +306,10 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL //std::size_t printfFifoSize; //hipDeviceGetLimit(&printfFifoSize, hipLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; //hipDeviceSetLimit(hipLimitPrintfFifoSize, printfFifoSize*10); //hipDeviceGetLimit(&printfFifoSize, hipLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; #endif auto const gridBlockExtent( workdiv::getWorkDiv(task)); @@ -323,7 +323,7 @@ namespace alpaka kernel::hip::detail::checkVecOnly3Dim(threadElemExtent); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " gridDim: " << gridDim.z << " " << gridDim.y << " " << gridDim.x << " blockDim: " << blockDim.z << " " << blockDim.y << " " << blockDim.x << std::endl; @@ -360,7 +360,7 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL // Log the block shared memory size. - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " BlockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif @@ -368,7 +368,7 @@ namespace alpaka // Log the function attributes. /*hipFuncAttributes funcAttrs; hipFuncGetAttributes(&funcAttrs, kernel::hip::detail::hipKernel); - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " binaryVersion: " << funcAttrs.binaryVersion << " constSizeBytes: " << funcAttrs.constSizeBytes << " B" << " localSizeBytes: " << funcAttrs.localSizeBytes << " B" @@ -438,10 +438,10 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL //std::size_t printfFifoSize; //hipDeviceGetLimit(&printfFifoSize, hipLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; //hipDeviceSetLimit(hipLimitPrintfFifoSize, printfFifoSize*10); //hipDeviceGetLimit(&printfFifoSize, hipLimitPrintfFifoSize); - //std::cout << BOOST_CURRENT_FUNCTION << "INFO: printfFifoSize: " << printfFifoSize << std::endl; + //std::cout << __func__ << "INFO: printfFifoSize: " << printfFifoSize << std::endl; #endif auto const gridBlockExtent( workdiv::getWorkDiv(task)); @@ -455,8 +455,8 @@ namespace alpaka kernel::hip::detail::checkVecOnly3Dim(threadElemExtent); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION << "gridDim: " << gridDim.z << " " << gridDim.y << " " << gridDim.x << std::endl; - std::cout << BOOST_CURRENT_FUNCTION << "blockDim: " << blockDim.z << " " << blockDim.y << " " << blockDim.x << std::endl; + std::cout << __func__ << "gridDim: " << gridDim.z << " " << gridDim.y << " " << gridDim.x << std::endl; + std::cout << __func__ << "blockDim: " << blockDim.z << " " << blockDim.y << " " << blockDim.x << std::endl; #endif #if ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL @@ -484,7 +484,7 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL // Log the block shared memory size. - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " BlockSharedMemDynSizeBytes: " << blockSharedMemDynSizeBytes << " B" << std::endl; #endif @@ -493,7 +493,7 @@ namespace alpaka // Log the function attributes. /*hipFuncAttributes funcAttrs; hipFuncGetAttributes(&funcAttrs, kernel::hip::detail::hipKernel); - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " binaryVersion: " << funcAttrs.binaryVersion << " constSizeBytes: " << funcAttrs.constSizeBytes << " B" << " localSizeBytes: " << funcAttrs.localSizeBytes << " B" diff --git a/include/alpaka/kernel/Traits.hpp b/include/alpaka/kernel/Traits.hpp index 991ba89400fe..bc7d03a2f6c7 100644 --- a/include/alpaka/kernel/Traits.hpp +++ b/include/alpaka/kernel/Traits.hpp @@ -205,7 +205,7 @@ namespace alpaka "The idx type of TAcc and the idx type of TWorkDiv have to be identical!"); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " gridBlockExtent: " << workdiv::getWorkDiv(workDiv) << ", blockThreadExtent: " << workdiv::getWorkDiv(workDiv) << std::endl; diff --git a/include/alpaka/mem/buf/BufCpu.hpp b/include/alpaka/mem/buf/BufCpu.hpp index 2c38202b2427..ef4e4ee9fd35 100644 --- a/include/alpaka/mem/buf/BufCpu.hpp +++ b/include/alpaka/mem/buf/BufCpu.hpp @@ -81,7 +81,7 @@ namespace alpaka "The idx type of TExtent and the TIdx template parameter have to be identical!"); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " e: " << m_extentElements << " ptr: " << static_cast(m_pMem) << " pitch: " << m_pitchBytes diff --git a/include/alpaka/mem/buf/BufCudaRt.hpp b/include/alpaka/mem/buf/BufCudaRt.hpp index fbe9ecf1a221..11926340bfd0 100644 --- a/include/alpaka/mem/buf/BufCudaRt.hpp +++ b/include/alpaka/mem/buf/BufCudaRt.hpp @@ -349,7 +349,7 @@ namespace alpaka static_cast(widthBytes))); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << width << " ewb: " << widthBytes << " ptr: " << memPtr @@ -404,7 +404,7 @@ namespace alpaka ALPAKA_ASSERT(pitchBytes >= static_cast(widthBytes) || (width * height) == 0); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << width << " eh: " << height << " ewb: " << widthBytes @@ -460,7 +460,7 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << extent::getWidth(extent) << " eh: " << cudaExtentVal.height << " ed: " << cudaExtentVal.depth diff --git a/include/alpaka/mem/buf/BufHipRt.hpp b/include/alpaka/mem/buf/BufHipRt.hpp index 3644bbc49277..a1ed2404072a 100644 --- a/include/alpaka/mem/buf/BufHipRt.hpp +++ b/include/alpaka/mem/buf/BufHipRt.hpp @@ -349,7 +349,7 @@ namespace alpaka static_cast(widthBytes))); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << width << " ewb: " << widthBytes << " ptr: " << memPtr @@ -411,7 +411,7 @@ namespace alpaka } #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << width << " eh: " << height << " ewb: " << widthBytes @@ -473,7 +473,7 @@ namespace alpaka } #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << extent::getWidth(extent) << " eh: " << hipExtentVal.height << " ed: " << hipExtentVal.depth diff --git a/include/alpaka/mem/buf/cpu/Copy.hpp b/include/alpaka/mem/buf/cpu/Copy.hpp index 3c13b3d398cb..f2650b54bac1 100644 --- a/include/alpaka/mem/buf/cpu/Copy.hpp +++ b/include/alpaka/mem/buf/cpu/Copy.hpp @@ -106,7 +106,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " e: " << m_extent << " ewb: " << this->m_extentWidthBytes << " de: " << m_dstExtent diff --git a/include/alpaka/mem/buf/cpu/Set.hpp b/include/alpaka/mem/buf/cpu/Set.hpp index cb2089ecce6d..8c1a84b125ed 100644 --- a/include/alpaka/mem/buf/cpu/Set.hpp +++ b/include/alpaka/mem/buf/cpu/Set.hpp @@ -87,7 +87,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " e: " << this->m_extent << " ewb: " << this->m_extentWidthBytes << " de: " << this->m_dstExtent diff --git a/include/alpaka/mem/buf/cuda/Copy.hpp b/include/alpaka/mem/buf/cuda/Copy.hpp index 9fe322bd04ab..5d5a5a689903 100644 --- a/include/alpaka/mem/buf/cuda/Copy.hpp +++ b/include/alpaka/mem/buf/cuda/Copy.hpp @@ -115,7 +115,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ddev: " << m_iDstDevice << " ew: " << m_extentWidth << " ewb: " << m_extentWidthBytes @@ -213,7 +213,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << m_extentWidth << " eh: " << m_extentHeight << " ewb: " << m_extentWidthBytes @@ -336,7 +336,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << m_extentWidth << " eh: " << m_extentHeight << " ed: " << m_extentDepth @@ -412,7 +412,7 @@ namespace alpaka ALPAKA_CUDA_RT_CHECK(cudaDeviceCanAccessPeer(&canAccessPeer, devSrc, devDst)); if(!canAccessPeer) { #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " Direct peer access between given GPUs is not possible!" << " src=" << devSrc << " dst=" << devDst diff --git a/include/alpaka/mem/buf/hip/Copy.hpp b/include/alpaka/mem/buf/hip/Copy.hpp index cbc61e8b6acd..504602a9867b 100644 --- a/include/alpaka/mem/buf/hip/Copy.hpp +++ b/include/alpaka/mem/buf/hip/Copy.hpp @@ -114,7 +114,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ddev: " << m_iDstDevice << " ew: " << m_extentWidth << " ewb: " << m_extentWidthBytes @@ -213,7 +213,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << m_extentWidth << " eh: " << m_extentHeight << " ewb: " << m_extentWidthBytes @@ -335,7 +335,7 @@ namespace alpaka ALPAKA_FN_HOST auto printDebug() const -> void { - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " ew: " << m_extentWidth << " eh: " << m_extentHeight << " ed: " << m_extentDepth @@ -411,7 +411,7 @@ namespace alpaka ALPAKA_HIP_RT_CHECK(hipDeviceCanAccessPeer(&canAccessPeer, devSrc, devDst)); if(!canAccessPeer) { #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " Direct peer access between given GPUs is not possible!" << " src=" << devSrc << " dst=" << devDst diff --git a/include/alpaka/pltf/PltfCudaRt.hpp b/include/alpaka/pltf/PltfCudaRt.hpp index ffcfa4551f76..8bfac5e96850 100644 --- a/include/alpaka/pltf/PltfCudaRt.hpp +++ b/include/alpaka/pltf/PltfCudaRt.hpp @@ -115,7 +115,7 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL printDeviceProperties(devProp); #elif ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL - std::cout << BOOST_CURRENT_FUNCTION << devProp.name << std::endl; + std::cout << __func__ << devProp.name << std::endl; #endif } else diff --git a/include/alpaka/pltf/PltfHipRt.hpp b/include/alpaka/pltf/PltfHipRt.hpp index 65fd739d601c..6d0a81cba66f 100644 --- a/include/alpaka/pltf/PltfHipRt.hpp +++ b/include/alpaka/pltf/PltfHipRt.hpp @@ -117,7 +117,7 @@ namespace alpaka #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL printDeviceProperties(devProp); #elif ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL - std::cout << BOOST_CURRENT_FUNCTION << devProp.name << std::endl; + std::cout << __func__ << devProp.name << std::endl; #endif } else diff --git a/test/integ/axpy/src/axpy.cpp b/test/integ/axpy/src/axpy.cpp index 5d773b39b643..194bde2158ca 100644 --- a/test/integ/axpy/src/axpy.cpp +++ b/test/integ/axpy/src/axpy.cpp @@ -7,9 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include - #include #include @@ -152,12 +149,12 @@ void operator()() Val const alpha( dist(eng) ); #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL - std::cout << BOOST_CURRENT_FUNCTION + std::cout << __func__ << " alpha: " << alpha << std::endl; - std::cout << BOOST_CURRENT_FUNCTION << " X_host: "; + std::cout << __func__ << " X_host: "; alpaka::mem::view::print(memBufHostX, std::cout); std::cout << std::endl; - std::cout << BOOST_CURRENT_FUNCTION << " Y_host: "; + std::cout << __func__ << " Y_host: "; alpaka::mem::view::print(memBufHostOrigY, std::cout); std::cout << std::endl; #endif @@ -173,10 +170,10 @@ void operator()() #if ALPAKA_DEBUG >= ALPAKA_DEBUG_FULL alpaka::wait::wait(queue); - std::cout << BOOST_CURRENT_FUNCTION << " X_Dev: "; + std::cout << __func__ << " X_Dev: "; alpaka::mem::view::print(memBufHostX, std::cout); std::cout << std::endl; - std::cout << BOOST_CURRENT_FUNCTION << " Y_Dev: "; + std::cout << __func__ << " Y_Dev: "; alpaka::mem::view::print(memBufHostX, std::cout); std::cout << std::endl; #endif