Skip to content

Commit

Permalink
Do not build PyTorch with LLVM
Browse files Browse the repository at this point in the history
As NNC is dead, and llvm dependency has not been updated in last 4 years
  • Loading branch information
malfet committed Jul 6, 2023
1 parent bcd1f7b commit 4aded79
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 20 deletions.
3 changes: 0 additions & 3 deletions conda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ COPY --from=cuda11.8 /usr/local/cuda-11.8 /usr/local/cuda-11.8
COPY --from=cuda12.1 /usr/local/cuda-12.1 /usr/local/cuda-12.1

FROM ${BASE_TARGET} as final
# Install LLVM
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
COPY --from=openssl /opt/openssl /opt/openssl
COPY --from=patchelf /patchelf /usr/local/bin/patchelf
COPY --from=conda /opt/conda /opt/conda
Expand Down
3 changes: 0 additions & 3 deletions libtorch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ RUN bash ./install_rocm_drm.sh && rm install_rocm_drm.sh
RUN bash ./install_rocm_magma.sh && rm install_rocm_magma.sh

FROM ${BASE_TARGET} as final
# Install LLVM
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
COPY --from=openssl /opt/openssl /opt/openssl
# Install patchelf
ADD ./common/install_patchelf.sh install_patchelf.sh
Expand Down
2 changes: 0 additions & 2 deletions manywheel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ RUN git config --global --add safe.directory "*"

ENV SSL_CERT_FILE=/opt/_internal/certs.pem
# Install LLVM version
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
COPY --from=openssl /opt/openssl /opt/openssl
COPY --from=python /opt/python /opt/python
COPY --from=python /opt/_internal /opt/_internal
Expand Down
2 changes: 0 additions & 2 deletions manywheel/Dockerfile_2014
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ RUN git config --global --add safe.directory "*"

ENV SSL_CERT_FILE=/opt/_internal/certs.pem
# Install LLVM version
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
COPY --from=openssl /opt/openssl /opt/openssl
COPY --from=base /opt/python /opt/python
COPY --from=base /opt/_internal /opt/_internal
Expand Down
2 changes: 0 additions & 2 deletions manywheel/Dockerfile_cxx11-abi
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ ADD ./common/install_libpng.sh install_libpng.sh
RUN bash ./install_libpng.sh && rm install_libpng.sh

FROM base as final
COPY --from=pytorch/llvm:9.0.1 /opt/llvm /opt/llvm
COPY --from=pytorch/llvm:9.0.1 /opt/llvm_no_cxx11_abi /opt/llvm_no_cxx11_abi
COPY --from=openssl /opt/openssl /opt/openssl
COPY --from=python /opt/python /opt/python
COPY --from=python /opt/_internal /opt/_internal
Expand Down
4 changes: 0 additions & 4 deletions manywheel/build_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,8 @@ esac

if [[ "$DESIRED_DEVTOOLSET" == *"cxx11-abi"* ]]; then
export _GLIBCXX_USE_CXX11_ABI=1
export USE_LLVM="/opt/llvm"
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
else
export _GLIBCXX_USE_CXX11_ABI=0
export USE_LLVM="/opt/llvm_no_cxx11_abi"
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
fi

if [[ "$DESIRED_CUDA" == *"rocm"* ]]; then
Expand Down
4 changes: 0 additions & 4 deletions manywheel/build_libtorch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,8 @@ fi

if [[ "$DESIRED_DEVTOOLSET" == *"cxx11-abi"* ]]; then
export _GLIBCXX_USE_CXX11_ABI=1
export USE_LLVM="/opt/llvm"
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
else
export _GLIBCXX_USE_CXX11_ABI=0
export USE_LLVM="/opt/llvm_no_cxx11_abi"
export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
fi

if [[ "$DESIRED_CUDA" == *"rocm"* ]]; then
Expand Down

0 comments on commit 4aded79

Please sign in to comment.