Skip to content

Commit b51a54f

Browse files
authored
Fixed passing multiple architectures from PYTORCH_ROCM_ARCH to magma Makefile
1 parent 445cedf commit b51a54f

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

cmake/External/magma.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ if(NOT __MAGMA_INCLUDED)
114114
set(__MAGMA_EXTERN_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/magma")
115115
set(__MAGMA_INSTALL_DIR "${PROJECT_SOURCE_DIR}/torch")
116116

117-
message(STATUS "MAGMA building for GPU_TARGETS=$ENV{PYTORCH_ROCM_ARCH}")
118-
119117
cmake_host_system_information(RESULT N_LOGICAL_CORES QUERY NUMBER_OF_LOGICAL_CORES)
120118

121119
ExternalProject_Add(magma_external
@@ -127,9 +125,10 @@ if(NOT __MAGMA_INCLUDED)
127125
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/make.inc-examples/make.inc.hip-gcc-mkl <SOURCE_DIR>/make.inc
128126
COMMAND ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> make -f make.gen.hipMAGMA -j ${N_LOGICAL_CORES}
129127
BUILD_COMMAND ${CMAKE_COMMAND} -E env MKLROOT=${MKLROOT}
130-
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> make lib/libmagma.so -j ${N_LOGICAL_CORES} MKLROOT=${MKLROOT} GPU_TARGET="$ENV{PYTORCH_ROCM_ARCH}"
128+
${CMAKE_COMMAND} -E chdir <SOURCE_DIR> make lib/libmagma.so -j ${N_LOGICAL_CORES} MKLROOT=${MKLROOT} GPU_TARGET=$ENV{PYTORCH_ROCM_ARCH}
131129
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/lib/libmagma.so <INSTALL_DIR>/lib/
132130
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include <INSTALL_DIR>/include/magma
131+
LIST_SEPARATOR ";" # Helps to avoid cmake splitting ENV{PYTORCH_ROCM_ARCH} in to spaces. Can be anything except spaces.
133132
USES_TERMINAL_DOWNLOAD TRUE
134133
USES_TERMINAL_CONFIGURE TRUE
135134
USES_TERMINAL_BUILD TRUE

0 commit comments

Comments
 (0)