Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 18143a45 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'fix_cuda_12_compilation' into 'master'

Chameleon can now be compiled with cuda 12.x

See merge request !396
parents fc1dc041 f8c36304
No related branches found
No related tags found
1 merge request!396Chameleon can now be compiled with cuda 12.x
......@@ -384,14 +384,14 @@ if(NOT CHAMELEON_SIMULATION)
find_package(CUDA REQUIRED)
if (CUDA_FOUND)
if(CUDA_VERSION VERSION_LESS "4.0")
message(WARNING "Cuda version must be at least 4.0")
endif(CUDA_VERSION VERSION_LESS "4.0")
message("-- ${Blue}Add definition CHAMELEON_USE_CUDA"
" - Activate CUDA in Chameleon${ColourReset}")
# create imported target because not provided with old cmake
add_library(CUDA::CUDA INTERFACE IMPORTED)
add_library(CUDA::CUBLAS INTERFACE IMPORTED)
if(CUDA_VERSION VERSION_LESS "3.0")
set(CUDA_HOST_COMPILATION_CPP OFF)
endif(CUDA_VERSION VERSION_LESS "3.0")
set(CUDA_BUILD_EMULATION OFF)
if (CUDA_INCLUDE_DIRS)
set_target_properties(CUDA::CUDA PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CUDA_INCLUDE_DIRS}")
......
......@@ -48,7 +48,6 @@
#include <cuda.h>
#include <cuda_runtime.h>
#include <cuda_runtime_api.h>
#include <cublas.h>
#include <cublas_v2.h>
#endif
......
......@@ -36,7 +36,6 @@
#include <cuda.h>
#include <cuComplex.h>
#include <cublas.h>
#include <cublas_v2.h>
#define CUBLAS_SADDR(_a_) (&(_a_))
......
......@@ -210,7 +210,7 @@ chameleon_starpu_tag_release( int64_t min )
******************************************************************************/
void
chameleon_starpu_tag_init( ) {
return CHAMELEON_SUCCESS;
return;
}
/**
......
......@@ -67,8 +67,6 @@
#include <starpu_scheduler.h>
#include <starpu_cuda.h>
#include <cublas.h>
#include <starpu_cublas.h>
#include <cublas_v2.h>
#include <starpu_cublas_v2.h>
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment