Skip to content

Commit 973e62f

Browse files
committed
remove conda hack per devinfra on "Bump pinned PT commit to 20250616 and mirror torch/standalone to ExecuTorch"
PyTorch added torch/standalone as a c10 dependency, so we need to mirror it to do a pin bump. Differential Revision: [D76909683](https://our.internmc.facebook.com/intern/diff/D76909683/) [ghstack-poisoned]
2 parents 7669c51 + 833bdcc commit 973e62f

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

.ci/docker/common/install_conda.sh

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
1313
install_miniconda() {
1414
BASE_URL="https://repo.anaconda.com/miniconda"
1515
CONDA_FILE="Miniconda3-py${PYTHON_VERSION//./}_${MINICONDA_VERSION}-Linux-x86_64.sh"
16-
if [[ $(uname -m) == "aarch64" ]]; then
16+
if [[ $(uname -m) == "aarch64" ]]; then
1717
CONDA_FILE="Miniconda3-py${PYTHON_VERSION//./}_${MINICONDA_VERSION}-Linux-aarch64.sh"
1818
fi
1919

@@ -54,21 +54,6 @@ install_pip_dependencies() {
5454
popd
5555
}
5656

57-
fix_conda_ubuntu_libstdcxx() {
58-
cat /etc/issue
59-
# WARNING: This is a HACK from PyTorch core to be able to build PyTorch on 22.04.
60-
# Specifically, ubuntu-20+ all comes lib libstdc++ newer than 3.30+, but anaconda
61-
# is stuck with 3.29. So, remove libstdc++6.so.3.29 as installed by
62-
# https://anaconda.org/anaconda/libstdcxx-ng/files?version=11.2.0
63-
#
64-
# PyTorch sev: https://github.com/pytorch/pytorch/issues/105248
65-
# Ref: https://github.com/pytorch/pytorch/blob/main/.ci/docker/common/install_conda.sh
66-
if grep -e "2[02].04." /etc/issue >/dev/null; then
67-
rm /opt/conda/envs/py_${PYTHON_VERSION}/lib/libstdc++.so*
68-
fi
69-
}
70-
7157
install_miniconda
7258
install_python
7359
install_pip_dependencies
74-
fix_conda_ubuntu_libstdcxx

0 commit comments

Comments
 (0)