@@ -99,7 +99,7 @@ if(NOT __MAGMA_INCLUDED)
99
99
100
100
set (MAGMA_VERSION "2.9.0" )
101
101
set (MAGMA_REPOSITORY "https://github.com/ROCm/utk-magma.git" )
102
- set (MAGMA_GIT_TAG "883b14194120a021c802e886c456e86ae2aba164 " )
102
+ set (MAGMA_GIT_TAG "05caf6482768e8ec1445dba4765d5d174c2aa531 " )
103
103
104
104
# Install MKL if not installed
105
105
if (DEFINED ENV{MKLROOT} )
@@ -108,14 +108,14 @@ if(NOT __MAGMA_INCLUDED)
108
108
else ()
109
109
message (FATAL_ERROR "MAGMA install from source: No MKL installation detected. \n "
110
110
"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." )
112
113
endif ()
113
114
114
115
set (__MAGMA_EXTERN_PREFIX "${CMAKE_CURRENT_BINARY_DIR} /magma" )
115
116
set (__MAGMA_INSTALL_DIR "${PROJECT_SOURCE_DIR} /torch" )
116
117
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
119
119
message ("Building MAGMA for gfx architectures: ${MAGMA_GFX_ARCH} " )
120
120
121
121
cmake_host_system_information (RESULT N_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES )
@@ -132,7 +132,6 @@ if(NOT __MAGMA_INCLUDED)
132
132
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> make lib/libmagma.so -j ${N_LOGICAL_CORES} MKLROOT=${MKLROOT} GPU_TARGET=${MAGMA_GFX_ARCH}
133
133
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/lib/libmagma.so <INSTALL_DIR>/lib/
134
134
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.
136
135
USES_TERMINAL_DOWNLOAD TRUE
137
136
USES_TERMINAL_CONFIGURE TRUE
138
137
USES_TERMINAL_BUILD TRUE
0 commit comments