diff --git a/common/install_conda.sh b/common/install_conda.sh index c7967a615..9bb4e3d21 100644 --- a/common/install_conda.sh +++ b/common/install_conda.sh @@ -9,5 +9,7 @@ chmod +x Miniconda3-latest-Linux-x86_64.sh bash ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/conda rm Miniconda3-latest-Linux-x86_64.sh export PATH=/opt/conda/bin:$PATH -conda install -y conda-build anaconda-client git ninja +# cmake-3.22.1 from conda, same as the one used by PyTorch CI. The system cmake +# is too old to build triton +conda install -y conda-build anaconda-client git ninja cmake=3.22.1 conda remove -y --force patchelf diff --git a/common/install_patchelf.sh b/common/install_patchelf.sh index 032e3cc27..37b69415e 100644 --- a/common/install_patchelf.sh +++ b/common/install_patchelf.sh @@ -2,7 +2,9 @@ set -ex -git clone https://github.com/NixOS/patchelf +# Pin the version to latest release 0.17.2, building newer commit starts +# to fail on the current image +git clone -b 0.17.2 --single-branch https://github.com/NixOS/patchelf cd patchelf sed -i 's/serial/parallel/g' configure.ac ./bootstrap.sh diff --git a/manywheel/Dockerfile b/manywheel/Dockerfile index 5ccb5d200..112716c98 100644 --- a/manywheel/Dockerfile +++ b/manywheel/Dockerfile @@ -21,9 +21,10 @@ RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm & rpm -ivh epel-release-latest-7.noarch.rpm && \ rm -f epel-release-latest-7.noarch.rpm -# cmake-3.18.4 from pip +# cmake-3.22.1 from pip, same as the one used by PyTorch CI. cmake-3.18.4 is +# too old to build triton now RUN yum install -y python3-pip && \ - python3 -mpip install cmake==3.18.4 && \ + python3 -mpip install cmake==3.22.1 && \ ln -s /usr/local/bin/cmake /usr/bin/cmake RUN yum install -y autoconf aclocal automake make