From 1f1974c7a030b60d76a4007332c3ae78e3c97847 Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Mon, 15 Jul 2024 18:10:44 -0400 Subject: [PATCH] magma 2.7.2 to 2.8.0_plus_fixes - include changes made after v2.8.0 release as they contain many rocm fixes - add more amd gpus to make.inc Signed-off-by: Mika Laitio --- binfo/037_magma.binfo | 2 +- ...ng-ROCM_VERSION-as-a-CMAKE-parameter.patch | 47 ++++++++++++------- ...-hipsparse-directory-location-update.patch | 26 ---------- 3 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 patches/rocm-6.1.2/magma/0002-rocm-6.0.0-hipsparse-directory-location-update.patch diff --git a/binfo/037_magma.binfo b/binfo/037_magma.binfo index 4f8df2f..50941be 100755 --- a/binfo/037_magma.binfo +++ b/binfo/037_magma.binfo @@ -3,7 +3,7 @@ BINFO_APP_SRC_SUBDIR_BASENAME= BINFO_APP_SRC_TOPDIR_BASENAME=${BINFO_APP_NAME} BINFO_APP_SRC_DIR="${SDK_SRC_ROOT_DIR}/${BINFO_APP_SRC_TOPDIR_BASENAME}" BINFO_APP_UPSTREAM_REPO_URL=https://github.com/rocmnavi/magma.git -BINFO_APP_UPSTREAM_REPO_VERSION_TAG=v2.7.2_rocm-6.0.0 +BINFO_APP_UPSTREAM_REPO_VERSION_TAG=rocm-6.1.2__magma_v2.8.0_devel CFG_TEMP1=-DAMDGPU_TARGETS="${SEMICOLON_SEPARATED_GPU_TARGET_LIST_DEFAULT}" # needs to be space separated list, not semicolon! diff --git a/patches/rocm-6.1.2/magma/0001-Support-receiving-ROCM_VERSION-as-a-CMAKE-parameter.patch b/patches/rocm-6.1.2/magma/0001-Support-receiving-ROCM_VERSION-as-a-CMAKE-parameter.patch index d390897..b474a8d 100644 --- a/patches/rocm-6.1.2/magma/0001-Support-receiving-ROCM_VERSION-as-a-CMAKE-parameter.patch +++ b/patches/rocm-6.1.2/magma/0001-Support-receiving-ROCM_VERSION-as-a-CMAKE-parameter.patch @@ -1,16 +1,16 @@ -From 34f648fd8855fe6e34b389a1577c9556431d6b5f Mon Sep 17 00:00:00 2001 +From 7c4266ee8332c71c3b29ca0d19821eb15195598a Mon Sep 17 00:00:00 2001 From: Mika Laitio -Date: Fri, 26 Jan 2024 01:58:41 -0800 -Subject: [PATCH 1/2] Support receiving ROCM_VERSION as a CMAKE parameter +Date: Mon, 15 Jul 2024 17:09:38 -0400 +Subject: [PATCH] Support receiving ROCM_VERSION as a CMAKE parameter Signed-off-by: Mika Laitio --- - CMakeLists.txt | 8 ++++++++ - Makefile | 4 ++++ - 2 files changed, 12 insertions(+) + CMakeLists.txt | 8 ++++++++ + Makefile | 13 ++++++++----- + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7a0e7470c..dbb0d0782 100644 +index 0e37ceba5..651c5686c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,9 @@ else() @@ -23,7 +23,7 @@ index 7a0e7470c..dbb0d0782 100644 # ---------------------------------------- # to show compile commands, set this here or use 'make VERBOSE=1' -@@ -492,6 +495,11 @@ else() +@@ -497,6 +500,11 @@ else() set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function" ) endif() @@ -36,21 +36,32 @@ index 7a0e7470c..dbb0d0782 100644 # Use rpaths, which is on by default in CMake 3. set( CMAKE_MACOSX_RPATH 1 ) diff --git a/Makefile b/Makefile -index a6b69c419..34ac52b62 100644 +index 5d7940aac..223f3bc99 100644 --- a/Makefile +++ b/Makefile -@@ -842,7 +842,11 @@ d_ext := cu +@@ -838,14 +838,17 @@ sparse/testing/clean: + + # set the device extension + ifeq ($(BACKEND),cuda) +-d_ext := cu ++ d_ext := cu else ifeq ($(BACKEND),hip) - d_ext := cpp - CXXFLAGS += -D__HIP_PLATFORM_HCC__ -+ifndef ROCM_VERSION - CXXFLAGS += -DROCM_VERSION=$(shell ./tools/get-rocm-version.sh) -+else -+CXXFLAGS += -DROCM_VERSION=$(ROCM_VERSION) -+endif +-d_ext := cpp +-CXXFLAGS += -D__HIP_PLATFORM_AMD__ +-CXXFLAGS += -DROCM_VERSION=$(shell ./tools/get-rocm-version.sh) ++ d_ext := cpp ++ CXXFLAGS += -D__HIP_PLATFORM_AMD__ ++ ifndef ROCM_VERSION ++ CXXFLAGS += -DROCM_VERSION=$(shell ./tools/get-rocm-version.sh) ++ else ++ CXXFLAGS += -DROCM_VERSION=$(ROCM_VERSION) ++ endif endif +- + ifeq ($(BACKEND),cuda) + %.i: %.$(d_ext) | $(CONFIG) -- -2.41.0 +2.45.2 diff --git a/patches/rocm-6.1.2/magma/0002-rocm-6.0.0-hipsparse-directory-location-update.patch b/patches/rocm-6.1.2/magma/0002-rocm-6.0.0-hipsparse-directory-location-update.patch deleted file mode 100644 index 89440d2..0000000 --- a/patches/rocm-6.1.2/magma/0002-rocm-6.0.0-hipsparse-directory-location-update.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dfd5cf9e04946592514e26f77d59475136f27a92 Mon Sep 17 00:00:00 2001 -From: Mika Laitio -Date: Fri, 26 Jan 2024 01:59:17 -0800 -Subject: [PATCH 2/2] rocm 6.0.0 hipsparse directory location update - -Signed-off-by: Mika Laitio ---- - sparse_hip/include/magmasparse_types.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sparse_hip/include/magmasparse_types.h b/sparse_hip/include/magmasparse_types.h -index be8b7c217..35a72b6bd 100644 ---- a/sparse_hip/include/magmasparse_types.h -+++ b/sparse_hip/include/magmasparse_types.h -@@ -21,7 +21,7 @@ - #endif - - // includes CUDA --#include -+#include - - /* (author: Cade Brown - * --- -2.41.0 -