Skip to content

Commit b94be16

Browse files
xinyazhangdnikolaev-amd
authored andcommitted
Fixes CI build script (#1350)
* Fix the parsing of /etc/os-release The old code parses OS_DISTRO as 'PRETTY_Ubuntu' on Ubuntu and thus never links to libtinfo correctly. * Configurable CMAKE_PREFIX_PATH in CI script. (cherry picked from commit 090d95f)
1 parent 67d0196 commit b94be16

File tree

2 files changed

+26
-3
lines changed

2 files changed

+26
-3
lines changed

.ci/pytorch/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ else
8080
elif [[ -v ANACONDA_PYTHON_VERSION ]]; then
8181
export CMAKE_PREFIX_PATH="/opt/conda/envs/py_${ANACONDA_PYTHON_VERSION}"
8282
else
83-
# already checked by `! which conda`
84-
CMAKE_PREFIX_PATH="$(conda info --base)"
85-
export CMAKE_PREFIX_PATH
83+
export CMAKE_PREFIX_PATH="$(conda info --base)"
8684
fi
8785

8886
# Workaround required for MKL library linkage

cmake/Dependencies.cmake

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,31 @@ endif()
10251025

10261026
# ---[ HIP
10271027
if(USE_ROCM)
1028+
# This prevents linking in the libtinfo from /opt/conda/lib which conflicts with ROCm libtinfo.
1029+
# Currently only active for Ubuntu 20.04 and greater versions.
1030+
if(UNIX AND EXISTS "/etc/os-release")
1031+
file(STRINGS /etc/os-release OS_RELEASE)
1032+
set(DISTRO_NAME "")
1033+
set(DISTRO_VERSION "")
1034+
foreach(line ${OS_RELEASE})
1035+
string(REGEX MATCH "^NAME=" DISTRO_NAME_MATCH ${line})
1036+
if (NOT DISTRO_NAME_MATCH STREQUAL "")
1037+
string(REGEX REPLACE "^NAME=\"(.*)\"" "\\1" DISTRO_NAME ${line})
1038+
endif()
1039+
string(REGEX MATCH "^VERSION_ID=" DISTRO_VERSION_MATCH ${line})
1040+
if (NOT DISTRO_VERSION_MATCH STREQUAL "")
1041+
string(REGEX REPLACE "^VERSION_ID=\"(.*)\"" "\\1" DISTRO_VERSION ${line})
1042+
endif()
1043+
endforeach()
1044+
if(DISTRO_NAME STREQUAL "Ubuntu" AND DISTRO_VERSION VERSION_GREATER_EQUAL "20.04")
1045+
find_library(LIBTINFO_LOC tinfo NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
1046+
if(LIBTINFO_LOC)
1047+
get_filename_component(LIBTINFO_LOC_PARENT ${LIBTINFO_LOC} DIRECTORY)
1048+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath-link,${LIBTINFO_LOC_PARENT}")
1049+
endif()
1050+
endif()
1051+
endif()
1052+
10281053
include(${CMAKE_CURRENT_LIST_DIR}/public/LoadHIP.cmake)
10291054
if(PYTORCH_FOUND_HIP)
10301055
message(INFO "Compiling with HIP for AMD.")

0 commit comments

Comments
 (0)