Merge branch 'update_submodules' into 'master'

Update submodules

See merge request !521

CMakeLists.txt

@@ -349,7 +349,7 @@ endif()
 # Add math library (libm), searched with MORSE module FindM.cmake
 # it normally exists on all common systems provided with a C compiler
 find_package(M REQUIRED)
-morse_export_imported_target(MORSE M m chameleon)
+morse_export_imported_target(MORSE::M m chameleon)
 
 # If simulation we don't enter in kernel functions so that we don't need to link
 # with concerned libraries
@@ -366,12 +366,12 @@ if(NOT CHAMELEON_SIMULATION)
     # CHAMELEON depends on CBLAS
     #---------------------------
     find_package(CBLAS REQUIRED)
-    morse_export_imported_target(MORSE CBLAS cblas chameleon)
+    morse_export_imported_target(MORSE::CBLAS cblas chameleon)
 
     # CHAMELEON depends on LAPACKE
     #-----------------------------
     find_package(LAPACKE REQUIRED)
-    morse_export_imported_target(MORSE LAPACKE lapacke chameleon)
+    morse_export_imported_target(MORSE::LAPACKE lapacke chameleon)
 
     # CHAMELEON depends on CUDA/CUBLAS
     #----------------------------------
@@ -418,8 +418,8 @@ if(NOT CHAMELEON_SIMULATION)
                 "\n   CUDA_LIBRARIES to be found. Be sure you have"
                 "\n   libcuda with your distribution of CUDA.")
             endif()
-            morse_export_imported_target(CUDA CUDA cuda chameleon)
-            morse_export_imported_target(CUDA CUBLAS cublas chameleon)
+            morse_export_imported_target(CUDA::CUDA cuda chameleon)
+            morse_export_imported_target(CUDA::CUBLAS cublas chameleon)
         endif (CUDA_FOUND)
 
     endif(CHAMELEON_USE_CUDA)
@@ -427,10 +427,16 @@ if(NOT CHAMELEON_SIMULATION)
     # CHAMELEON depends on HIP/HIPBLAS
     #----------------------------------
     if (CHAMELEON_USE_HIP)
+
         if (CHAMELEON_USE_HIP_ROC)
 
-            find_package(HIP REQUIRED)
-            find_package(hipblas REQUIRED)
+            # should define targets: hip::host, hip::device
+            find_package(hip REQUIRED CONFIG)
+            message(STATUS "hip target found")
+
+            # should define targets: roc::hipblas
+            find_package(hipblas REQUIRED CONFIG)
+            message(STATUS "hipblas target found")
 
         elseif(CHAMELEON_USE_HIP_CUDA)
 
@@ -466,56 +472,49 @@ if(NOT CHAMELEON_SIMULATION)
             if(CHAMELEON_HIPBLAS_PATH)
                 list(APPEND HIPBLAS_INCLUDE_DIRS "${CHAMELEON_HIPBLAS_PATH}/include")
                 list(APPEND HIPBLAS_LIBRARIES "${CHAMELEON_HIPBLAS_PATH}/lib/libhipblas.so")
+                message(STATUS "HIPBLAS_INCLUDE_DIRS: ${HIP_INCLUDE_DIRS}")
+                message(STATUS "HIPBLAS_LIBRARIES: ${HIPBLAS_LIBRARIES}")
             else()
                 message(FATAL_ERROR "Please set CHAMELEON_HIPBLAS_PATH to your HIPBLAS installation.")
             endif()
-        endif()
 
-        if (HIP_FOUND)
-            message("-- ${Blue}Add definition CHAMELEON_USE_HIP"
-                " - Activate HIP in Chameleon${ColourReset}")
             # create imported target because not provided with old cmake
-            add_library(HIP::HIP INTERFACE IMPORTED)
-            add_library(HIP::HIPBLAS INTERFACE IMPORTED)
-
-            if (CHAMELEON_USE_HIP_CUDA)
-                target_compile_definitions(HIP::HIP INTERFACE "__HIP_PLATFORM_NVIDIA__")
-                set(HIP_INCLUDE_DIRS "${HIP_INCLUDE_DIRS};${CUDA_INCLUDE_DIRS}")
-                set(HIP_LIBRARIES "${HIP_LIBRARIES};${CUDA_LIBRARIES}")
-            endif()
+            add_library(hip::hip INTERFACE IMPORTED)
+            add_library(roc::hipblas INTERFACE IMPORTED)
+            target_compile_definitions(hip::hip INTERFACE "__HIP_PLATFORM_NVIDIA__")
+            set(HIP_INCLUDE_DIRS "${HIP_INCLUDE_DIRS};${CUDA_INCLUDE_DIRS}")
+            set(HIP_LIBRARIES "${HIP_LIBRARIES};${CUDA_LIBRARIES}")
 
             if (HIP_INCLUDE_DIRS)
-                set_target_properties(HIP::HIP PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${HIP_INCLUDE_DIRS}")
+                set_target_properties(hip::hip PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${HIP_INCLUDE_DIRS}")
                 if (HIPBLAS_INCLUDE_DIRS)
-                    set_target_properties(HIP::HIPBLAS PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${HIPBLAS_INCLUDE_DIRS}")
+                    set_target_properties(roc::hipblas PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${HIPBLAS_INCLUDE_DIRS}")
                 else()
-                    message(WARNING "CHAMELEON_USE_HIP requires"
+                    message(WARNING "CHAMELEON_USE_HIP_CUDA requires"
                         "\n   HIPBLAS_INCLUDE_DIRS to be found. Be sure you have"
                         "\n   hipblas headers with your distribution of HIP.")
                 endif()
             else()
-                message(WARNING "CHAMELEON_USE_HIP requires"
+                message(WARNING "CHAMELEON_USE_HIP_CUDA requires"
                     "\n   HIP_INCLUDE_DIRS to be found. Be sure you have"
                     "\n   hip headers with your distribution of HIP.")
             endif()
             if (HIP_LIBRARIES)
-                set_target_properties(HIP::HIP PROPERTIES INTERFACE_LINK_LIBRARIES "${HIP_LIBRARIES}")
+                set_target_properties(hip::hip PROPERTIES INTERFACE_LINK_LIBRARIES "${HIP_LIBRARIES}")
                 if (HIPBLAS_LIBRARIES)
-                    set_target_properties(HIP::HIPBLAS PROPERTIES INTERFACE_LINK_LIBRARIES "${HIPBLAS_LIBRARIES}")
-                    target_link_libraries(HIP::HIPBLAS INTERFACE HIP::HIP)
-                    message("-- ${Blue}Add definition CHAMELEON_USE_HIPBLAS"
-                        " - Use GPU kernels from hipblas${ColourReset}")
+                    set_target_properties(roc::hipblas PROPERTIES INTERFACE_LINK_LIBRARIES "${HIPBLAS_LIBRARIES}")
+                    target_link_libraries(roc::hipblas INTERFACE hip::hip)
                 else()
-                    message(FATAL_ERROR "CHAMELEON_USE_HIP requires"
+                    message(FATAL_ERROR "CHAMELEON_USE_HIP_CUDA requires"
                         "\n   HIPBLAS_LIBRARIES to be found. Be sure you have"
                         "\n   libhipblas with your distribution of HIP.")
                 endif()
             else()
-                message(FATAL_ERROR "CHAMELEON_USE_HIP requires"
+                message(FATAL_ERROR "CHAMELEON_USE_HIP_CUDA requires"
                     "\n   HIP_LIBRARIES to be found. Be sure you have"
                     "\n   libamdhip64 with your distribution of ROCm.")
             endif()
-            if (CHAMELEON_USE_HIP_CUDA AND NOT CUDA_LIBRARIES)
+            if (NOT CUDA_LIBRARIES)
                 message(FATAL_ERROR "CHAMELEON_USE_HIP_CUDA requires"
                 "\n   CUDA_LIBRARIES to be found. Be sure you have"
                 "\n   libcuda with your distribution of CUDA.")
@@ -531,17 +530,13 @@ if(NOT CHAMELEON_SIMULATION)
             message("-- HIPBLAS include path:  ${HIPBLAS_INCLUDE_DIRS}")
             message("-- HIPBLAS libraries:     ${HIPBLAS_LIBRARIES}")
 
-            morse_export_imported_target(HIP HIP hip chameleon)
-            morse_export_imported_target(HIP HIPBLAS hipblas chameleon)
-            if (CHAMELEON_USE_HIP_ROC)
-                morse_export_imported_target(roc hipblas rochipblas chameleon)
-                morse_export_imported_target(hip host hiphost chameleon)
-                morse_export_imported_target(hip device hipdevice chameleon)
-                morse_export_imported_target(hip amdhip64 hipamdhip64 chameleon)
-            endif()
-        else(HIP_FOUND)
-            message(FATAL_ERROR "CHAMELEON_USE_HIP requires HIP to be found")
-        endif (HIP_FOUND)
+            morse_export_imported_target(hip::hip hip chameleon)
+            morse_export_imported_target(roc::hipblas hipblas chameleon)
+
+        endif()
+
+        message("-- ${Blue}Add definition CHAMELEON_USE_HIP"
+        " - Activate HIP in Chameleon${ColourReset}")
 
     endif(CHAMELEON_USE_HIP)
 
@@ -562,7 +557,7 @@ if(NOT CHAMELEON_SIMULATION)
             " - Activate MPI in Chameleon${ColourReset}")
         endif (MPI_C_FOUND)
 
-        morse_export_imported_target(MPI MPI_C mpi chameleon)
+        morse_export_imported_target(MPI::MPI_C mpi chameleon)
 
         if (CHAMELEON_SCHED STREQUAL "PARSEC")
           message(FATAL_ERROR "CHAMELEON does not support PARSEC with MPI."
@@ -656,7 +651,7 @@ else (NOT CHAMELEON_SIMULATION)
             " - Activate MPI in Chameleon${ColourReset}")
         endif (MPI_C_FOUND)
 
-        morse_export_imported_target(MPI MPI_C mpi chameleon)
+        morse_export_imported_target(MPI::MPI_C mpi chameleon)
 
     endif (CHAMELEON_USE_MPI)
 
@@ -791,7 +786,7 @@ endif()
 # Threads::Threads may be a dependency of BLAS/LAPACK and CUDA
 # the target may be required for cmake users linking with CHAMELEONconfig.cmake
 if (TARGET Threads::Threads)
-    morse_export_imported_target(Threads Threads threads chameleon)
+    morse_export_imported_target(Threads::Threads threads chameleon)
 endif()
 
 # see https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html
@@ -801,10 +796,20 @@ set(BIN_INSTALL_DIR "bin/" CACHE STRING "where to install executables relative t
 set(INC_INSTALL_DIR "include/" CACHE STRING "where to install headers relative to prefix" )
 set(LIB_INSTALL_DIR "lib/" CACHE STRING "where to install libraries relative to prefix" )
 
+set(PREFIX_PATH "")
+if (CMAKE_PREFIX_PATH)
+  list(APPEND PREFIX_PATH ${CMAKE_PREFIX_PATH})
+endif()
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
+  set(ENV_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+  string(REGEX REPLACE ":" ";" ENV_PREFIX_PATH "${ENV_PREFIX_PATH}" )
+  list(APPEND PREFIX_PATH ${ENV_PREFIX_PATH})
+endif()
+
 configure_package_config_file(cmake_modules/CHAMELEONConfig.cmake.in
                               ${CMAKE_CURRENT_BINARY_DIR}/CHAMELEONConfig.cmake
                               INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/chameleon
-                              PATH_VARS BIN_INSTALL_DIR INC_INSTALL_DIR LIB_INSTALL_DIR)
+                              PATH_VARS BIN_INSTALL_DIR INC_INSTALL_DIR LIB_INSTALL_DIR PREFIX_PATH)
 write_basic_package_version_file(CHAMELEONConfigVersion.cmake
                                  VERSION ${CHAMELEON_VERSION}
                                  COMPATIBILITY AnyNewerVersion)

cmake_modules/CHAMELEONConfig.cmake.in

@@ -9,6 +9,9 @@ set_and_check(CHAMELEON_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
 
 check_required_components(CHAMELEON)
 
+# propagate the CMAKE_PREFIX_PATH informations used during chameleon installation to give paths to dependencies
+list(APPEND CMAKE_PREFIX_PATH "@PACKAGE_PREFIX_PATH@")
+
 # dependencies of CHAMELEON
 include("${CMAKE_CURRENT_LIST_DIR}/mTargets.cmake")
 if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/threadsTargets.cmake")
@@ -38,13 +41,13 @@ if (@CHAMELEON_USE_CUDA@ AND NOT @CHAMELEON_SIMULATION@)
   include("${CMAKE_CURRENT_LIST_DIR}/cublasTargets.cmake")
 endif()
 if (@CHAMELEON_USE_HIP@ AND NOT @CHAMELEON_SIMULATION@)
-  include("${CMAKE_CURRENT_LIST_DIR}/hipTargets.cmake")
-  include("${CMAKE_CURRENT_LIST_DIR}/hipblasTargets.cmake")
   if (@CHAMELEON_USE_HIP_ROC@)
-    include("${CMAKE_CURRENT_LIST_DIR}/rochipblasTargets.cmake")
-    include("${CMAKE_CURRENT_LIST_DIR}/hiphostTargets.cmake")
-    include("${CMAKE_CURRENT_LIST_DIR}/hipdeviceTargets.cmake")
-    include("${CMAKE_CURRENT_LIST_DIR}/hipamdhip64Targets.cmake")
+    include(CMakeFindDependencyMacro)
+    find_dependency(hip REQUIRED)
+    find_dependency(hipblas REQUIRED)
+  else ()
+    include("${CMAKE_CURRENT_LIST_DIR}/hipTargets.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/hipblasTargets.cmake")
   endif()
 endif()
 

morse_cmake @ bc34cfd2

-Subproject commit c265c55769a590190c18664c034d68d446036a13
+Subproject commit bc34cfd2ce19d525e2e6a82b7ec6c8bca45e2c97

compute/CMakeLists.txt

@@ -375,7 +375,7 @@ endif()
 if (CHAMELEON_USE_HIP)
   if (NOT CHAMELEON_SIMULATION)
     target_link_libraries(chameleon PUBLIC gpuhipblas)
-    target_link_libraries(chameleon PUBLIC HIP::HIPBLAS)
+    target_link_libraries(chameleon PUBLIC roc::hipblas)
   endif()
 endif()
 target_link_libraries(chameleon PUBLIC MORSE::M)

gpuhipblas/compute/CMakeLists.txt

@@ -71,7 +71,7 @@ target_include_directories(gpuhipblas PUBLIC
 set_property(TARGET gpuhipblas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 
 target_link_libraries(gpuhipblas PRIVATE coreblas)
-target_link_libraries(gpuhipblas PUBLIC HIP::HIPBLAS)
+target_link_libraries(gpuhipblas PUBLIC roc::hipblas)
 target_link_libraries(gpuhipblas PUBLIC MORSE::M)
 
 # export target coreblas

hqr @ a8dc699d

-Subproject commit 0f85e4debd59f3b4ddac3551d3aa4be74257bb8e
+Subproject commit a8dc699dbbae1e37fdc6eba4e2bc3097ec93ae63

runtime/openmp/CMakeLists.txt

@@ -29,7 +29,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 find_package(OpenMP REQUIRED)
-morse_export_imported_target(OpenMP OpenMP_C openmp chameleon)
+morse_export_imported_target(OpenMP::OpenMP_C openmp chameleon)
 
 if ( OPENMP_FOUND )
   message("-- ${Blue}Add definition CHAMELEON_SCHED_OPENMP"

runtime/parsec/CMakeLists.txt

@@ -29,7 +29,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 find_package( PARSEC REQUIRED )
-morse_export_imported_target(MORSE PARSEC parsec chameleon)
+morse_export_imported_target(MORSE::PARSEC parsec chameleon)
 
 if(PARSEC_FOUND)
   message("-- ${Blue}Add definition CHAMELEON_SCHED_PARSEC"

runtime/quark/CMakeLists.txt

@@ -29,7 +29,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 find_package( QUARK REQUIRED COMPONENTS HWLOC )
-morse_export_imported_target(MORSE QUARK quark chameleon)
+morse_export_imported_target(MORSE::QUARK quark chameleon)
 
 # Add definition and include_dir if found
 if(QUARK_FOUND)

runtime/starpu/CMakeLists.txt

@@ -50,7 +50,7 @@ if (_DEFS)
 endif()
 # -------------------------------------------------------------
 
-morse_export_imported_target(MORSE STARPU starpu chameleon)
+morse_export_imported_target(MORSE::STARPU starpu chameleon)
 
 # check available functions
 # note: recall STARPU_VERSION provides the version
@@ -405,7 +405,7 @@ if (NOT CHAMELEON_SIMULATION)
     target_link_libraries(chameleon_starpu PUBLIC CUDA::CUBLAS)
   endif()
   if (CHAMELEON_USE_HIP)
-    target_link_libraries(chameleon_starpu PUBLIC HIP::HIPBLAS)
+    target_link_libraries(chameleon_starpu PUBLIC roc::hipblas)
   endif()
 endif()