From 8430f8b9349d43b0e9d8428b6c3e194bd264aa7c Mon Sep 17 00:00:00 2001 From: mehmet yusufoglu Date: Tue, 17 Dec 2024 17:08:34 +0100 Subject: [PATCH] Replace directory name cuda_hip with cuda-hip to fix amalgamation --- include/alpaka/dev/DevUniformCudaHipRt.hpp | 3 ++- include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp | 3 ++- .../alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp | 3 ++- include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp | 2 +- include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp | 2 +- .../queue/{cuda_hip => cuda-hip}/QueueUniformCudaHipRt.hpp | 0 6 files changed, 8 insertions(+), 5 deletions(-) rename include/alpaka/queue/{cuda_hip => cuda-hip}/QueueUniformCudaHipRt.hpp (100%) diff --git a/include/alpaka/dev/DevUniformCudaHipRt.hpp b/include/alpaka/dev/DevUniformCudaHipRt.hpp index 9954a969c755..44e6961692c2 100644 --- a/include/alpaka/dev/DevUniformCudaHipRt.hpp +++ b/include/alpaka/dev/DevUniformCudaHipRt.hpp @@ -15,7 +15,6 @@ #include "alpaka/platform/Traits.hpp" #include "alpaka/queue/Properties.hpp" #include "alpaka/queue/Traits.hpp" -#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp" #include "alpaka/traits/Traits.hpp" #include "alpaka/wait/Traits.hpp" @@ -23,6 +22,8 @@ #include #include +#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp" + #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED) namespace alpaka diff --git a/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp b/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp index 53bbaf67529f..091f8de1c8ea 100644 --- a/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp +++ b/include/alpaka/kernel/TaskKernelGpuUniformCudaHipRt.hpp @@ -21,13 +21,14 @@ #include "alpaka/kernel/Traits.hpp" #include "alpaka/platform/Traits.hpp" #include "alpaka/queue/Traits.hpp" -#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp" #include "alpaka/workdiv/WorkDivHelpers.hpp" #include "alpaka/workdiv/WorkDivMembers.hpp" #include #include #include + +#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp" #if ALPAKA_DEBUG >= ALPAKA_DEBUG_MINIMAL # include #endif diff --git a/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp b/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp index 137670abe7ab..2dde758dc6f9 100644 --- a/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp +++ b/include/alpaka/mem/global/DeviceGlobalUniformCudaHipBuiltIn.hpp @@ -7,7 +7,8 @@ #include "alpaka/dev/DevUniformCudaHipRt.hpp" #include "alpaka/mem/global/Traits.hpp" #include "alpaka/mem/view/ViewPlainPtr.hpp" -#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp" + +#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp" #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED) diff --git a/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp b/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp index 5add0ef21aee..93ea56f8dae5 100644 --- a/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp +++ b/include/alpaka/queue/QueueUniformCudaHipRtBlocking.hpp @@ -4,7 +4,7 @@ #pragma once -#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp" +#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp" #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED) diff --git a/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp b/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp index 62b0b0f08842..8172f3342739 100644 --- a/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp +++ b/include/alpaka/queue/QueueUniformCudaHipRtNonBlocking.hpp @@ -4,7 +4,7 @@ #pragma once -#include "alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp" +#include "alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp" #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED) diff --git a/include/alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp b/include/alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp similarity index 100% rename from include/alpaka/queue/cuda_hip/QueueUniformCudaHipRt.hpp rename to include/alpaka/queue/cuda-hip/QueueUniformCudaHipRt.hpp