Merge branch 'main' into splines-release

CMakeLists.txt

@@ -12,10 +12,6 @@ option(BUILD_DOCUMENTATION   "Build DDC documentation/website" OFF)
 option(BUILD_EXAMPLES        "Build DDC examples" ON)
 option(DDC_BUILD_PDI_WRAPPER "Build DDC PDI wrapper" ON)
 option(DDC_ENABLE_DOUBLE     "Build DDC with double precision support, float is used otherwise" ON)
-option(HIP_FOR_NVIDIA 		 "Use the HIP wrapper for CUDA on NVIDIA plateforms, for development purpose" OFF)
-if(NOT(Kokkos_ENABLE_CUDA) AND HIP_FOR_NVIDIA)
-	message(FATAL_ERROR "Kokkos_ENABLE_CUDA has to be ON to use HIP wrapper on NVIDIA plateforms")
-endif()
 
 # Dependencies
 
@@ -101,7 +97,7 @@ if("${BUILD_FFT_KERNEL}" AND NOT FFTW_FOUND)
 endif()
 
 ## CUDA + CUDAToolkit
-if("${BUILD_FFT_KERNEL}" AND "${Kokkos_ENABLE_CUDA}" AND NOT("${HIP_FOR_NVIDIA}"))
+if("${BUILD_FFT_KERNEL}" AND "${Kokkos_ENABLE_CUDA}")
 	find_package( CUDAToolkit MODULE REQUIRED )
 	if( NOT(CUDAToolkit_FOUND) ) 
 	  message(FATAL_ERROR "CUDAToolkit not found." )
@@ -239,30 +235,6 @@ if("${Kokkos_ENABLE_HIP}")
 	target_compile_definitions(DDC INTERFACE hipfft_AVAIL)
 endif()
 
-if("${BUILD_FFT_KERNEL}" AND "${HIP_FOR_NVIDIA}")
-	find_package( HIP REQUIRED )
-
-	target_include_directories(DDC
-	SYSTEM INTERFACE
-	"$<BUILD_INTERFACE:${HIP_ROOT_DIR}/include>"
-	)
-	target_compile_definitions(DDC INTERFACE hip_AVAIL)
-	target_compile_definitions(DDC INTERFACE HIP_FOR_NVIDIA)
-
-	if( DEFINED HIP_TOOLKIT_PATH ) # Usually called ROCM_PATH in the HIP documentation. By default : /opt/rocm
-		list( APPEND CMAKE_PREFIX_PATH ${HIP_TOOLKIT_PATH}/hipfft/lib )
-		find_library(HIPFFT_LIB  hipfft REQUIRED)
-		target_link_libraries( DDC INTERFACE ${HIPFFT_LIB} )	
-		target_include_directories(DDC
-		SYSTEM INTERFACE
-			"$<BUILD_INTERFACE:${HIP_TOOLKIT_PATH}/include>"
-		)
-		target_compile_definitions(DDC INTERFACE hipfft_AVAIL)
-	else()
-		message( "HIP_TOOLKIT_PATH is not defined. Kernels functions may be unaccessible. To get them, add -DHIP_TOOLKIT_PATH=\"path_to_hip_toolkit\" in your cmake line" )
-	endif()
-endif()
-
 if("${BUILD_SPLINES_KERNEL}")
   # Ginkgo
   find_package(Ginkgo 1.6.0 EXACT REQUIRED)

docs/_template/header.html

@@ -23,5 +23,5 @@ <h2 id="projectbrief">a <span class="acronym">d</span>iscrete <span class="acron
 	<li><a href="index.html">About</a>
 	<li><a href="first_steps.html">Commented example</a>
 	<li><a href="annotated.html">API reference</a>
-	<li id="gitlab-ribbon"><a rel="noopener" href="https://github.com/Maison-de-la-Simulation/ddc" target="_blank">Contribute on Github</a></li>
+	<li id="gitlab-ribbon"><a rel="noopener" href="https://github.com/CExA-project/ddc" target="_blank">Contribute on Github</a></li>
 </ul></nav>

include/ddc/kernels/fft.hpp

@@ -470,7 +470,7 @@ void core(
         // std::cout << "performed with cufft";
     }
 #endif
-#if hipfft_AVAIL && !HIP_FOR_NVIDIA
+#if hipfft_AVAIL
     else if constexpr (std::is_same_v<ExecSpace, Kokkos::HIP>) {
         hipStream_t stream = execSpace.hip_stream();
 

include/ddc/misc/ginkgo_executors.hpp

@@ -1,3 +1,8 @@
+#pragma once
+
+#include <memory>
+#include <type_traits>
+
 #include <ginkgo/ginkgo.hpp>
 
 inline std::shared_ptr<gko::Executor> create_default_host_executor()