-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 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 <[email protected]>
- Loading branch information
Showing
3 changed files
with
30 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 <[email protected]> | ||
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 <[email protected]> | ||
--- | ||
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 | ||
|
26 changes: 0 additions & 26 deletions
26
patches/rocm-6.1.2/magma/0002-rocm-6.0.0-hipsparse-directory-location-update.patch
This file was deleted.
Oops, something went wrong.