Skip to content

Commit 4aded79

Browse files
committed
Do not build PyTorch with LLVM
As NNC is dead, and llvm dependency has not been updated in last 4 years
1 parent bcd1f7b commit 4aded79

File tree

7 files changed

+0
-20
lines changed

7 files changed

+0
-20
lines changed

conda/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ COPY --from=cuda11.8 /usr/local/cuda-11.8 /usr/local/cuda-11.8
6868
COPY --from=cuda12.1 /usr/local/cuda-12.1 /usr/local/cuda-12.1
6969

7070
FROM ${BASE_TARGET} as final
71-
# Install LLVM
72-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
73-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
7471
COPY --from=openssl /opt/openssl /opt/openssl
7572
COPY --from=patchelf /patchelf /usr/local/bin/patchelf
7673
COPY --from=conda /opt/conda /opt/conda

libtorch/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ RUN bash ./install_rocm_drm.sh && rm install_rocm_drm.sh
7272
RUN bash ./install_rocm_magma.sh && rm install_rocm_magma.sh
7373

7474
FROM ${BASE_TARGET} as final
75-
# Install LLVM
76-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
77-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
7875
COPY --from=openssl /opt/openssl /opt/openssl
7976
# Install patchelf
8077
ADD ./common/install_patchelf.sh install_patchelf.sh

manywheel/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ RUN git config --global --add safe.directory "*"
114114

115115
ENV SSL_CERT_FILE=/opt/_internal/certs.pem
116116
# Install LLVM version
117-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
118-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
119117
COPY --from=openssl /opt/openssl /opt/openssl
120118
COPY --from=python /opt/python /opt/python
121119
COPY --from=python /opt/_internal /opt/_internal

manywheel/Dockerfile_2014

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ RUN git config --global --add safe.directory "*"
9797

9898
ENV SSL_CERT_FILE=/opt/_internal/certs.pem
9999
# Install LLVM version
100-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
101-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
102100
COPY --from=openssl /opt/openssl /opt/openssl
103101
COPY --from=base /opt/python /opt/python
104102
COPY --from=base /opt/_internal /opt/_internal

manywheel/Dockerfile_cxx11-abi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ ADD ./common/install_libpng.sh install_libpng.sh
4848
RUN bash ./install_libpng.sh && rm install_libpng.sh
4949

5050
FROM base as final
51-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
52-
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
5351
COPY --from=openssl /opt/openssl /opt/openssl
5452
COPY --from=python /opt/python /opt/python
5553
COPY --from=python /opt/_internal /opt/_internal

manywheel/build_common.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,8 @@ esac
139139

140140
if [[ "$DESIRED_DEVTOOLSET" == *"cxx11-abi"* ]]; then
141141
export _GLIBCXX_USE_CXX11_ABI=1
142-
export USE_LLVM="/opt/llvm"
143-
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
144142
else
145143
export _GLIBCXX_USE_CXX11_ABI=0
146-
export USE_LLVM="/opt/llvm_no_cxx11_abi"
147-
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
148144
fi
149145

150146
if [[ "$DESIRED_CUDA" == *"rocm"* ]]; then

manywheel/build_libtorch.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,8 @@ fi
103103

104104
if [[ "$DESIRED_DEVTOOLSET" == *"cxx11-abi"* ]]; then
105105
export _GLIBCXX_USE_CXX11_ABI=1
106-
export USE_LLVM="/opt/llvm"
107-
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
108106
else
109107
export _GLIBCXX_USE_CXX11_ABI=0
110-
export USE_LLVM="/opt/llvm_no_cxx11_abi"
111-
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
112108
fi
113109

114110
if [[ "$DESIRED_CUDA" == *"rocm"* ]]; then

0 commit comments

Comments
 (0)