Skip to content

Commit 725868f

Browse files
committed
Changed magma commit hash to accomodate HIPBLASv3
1 parent 3cc24ce commit 725868f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

cmake/External/magma.cmake

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if(NOT __MAGMA_INCLUDED)
9999

100100
set(MAGMA_VERSION "2.9.0")
101101
set(MAGMA_REPOSITORY "https://github.com/ROCm/utk-magma.git")
102-
set(MAGMA_GIT_TAG "883b14194120a021c802e886c456e86ae2aba164")
102+
set(MAGMA_GIT_TAG "05caf6482768e8ec1445dba4765d5d174c2aa531")
103103

104104
# Install MKL if not installed
105105
if(DEFINED ENV{MKLROOT})
@@ -108,14 +108,14 @@ if(NOT __MAGMA_INCLUDED)
108108
else()
109109
message(FATAL_ERROR "MAGMA install from source: No MKL installation detected. \n"
110110
"Please install MKL using 'pip install mkl-static mkl-include' \n"
111-
"and build again, or set USE_MAGMA=OFF.")
111+
"And set MKLROOT appropriately (Usually to your env location).' \n"
112+
"Or set USE_MAGMA=OFF to build without MAGMA.")
112113
endif()
113114

114115
set(__MAGMA_EXTERN_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/magma")
115116
set(__MAGMA_INSTALL_DIR "${PROJECT_SOURCE_DIR}/torch")
116117

117-
set(MAGMA_GFX_ARCH $ENV{PYTORCH_ROCM_ARCH})
118-
string(REPLACE ";" " " MAGMA_GFX_ARCH $ENV{PYTORCH_ROCM_ARCH})
118+
string(REPLACE ";" "" MAGMA_GFX_ARCH $ENV{PYTORCH_ROCM_ARCH}) # We avoid using lists due to cmake adding spaces between list items in the cmake command
119119
message("Building MAGMA for gfx architectures: ${MAGMA_GFX_ARCH}")
120120

121121
cmake_host_system_information(RESULT N_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES)
@@ -132,7 +132,6 @@ if(NOT __MAGMA_INCLUDED)
132132
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> make lib/libmagma.so -j ${N_LOGICAL_CORES} MKLROOT=${MKLROOT} GPU_TARGET=${MAGMA_GFX_ARCH}
133133
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/lib/libmagma.so <INSTALL_DIR>/lib/
134134
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include <INSTALL_DIR>/include/magma
135-
LIST_SEPARATOR ";" # Helps to avoid cmake splitting ENV{PYTORCH_ROCM_ARCH} in to spaces. Can be anything except spaces.
136135
USES_TERMINAL_DOWNLOAD TRUE
137136
USES_TERMINAL_CONFIGURE TRUE
138137
USES_TERMINAL_BUILD TRUE

0 commit comments

Comments
 (0)