Skip to content

Commit 11f9443

Browse files
xinyazhangpruthvistony
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.
1 parent b71a5a6 commit 11f9443

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.ci/pytorch/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ else
8585
elif [[ -v ANACONDA_PYTHON_VERSION ]]; then
8686
export CMAKE_PREFIX_PATH="/opt/conda/envs/py_${ANACONDA_PYTHON_VERSION}"
8787
else
88-
# already checked by `! which conda`
89-
CMAKE_PREFIX_PATH="$(conda info --base)"
90-
export CMAKE_PREFIX_PATH
88+
export CMAKE_PREFIX_PATH="$(conda info --base)"
9189
fi
9290

9391
# Workaround required for MKL library linkage

cmake/Dependencies.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,11 +1009,11 @@ if(USE_ROCM)
10091009
set(DISTRO_VERSION "")
10101010
foreach(line ${OS_RELEASE})
10111011
string(REGEX MATCH "^NAME=" DISTRO_NAME_MATCH ${line})
1012-
if(NOT DISTRO_NAME_MATCH STREQUAL "")
1012+
if (NOT DISTRO_NAME_MATCH STREQUAL "")
10131013
string(REGEX REPLACE "^NAME=\"(.*)\"" "\\1" DISTRO_NAME ${line})
10141014
endif()
10151015
string(REGEX MATCH "^VERSION_ID=" DISTRO_VERSION_MATCH ${line})
1016-
if(NOT DISTRO_VERSION_MATCH STREQUAL "")
1016+
if (NOT DISTRO_VERSION_MATCH STREQUAL "")
10171017
string(REGEX REPLACE "^VERSION_ID=\"(.*)\"" "\\1" DISTRO_VERSION ${line})
10181018
endif()
10191019
endforeach()

0 commit comments

Comments
 (0)