diff --git a/CLUEstering/alpaka/CLUE/Run.h b/CLUEstering/BindingModules/Run.hpp similarity index 96% rename from CLUEstering/alpaka/CLUE/Run.h rename to CLUEstering/BindingModules/Run.hpp index d64ed45a..38737c92 100644 --- a/CLUEstering/alpaka/CLUE/Run.h +++ b/CLUEstering/BindingModules/Run.hpp @@ -2,8 +2,7 @@ #pragma once #include - -#include "CLUEAlgoAlpaka.h" +#include "CLUEstering/CLUEstering.hpp" namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE { diff --git a/CLUEstering/alpaka/BindingModules/binding_cpu.cc b/CLUEstering/BindingModules/binding_cpu.cpp similarity index 99% rename from CLUEstering/alpaka/BindingModules/binding_cpu.cc rename to CLUEstering/BindingModules/binding_cpu.cpp index 69682871..3fa55490 100644 --- a/CLUEstering/alpaka/BindingModules/binding_cpu.cc +++ b/CLUEstering/BindingModules/binding_cpu.cpp @@ -2,7 +2,7 @@ #include #include -#include "../CLUE/Run.h" +#include "Run.hpp" #include #include diff --git a/CLUEstering/alpaka/BindingModules/binding_cpu_tbb.cc b/CLUEstering/BindingModules/binding_cpu_tbb.cpp similarity index 99% rename from CLUEstering/alpaka/BindingModules/binding_cpu_tbb.cc rename to CLUEstering/BindingModules/binding_cpu_tbb.cpp index 965c9ad2..a23d3eab 100644 --- a/CLUEstering/alpaka/BindingModules/binding_cpu_tbb.cc +++ b/CLUEstering/BindingModules/binding_cpu_tbb.cpp @@ -2,7 +2,7 @@ #include #include -#include "../CLUE/Run.h" +#include "Run.hpp" #include #include diff --git a/CLUEstering/alpaka/BindingModules/binding_gpu_cuda.cc b/CLUEstering/BindingModules/binding_gpu_cuda.cpp similarity index 98% rename from CLUEstering/alpaka/BindingModules/binding_gpu_cuda.cc rename to CLUEstering/BindingModules/binding_gpu_cuda.cpp index 5c2e017b..919e99a0 100644 --- a/CLUEstering/alpaka/BindingModules/binding_gpu_cuda.cc +++ b/CLUEstering/BindingModules/binding_gpu_cuda.cpp @@ -1,14 +1,13 @@ + #include #include -#include "../CLUE/Run.h" +#include "Run.hpp" #include #include #include -using cms::alpakatools::initialise; - namespace alpaka_cuda_async { void listDevices(const std::string& backend) { const char tab = '\t'; diff --git a/CLUEstering/alpaka/BindingModules/binding_gpu_hip.cc b/CLUEstering/BindingModules/binding_gpu_hip.cpp similarity index 99% rename from CLUEstering/alpaka/BindingModules/binding_gpu_hip.cc rename to CLUEstering/BindingModules/binding_gpu_hip.cpp index faa4f701..28c582f4 100644 --- a/CLUEstering/alpaka/BindingModules/binding_gpu_hip.cc +++ b/CLUEstering/BindingModules/binding_gpu_hip.cpp @@ -1,7 +1,8 @@ + #include #include -#include "../CLUE/Run.h" +#include "Run.hpp" #include #include diff --git a/CLUEstering/alpaka/BindingModules/binding_kernels.cc b/CLUEstering/BindingModules/binding_kernels.cpp similarity index 90% rename from CLUEstering/alpaka/BindingModules/binding_kernels.cc rename to CLUEstering/BindingModules/binding_kernels.cpp index 6f4ad54c..5805056c 100644 --- a/CLUEstering/alpaka/BindingModules/binding_kernels.cc +++ b/CLUEstering/BindingModules/binding_kernels.cpp @@ -1,5 +1,5 @@ -#include "../CLUE/ConvolutionalKernel.h" +#include "CLUEstering/CLUE/ConvolutionalKernel.hpp" #include #include diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d2b1391..8a4e42c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,12 +40,14 @@ if(NOT DEFINED SERIAL_ONLY) set(SERIAL_ONLY OFF) endif() +include_directories(include) + # create lib directory in CLUEstering folder execute_process(COMMAND mkdir -p ./CLUEstering/lib) # Convolutional Kernels compile convolutional kernel module pybind11_add_module(CLUE_Convolutional_Kernels SHARED - ./CLUEstering/alpaka/BindingModules/binding_kernels.cc) + CLUEstering/BindingModules/binding_kernels.cpp) target_include_directories( CLUE_Convolutional_Kernels PRIVATE ${alpaka_SOURCE_DIR}/include ${Boost_SOURCE_DIR}) @@ -69,7 +71,7 @@ endforeach() # CPU Serial compile cpu serial module pybind11_add_module(CLUE_CPU_Serial SHARED - ./CLUEstering/alpaka/BindingModules/binding_cpu.cc) + CLUEstering/BindingModules/binding_cpu.cpp) target_include_directories(CLUE_CPU_Serial PRIVATE ${alpaka_SOURCE_DIR}/include ${Boost_SOURCE_DIR}) # alpaka build flags @@ -95,7 +97,7 @@ if(NOT ${SERIAL_ONLY}) if(TBB_FOUND) # compile cpu tbb module pybind11_add_module(CLUE_CPU_TBB SHARED - ./CLUEstering/alpaka/BindingModules/binding_cpu_tbb.cc) + CLUEstering/BindingModules/binding_cpu_tbb.cpp) target_include_directories(CLUE_CPU_TBB PRIVATE ${alpaka_SOURCE_DIR}/include ${Boost_SOURCE_DIR}) target_compile_options( @@ -138,7 +140,7 @@ if((NOT ${CPU_ONLY}) AND (NOT ${SERIAL_ONLY})) PROPERTIES LANGUAGE CUDA) # compile gpu cuda module pybind11_add_module(CLUE_GPU_CUDA SHARED - ./CLUEstering/alpaka/BindingModules/binding_gpu_cuda.cc) + CLUEstering/BindingModules/binding_gpu_cuda.cpp) target_include_directories( CLUE_GPU_CUDA PRIVATE ${alpaka_SOURCE_DIR}/include ${Boost_SOURCE_DIR}) # set the cuda architectures @@ -179,7 +181,7 @@ if((NOT ${CPU_ONLY}) AND (NOT ${SERIAL_ONLY})) set(CMAKE_CXX_COMPILER "${hip_BASE}/bin/hipcc") # compile gpu hip module pybind11_add_module(CLUE_GPU_HIP SHARED - ./CLUEstering/alpaka/BindingModules/binding_gpu_hip.cc) + CLUEstering/BindingModules/binding_gpu_hip.cpp) target_include_directories(CLUE_GPU_HIP PRIVATE ${alpaka_SOURCE_DIR}/include ${Boost_SOURCE_DIR}) # alpaka build flags diff --git a/benchmark/dataset_size/CMakeLists.txt b/benchmark/dataset_size/CMakeLists.txt index c5a7f5a1..e0c39a7c 100644 --- a/benchmark/dataset_size/CMakeLists.txt +++ b/benchmark/dataset_size/CMakeLists.txt @@ -63,10 +63,10 @@ if(NOT DEFINED SERIAL_ONLY) endif() # include source directories -include_directories(../../CLUEstering/alpaka/) +include_directories(../../include/) # CPU Serial -add_executable(serial.out main.cc) +add_executable(serial.out main.cpp) target_include_directories(serial.out PRIVATE ${alpaka_PATH}) target_link_libraries(serial.out PRIVATE pybind11::embed) # link boost @@ -90,7 +90,7 @@ if(NOT ${SERIAL_ONLY}) # CPU TBB if(TBB_FOUND) # compile cpu tbb module - add_executable(tbb.out main.cc) + add_executable(tbb.out main.cpp) target_include_directories(tbb.out PRIVATE ${alpaka_PATH}) target_link_libraries(tbb.out PRIVATE pybind11::embed) target_link_libraries(tbb.out PRIVATE ${Boost_LIBRARIES}) @@ -129,9 +129,9 @@ if((NOT ${CPU_ONLY}) AND (NOT ${SERIAL_ONLY})) set(CMAKE_CUDA_FLAGS "-Wall -Wextra -g -O2") # compile the file with .cc extension using nvcc - set_source_files_properties(main.cc PROPERTIES LANGUAGE CUDA) + set_source_files_properties(main.cpp PROPERTIES LANGUAGE CUDA) # compile gpu cuda module - add_executable(cuda.out main.cc) + add_executable(cuda.out main.cpp) target_include_directories(cuda.out PRIVATE ${alpaka_PATH}) target_link_libraries(cuda.out PRIVATE pybind11::embed) # link boost @@ -164,7 +164,7 @@ if((NOT ${CPU_ONLY}) AND (NOT ${SERIAL_ONLY})) # set(hip_BASE "${hip_INCLUDE_DIRS}/..") # set the hipcc compiler # set(CMAKE_CXX_COMPILER "${hip_BASE}/bin/hipcc") # compile gpu hip module - # add_executable(hip.out main.cc) # link boost target_link_libraries(hip.out + # add_executable(hip.out main.cpp) # link boost target_link_libraries(hip.out # PRIVATE ${Boost_LIBRARIES}) target_include_directories(hip.out PRIVATE # ${Boost_PATH}) # alpaka build flags target_compile_options( hip.out PRIVATE # -DALPAKA_ACC_GPU_HIP_PRESENT -DALPAKA_ACC_GPU_HIP_ENABLED diff --git a/benchmark/dataset_size/main.cc b/benchmark/dataset_size/main.cpp similarity index 97% rename from benchmark/dataset_size/main.cc rename to benchmark/dataset_size/main.cpp index 632d46b3..16624a0b 100644 --- a/benchmark/dataset_size/main.cc +++ b/benchmark/dataset_size/main.cpp @@ -8,10 +8,9 @@ #include #include -#include "CLUE/CLUEAlgoAlpaka.h" -#include "CLUE/Run.h" -#include "DataFormats/Points.h" -#include "DataFormats/alpaka/PointsAlpaka.h" +#include "CLUEstering/CLUEstering.hpp" +#include "CLUEstering/DataFormats/Points.hpp" +#include "CLUEstering/DataFormats/alpaka/PointsAlpaka.hpp" #include "read_csv.hpp" diff --git a/benchmark/dataset_size/read_csv.hpp b/benchmark/dataset_size/read_csv.hpp index 60266979..962c9c1f 100644 --- a/benchmark/dataset_size/read_csv.hpp +++ b/benchmark/dataset_size/read_csv.hpp @@ -8,7 +8,7 @@ #include #include -#include "DataFormats/alpaka/AlpakaVecArray.h" +#include "CLUEstering/DataFormats/alpaka/AlpakaVecArray.hpp" using clue::VecArray; diff --git a/benchmark/profiling/CMakeLists.txt b/benchmark/profiling/CMakeLists.txt index 37fb837d..a3e0affe 100644 --- a/benchmark/profiling/CMakeLists.txt +++ b/benchmark/profiling/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16.0) project(Profiling LANGUAGES CXX) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -61,10 +61,10 @@ if(NOT DEFINED SERIAL_ONLY) endif() # include source directories -include_directories(../../CLUEstering/alpaka/) +include_directories(../../include/) # CPU Serial -add_executable(serial.out main.cc) +add_executable(serial.out main.cpp) target_include_directories(serial.out PRIVATE ${alpaka_PATH}) # link boost target_link_libraries(serial.out PRIVATE ${Boost_LIBRARIES}) @@ -87,7 +87,7 @@ if(NOT ${SERIAL_ONLY}) # CPU TBB if(TBB_FOUND) # compile cpu tbb module - add_executable(tbb.out main.cc) + add_executable(tbb.out main.cpp) target_include_directories(tbb.out PRIVATE ${alpaka_PATH}) target_link_libraries(tbb.out PRIVATE ${Boost_LIBRARIES}) target_include_directories(tbb.out PRIVATE ${Boost_PATH}) @@ -118,16 +118,16 @@ if((NOT ${CPU_ONLY}) AND (NOT ${SERIAL_ONLY})) # set the CUDA standard if(NOT DEFINED CMAKE_CUDA_STANDARD) - set(CMAKE_CUDA_STANDARD 17) + set(CMAKE_CUDA_STANDARD 20) set(CMAKE_CUDA_STANDARD_REQUIRED ON) endif() set(CMAKE_CUDA_FLAGS "-Wall -Wextra -g -O2") # compile the file with .cc extension using nvcc - set_source_files_properties(main.cc PROPERTIES LANGUAGE CUDA) + set_source_files_properties(main.cpp PROPERTIES LANGUAGE CUDA) # compile gpu cuda module - add_executable(cuda.out main.cc) + add_executable(cuda.out main.cpp) target_include_directories(cuda.out PRIVATE ${alpaka_PATH}) # link boost target_link_libraries(cuda.out PRIVATE ${Boost_LIBRARIES}) @@ -159,7 +159,7 @@ if((NOT ${CPU_ONLY}) AND (NOT ${SERIAL_ONLY})) # set(hip_BASE "${hip_INCLUDE_DIRS}/..") # set the hipcc compiler # set(CMAKE_CXX_COMPILER "${hip_BASE}/bin/hipcc") # compile gpu hip module - # add_executable(hip.out main.cc) # link boost target_link_libraries(hip.out + # add_executable(hip.out main.cpp) # link boost target_link_libraries(hip.out # PRIVATE ${Boost_LIBRARIES}) target_include_directories(hip.out PRIVATE # ${Boost_PATH}) # alpaka build flags target_compile_options( hip.out PRIVATE # -DALPAKA_ACC_GPU_HIP_PRESENT -DALPAKA_ACC_GPU_HIP_ENABLED diff --git a/benchmark/profiling/main.cc b/benchmark/profiling/main.cpp similarity index 81% rename from benchmark/profiling/main.cc rename to benchmark/profiling/main.cpp index 07313be3..8c1de9fe 100644 --- a/benchmark/profiling/main.cc +++ b/benchmark/profiling/main.cpp @@ -4,10 +4,9 @@ #include #include -#include "CLUE/CLUEAlgoAlpaka.h" -#include "CLUE/Run.h" -#include "DataFormats/Points.h" -#include "DataFormats/alpaka/PointsAlpaka.h" +#include "CLUEstering/CLUEstering.hpp" +#include "CLUEstering/DataFormats/Points.hpp" +#include "CLUEstering/DataFormats/alpaka/PointsAlpaka.hpp" #include "read_csv.hpp" @@ -31,6 +30,5 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE_CLUE { int main(int argc, char* argv[]) { auto input_file{std::string(argv[1])}; - using ALPAKA_ACCELERATOR_NAMESPACE_CLUE; - run(input_file); + ALPAKA_ACCELERATOR_NAMESPACE_CLUE::run(input_file); } diff --git a/benchmark/profiling/read_csv.hpp b/benchmark/profiling/read_csv.hpp index 60266979..962c9c1f 100644 --- a/benchmark/profiling/read_csv.hpp +++ b/benchmark/profiling/read_csv.hpp @@ -8,7 +8,7 @@ #include #include -#include "DataFormats/alpaka/AlpakaVecArray.h" +#include "CLUEstering/DataFormats/alpaka/AlpakaVecArray.hpp" using clue::VecArray; diff --git a/CLUEstering/alpaka/AlpakaCore/AllocatorConfig.h b/include/CLUEstering/AlpakaCore/AllocatorConfig.hpp similarity index 100% rename from CLUEstering/alpaka/AlpakaCore/AllocatorConfig.h rename to include/CLUEstering/AlpakaCore/AllocatorConfig.hpp diff --git a/CLUEstering/alpaka/AlpakaCore/AllocatorPolicy.h b/include/CLUEstering/AlpakaCore/AllocatorPolicy.hpp similarity index 100% rename from CLUEstering/alpaka/AlpakaCore/AllocatorPolicy.h rename to include/CLUEstering/AlpakaCore/AllocatorPolicy.hpp diff --git a/CLUEstering/alpaka/AlpakaCore/CachedBufAlloc.h b/include/CLUEstering/AlpakaCore/CachedBufAlloc.hpp similarity index 98% rename from CLUEstering/alpaka/AlpakaCore/CachedBufAlloc.h rename to include/CLUEstering/AlpakaCore/CachedBufAlloc.hpp index 579cd79d..2f19e664 100644 --- a/CLUEstering/alpaka/AlpakaCore/CachedBufAlloc.h +++ b/include/CLUEstering/AlpakaCore/CachedBufAlloc.hpp @@ -3,8 +3,8 @@ #include -#include "getDeviceCachingAllocator.h" -#include "getHostCachingAllocator.h" +#include "getDeviceCachingAllocator.hpp" +#include "getHostCachingAllocator.hpp" namespace clue { diff --git a/CLUEstering/alpaka/AlpakaCore/CachingAllocator.h b/include/CLUEstering/AlpakaCore/CachingAllocator.hpp similarity index 99% rename from CLUEstering/alpaka/AlpakaCore/CachingAllocator.h rename to include/CLUEstering/AlpakaCore/CachingAllocator.hpp index b31663d6..445b3ef0 100644 --- a/CLUEstering/alpaka/AlpakaCore/CachingAllocator.h +++ b/include/CLUEstering/AlpakaCore/CachingAllocator.hpp @@ -16,7 +16,7 @@ #include -#include "alpakaDevices.h" +#include "alpakaDevices.hpp" // Inspired by cub::CachingDeviceAllocator diff --git a/CLUEstering/alpaka/AlpakaCore/alpaka/initialise.cc b/include/CLUEstering/AlpakaCore/alpaka/initialise.cpp similarity index 88% rename from CLUEstering/alpaka/AlpakaCore/alpaka/initialise.cc rename to include/CLUEstering/AlpakaCore/alpaka/initialise.cpp index 244ee59d..d9c82f38 100644 --- a/CLUEstering/alpaka/AlpakaCore/alpaka/initialise.cc +++ b/include/CLUEstering/AlpakaCore/alpaka/initialise.cpp @@ -2,10 +2,10 @@ #include -#include "../alpakaConfig.h" -#include "../alpakaDevices.h" -#include "../initialise.h" -#include "../demangle.h" +#include "../alpakaConfig.hpp" +#include "../alpakaDevices.hpp" +#include "../initialise.hpp" +#include "../demangle.hpp" namespace clue { diff --git a/CLUEstering/alpaka/AlpakaCore/alpakaConfig.h b/include/CLUEstering/AlpakaCore/alpakaConfig.hpp similarity index 99% rename from CLUEstering/alpaka/AlpakaCore/alpakaConfig.h rename to include/CLUEstering/AlpakaCore/alpakaConfig.hpp index b6c63345..46436b75 100644 --- a/CLUEstering/alpaka/AlpakaCore/alpakaConfig.h +++ b/include/CLUEstering/AlpakaCore/alpakaConfig.hpp @@ -1,7 +1,7 @@ #pragma once -#include "alpakaFwd.h" +#include "alpakaFwd.hpp" #include namespace alpaka_common { diff --git a/CLUEstering/alpaka/AlpakaCore/alpakaDevices.h b/include/CLUEstering/AlpakaCore/alpakaDevices.hpp similarity index 96% rename from CLUEstering/alpaka/AlpakaCore/alpakaDevices.h rename to include/CLUEstering/AlpakaCore/alpakaDevices.hpp index af59afa3..6b9bb26b 100644 --- a/CLUEstering/alpaka/AlpakaCore/alpakaDevices.h +++ b/include/CLUEstering/AlpakaCore/alpakaDevices.hpp @@ -6,8 +6,8 @@ #include -#include "alpakaConfig.h" -#include "getDeviceIndex.h" +#include "alpakaConfig.hpp" +#include "getDeviceIndex.hpp" namespace clue { // returns the alpaka accelerator platform diff --git a/CLUEstering/alpaka/AlpakaCore/alpakaFwd.h b/include/CLUEstering/AlpakaCore/alpakaFwd.hpp similarity index 100% rename from CLUEstering/alpaka/AlpakaCore/alpakaFwd.h rename to include/CLUEstering/AlpakaCore/alpakaFwd.hpp diff --git a/CLUEstering/alpaka/AlpakaCore/alpakaMemory.h b/include/CLUEstering/AlpakaCore/alpakaMemory.hpp similarity index 98% rename from CLUEstering/alpaka/AlpakaCore/alpakaMemory.h rename to include/CLUEstering/AlpakaCore/alpakaMemory.hpp index 2a1015d9..1be3cd09 100644 --- a/CLUEstering/alpaka/AlpakaCore/alpakaMemory.h +++ b/include/CLUEstering/AlpakaCore/alpakaMemory.hpp @@ -2,7 +2,7 @@ #pragma once #include -#include "initialise.h" +#include "initialise.hpp" #if __cplusplus >= 202002L namespace cms { @@ -28,10 +28,10 @@ namespace cms { #include -#include "AllocatorPolicy.h" -#include "CachedBufAlloc.h" -#include "alpakaConfig.h" -#include "alpakaDevices.h" +#include "AllocatorPolicy.hpp" +#include "CachedBufAlloc.hpp" +#include "alpakaConfig.hpp" +#include "alpakaDevices.hpp" namespace clue { diff --git a/CLUEstering/alpaka/AlpakaCore/alpakaWorkDiv.h b/include/CLUEstering/AlpakaCore/alpakaWorkDiv.hpp similarity index 99% rename from CLUEstering/alpaka/AlpakaCore/alpakaWorkDiv.h rename to include/CLUEstering/AlpakaCore/alpakaWorkDiv.hpp index d7705f21..a6c4ef35 100644 --- a/CLUEstering/alpaka/AlpakaCore/alpakaWorkDiv.h +++ b/include/CLUEstering/AlpakaCore/alpakaWorkDiv.hpp @@ -6,7 +6,7 @@ #include -#include "alpakaConfig.h" +#include "alpakaConfig.hpp" using namespace alpaka_common; diff --git a/CLUEstering/alpaka/AlpakaCore/chooseDevice.h b/include/CLUEstering/AlpakaCore/chooseDevice.hpp similarity index 90% rename from CLUEstering/alpaka/AlpakaCore/chooseDevice.h rename to include/CLUEstering/AlpakaCore/chooseDevice.hpp index eba5d451..b16a6f9b 100644 --- a/CLUEstering/alpaka/AlpakaCore/chooseDevice.h +++ b/include/CLUEstering/AlpakaCore/chooseDevice.hpp @@ -1,8 +1,8 @@ #pragma once -#include "alpakaConfig.h" -#include "alpakaDevices.h" +#include "alpakaConfig.hpp" +#include "alpakaDevices.hpp" namespace clue { diff --git a/CLUEstering/alpaka/AlpakaCore/getDeviceCachingAllocator.h b/include/CLUEstering/AlpakaCore/getDeviceCachingAllocator.hpp similarity index 93% rename from CLUEstering/alpaka/AlpakaCore/getDeviceCachingAllocator.h rename to include/CLUEstering/AlpakaCore/getDeviceCachingAllocator.hpp index e2ac8059..e4a9c82c 100644 --- a/CLUEstering/alpaka/AlpakaCore/getDeviceCachingAllocator.h +++ b/include/CLUEstering/AlpakaCore/getDeviceCachingAllocator.hpp @@ -5,11 +5,11 @@ #include #include -#include "AllocatorConfig.h" -#include "CachingAllocator.h" -#include "alpakaDevices.h" -#include "alpakaFwd.h" -#include "getDeviceIndex.h" +#include "AllocatorConfig.hpp" +#include "CachingAllocator.hpp" +#include "alpakaDevices.hpp" +#include "alpakaFwd.hpp" +#include "getDeviceIndex.hpp" namespace clue { diff --git a/CLUEstering/alpaka/AlpakaCore/getDeviceIndex.h b/include/CLUEstering/AlpakaCore/getDeviceIndex.hpp similarity index 100% rename from CLUEstering/alpaka/AlpakaCore/getDeviceIndex.h rename to include/CLUEstering/AlpakaCore/getDeviceIndex.hpp diff --git a/CLUEstering/alpaka/AlpakaCore/getHostCachingAllocator.h b/include/CLUEstering/AlpakaCore/getHostCachingAllocator.hpp similarity index 86% rename from CLUEstering/alpaka/AlpakaCore/getHostCachingAllocator.h rename to include/CLUEstering/AlpakaCore/getHostCachingAllocator.hpp index 70bca8f7..d7280559 100644 --- a/CLUEstering/alpaka/AlpakaCore/getHostCachingAllocator.h +++ b/include/CLUEstering/AlpakaCore/getHostCachingAllocator.hpp @@ -1,9 +1,9 @@ #pragma once -#include "AllocatorConfig.h" -#include "CachingAllocator.h" -#include "alpakaDevices.h" +#include "AllocatorConfig.hpp" +#include "CachingAllocator.hpp" +#include "alpakaDevices.hpp" namespace clue { diff --git a/CLUEstering/alpaka/AlpakaCore/initialise.h b/include/CLUEstering/AlpakaCore/initialise.hpp similarity index 95% rename from CLUEstering/alpaka/AlpakaCore/initialise.h rename to include/CLUEstering/AlpakaCore/initialise.hpp index fc07dda4..dbc272da 100644 --- a/CLUEstering/alpaka/AlpakaCore/initialise.h +++ b/include/CLUEstering/AlpakaCore/initialise.hpp @@ -1,7 +1,7 @@ #pragma once -#include "alpakaConfig.h" +#include "alpakaConfig.hpp" namespace clue { diff --git a/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h b/include/CLUEstering/CLUE/CLUEAlpakaKernels.hpp similarity index 98% rename from CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h rename to include/CLUEstering/CLUE/CLUEAlpakaKernels.hpp index 5f721909..30622b7e 100644 --- a/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h +++ b/include/CLUEstering/CLUE/CLUEAlpakaKernels.hpp @@ -5,11 +5,11 @@ #include #include -#include "../AlpakaCore/alpakaWorkDiv.h" -#include "../DataFormats/alpaka/PointsAlpaka.h" -#include "../DataFormats/alpaka/TilesAlpaka.h" -#include "../DataFormats/alpaka/AlpakaVecArray.h" -#include "ConvolutionalKernel.h" +#include "../AlpakaCore/alpakaWorkDiv.hpp" +#include "../DataFormats/alpaka/PointsAlpaka.hpp" +#include "../DataFormats/alpaka/TilesAlpaka.hpp" +#include "../DataFormats/alpaka/AlpakaVecArray.hpp" +#include "ConvolutionalKernel.hpp" using clue::VecArray; diff --git a/CLUEstering/alpaka/CLUE/ConvolutionalKernel.h b/include/CLUEstering/CLUE/ConvolutionalKernel.hpp similarity index 100% rename from CLUEstering/alpaka/CLUE/ConvolutionalKernel.h rename to include/CLUEstering/CLUE/ConvolutionalKernel.hpp diff --git a/CLUEstering/alpaka/CLUE/CLUEAlgoAlpaka.h b/include/CLUEstering/CLUEstering.hpp similarity index 97% rename from CLUEstering/alpaka/CLUE/CLUEAlgoAlpaka.h rename to include/CLUEstering/CLUEstering.hpp index baa27a05..d7b86fb3 100644 --- a/CLUEstering/alpaka/CLUE/CLUEAlgoAlpaka.h +++ b/include/CLUEstering/CLUEstering.hpp @@ -6,19 +6,15 @@ #include #include #include -#include #include -#include -#include -#include #include #include -#include "../DataFormats/Points.h" -#include "../DataFormats/alpaka/PointsAlpaka.h" -#include "../DataFormats/alpaka/TilesAlpaka.h" -#include "CLUEAlpakaKernels.h" -#include "ConvolutionalKernel.h" +#include "DataFormats/Points.hpp" +#include "DataFormats/alpaka/PointsAlpaka.hpp" +#include "DataFormats/alpaka/TilesAlpaka.hpp" +#include "CLUE/CLUEAlpakaKernels.hpp" +#include "CLUE/ConvolutionalKernel.hpp" using clue::VecArray; diff --git a/CLUEstering/alpaka/DataFormats/Points.h b/include/CLUEstering/DataFormats/Points.hpp similarity index 96% rename from CLUEstering/alpaka/DataFormats/Points.h rename to include/CLUEstering/DataFormats/Points.hpp index 893839b4..21047154 100644 --- a/CLUEstering/alpaka/DataFormats/Points.h +++ b/include/CLUEstering/DataFormats/Points.hpp @@ -1,7 +1,7 @@ #pragma once -#include "alpaka/AlpakaVecArray.h" +#include "alpaka/AlpakaVecArray.hpp" #include using clue::VecArray; diff --git a/CLUEstering/alpaka/DataFormats/alpaka/AlpakaVecArray.h b/include/CLUEstering/DataFormats/alpaka/AlpakaVecArray.hpp similarity index 100% rename from CLUEstering/alpaka/DataFormats/alpaka/AlpakaVecArray.h rename to include/CLUEstering/DataFormats/alpaka/AlpakaVecArray.hpp diff --git a/CLUEstering/alpaka/DataFormats/alpaka/PointsAlpaka.h b/include/CLUEstering/DataFormats/alpaka/PointsAlpaka.hpp similarity index 94% rename from CLUEstering/alpaka/DataFormats/alpaka/PointsAlpaka.h rename to include/CLUEstering/DataFormats/alpaka/PointsAlpaka.hpp index d5197191..bb6eae29 100644 --- a/CLUEstering/alpaka/DataFormats/alpaka/PointsAlpaka.h +++ b/include/CLUEstering/DataFormats/alpaka/PointsAlpaka.hpp @@ -4,10 +4,10 @@ #include #include -#include "../../AlpakaCore/alpakaConfig.h" -#include "../../AlpakaCore/alpakaMemory.h" -#include "AlpakaVecArray.h" -#include "../Points.h" +#include "../../AlpakaCore/alpakaConfig.hpp" +#include "../../AlpakaCore/alpakaMemory.hpp" +#include "AlpakaVecArray.hpp" +#include "../Points.hpp" using clue::VecArray; diff --git a/CLUEstering/alpaka/DataFormats/alpaka/TilesAlpaka.h b/include/CLUEstering/DataFormats/alpaka/TilesAlpaka.hpp similarity index 96% rename from CLUEstering/alpaka/DataFormats/alpaka/TilesAlpaka.h rename to include/CLUEstering/DataFormats/alpaka/TilesAlpaka.hpp index 7fca8d5c..0cb17f3a 100644 --- a/CLUEstering/alpaka/DataFormats/alpaka/TilesAlpaka.h +++ b/include/CLUEstering/DataFormats/alpaka/TilesAlpaka.hpp @@ -7,10 +7,10 @@ #include #include -#include "../../AlpakaCore/alpakaWorkDiv.h" -#include "../../AlpakaCore/alpakaConfig.h" -#include "../../AlpakaCore/alpakaMemory.h" -#include "AlpakaVecArray.h" +#include "../../AlpakaCore/alpakaWorkDiv.hpp" +#include "../../AlpakaCore/alpakaConfig.hpp" +#include "../../AlpakaCore/alpakaMemory.hpp" +#include "AlpakaVecArray.hpp" using clue::VecArray; diff --git a/setup.py b/setup.py index 993aab01..5e925577 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup import subprocess -__version__ = "2.3.1" +__version__ = "2.3.2" this_directory = Path(__file__).parent long_description = (this_directory/'README.md').read_text()