q-e-sirius, rocm@7.2.0 cray mpich@9.1.0 (#318)

Author: simonpintarelli

recipes/q-e-sirius/repo/packages/rocblas/0001-remove-blas-override-7.2.patch

@@ -0,0 +1,19 @@
+diff --git a/projects/rocblas/clients/CMakeLists.txt b/projects/rocblas/clients/CMakeLists.txt
+index 0f32675..65e458d 100644
+--- a/projects/rocblas/clients/CMakeLists.txt
++++ b/projects/rocblas/clients/CMakeLists.txt
+@@ -163,14 +163,6 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+         find_package(PkgConfig)
+         if(NOT PKG_CONFIG_FOUND)
+           message( FATAL_ERROR "Could not find libblis and pkgconfig is not available" )
+-        else()
+-          pkg_search_module(PKGBLAS cblas)
+-          if(PKGBLAS_FOUND)
+-            set( BLAS_LIBRARY ${PKGBLAS_LIBRARIES} )
+-            set( BLAS_INCLUDE_DIR ${PKGBLAS_INCLUDE_DIRS} )
+-          else()
+-            message( FATAL_ERROR "Could not find libblis and pkgconfig can not find any other implementation of cblas" )
+-          endif()
+         endif()
+       endif()
+     else()

recipes/q-e-sirius/repo/packages/rocblas/0001-remove-blas-override.patch

@@ -0,0 +1,19 @@
+diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
+index 0f32675..65e458d 100644
+--- a/clients/CMakeLists.txt
++++ b/clients/CMakeLists.txt
+@@ -163,14 +163,6 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+         find_package(PkgConfig)
+         if(NOT PKG_CONFIG_FOUND)
+           message( FATAL_ERROR "Could not find libblis and pkgconfig is not available" )
+-        else()
+-          pkg_search_module(PKGBLAS cblas)
+-          if(PKGBLAS_FOUND)
+-            set( BLAS_LIBRARY ${PKGBLAS_LIBRARIES} )
+-            set( BLAS_INCLUDE_DIR ${PKGBLAS_INCLUDE_DIRS} )
+-          else()
+-            message( FATAL_ERROR "Could not find libblis and pkgconfig can not find any other implementation of cblas" )
+-          endif()
+         endif()
+       endif()
+     else()

recipes/q-e-sirius/repo/packages/rocblas/0007-add-rocm-openmp-extras-include-dir.patch

@@ -0,0 +1,20 @@
+diff --git a/clients/gtest/CMakeLists.txt b/clients/gtest/CMakeLists.txt
+index 55e9bbe..32b350c 100644
+--- a/clients/gtest/CMakeLists.txt
++++ b/clients/gtest/CMakeLists.txt
+@@ -164,6 +164,7 @@ target_include_directories( rocblas-test
+     $<BUILD_INTERFACE:${BLAS_INCLUDE_DIR}>
+     $<BUILD_INTERFACE:${BLIS_INCLUDE_DIR}> # may be blank if not used
+     $<BUILD_INTERFACE:${GTEST_INCLUDE_DIRS}>
++    $<BUILD_INTERFACE:${ROCM_OPENMP_EXTRAS_DIR}/include>
+ )
+ target_include_directories( rocblas_v3-test
+   SYSTEM PRIVATE
+@@ -171,6 +172,7 @@ target_include_directories( rocblas_v3-test
+     $<BUILD_INTERFACE:${BLAS_INCLUDE_DIR}>
+     $<BUILD_INTERFACE:${BLIS_INCLUDE_DIR}> # may be blank if not used
+     $<BUILD_INTERFACE:${GTEST_INCLUDE_DIRS}>
++    $<BUILD_INTERFACE:${ROCM_OPENMP_EXTRAS_DIR}/include>
+ )
+
+ if( BUILD_FORTRAN_CLIENTS )

recipes/q-e-sirius/repo/packages/rocblas/0008-link-roctracer.patch

@@ -0,0 +1,16 @@
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 762580d..1692578 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -81,7 +81,10 @@ function( rocblas_library_settings lib_target_ )
+   else()
+     target_link_libraries( ${lib_target_} PRIVATE hip::device -lstdc++fs --rtlib=compiler-rt --unwindlib=libgcc)
+     if (BUILD_SHARED_LIBS)
+-      target_link_libraries(${lib_target_} PRIVATE -lroctx64)
++      find_path(ROCTRACER_INCLUDE_DIR "roctracer/roctx.h")
++      target_include_directories(${lib_target_} PUBLIC ${ROCTRACER_INCLUDE_DIR})
++      find_library(ROCTX_LIB NAMES roctx64)
++      target_link_libraries(${lib_target_} PRIVATE ${ROCTX_LIB})
+     endif()
+   endif()
+     target_link_libraries( ${lib_target_} PRIVATE Threads::Threads )

recipes/q-e-sirius/repo/packages/rocblas/0009-use-rocm-smi-config.patch

@@ -0,0 +1,15 @@
+diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
+index 6194286..292bd8d 100644
+--- a/clients/CMakeLists.txt
++++ b/clients/CMakeLists.txt
+@@ -178,8 +178,8 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+ 
+   # Find the package ROCmSMI
+   if(NOT WIN32)
+-      find_package(ROCmSMI REQUIRED)
+-      list( APPEND COMMON_LINK_LIBS rocm_smi )
++      find_package(rocm_smi CONFIG REQUIRED)
++      list( APPEND COMMON_LINK_LIBS rocm_smi64 )
+   endif()
+ 
+   find_package( GTest REQUIRED )