Skip to content

Commit 18c5017

Browse files
authored
Upgrade cmake version to 3.22.1 to build triton (#1331)
* Upgrade cmake version to 3.22.1 to build triton * Pin patcheft version * Fix comment typo
1 parent 6bda65c commit 18c5017

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

common/install_conda.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ chmod +x Miniconda3-latest-Linux-x86_64.sh
99
bash ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/conda
1010
rm Miniconda3-latest-Linux-x86_64.sh
1111
export PATH=/opt/conda/bin:$PATH
12-
conda install -y conda-build anaconda-client git ninja
12+
# cmake-3.22.1 from conda, same as the one used by PyTorch CI. The system cmake
13+
# is too old to build triton
14+
conda install -y conda-build anaconda-client git ninja cmake=3.22.1
1315
conda remove -y --force patchelf

common/install_patchelf.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
set -ex
44

5-
git clone https://github.com/NixOS/patchelf
5+
# Pin the version to latest release 0.17.2, building newer commit starts
6+
# to fail on the current image
7+
git clone -b 0.17.2 --single-branch https://github.com/NixOS/patchelf
68
cd patchelf
79
sed -i 's/serial/parallel/g' configure.ac
810
./bootstrap.sh

manywheel/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &
2121
rpm -ivh epel-release-latest-7.noarch.rpm && \
2222
rm -f epel-release-latest-7.noarch.rpm
2323

24-
# cmake-3.18.4 from pip
24+
# cmake-3.22.1 from pip, same as the one used by PyTorch CI. cmake-3.18.4 is
25+
# too old to build triton now
2526
RUN yum install -y python3-pip && \
26-
python3 -mpip install cmake==3.18.4 && \
27+
python3 -mpip install cmake==3.22.1 && \
2728
ln -s /usr/local/bin/cmake /usr/bin/cmake
2829

2930
RUN yum install -y autoconf aclocal automake make

0 commit comments

Comments
 (0)