Skip to content

Commit 56e55bb

Browse files
authored
[main] Miniforge change (#75)
* change conda install * Update install_conda_docker.sh * moving back to gitlab from temporary fix
1 parent 9c37fa5 commit 56e55bb

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

common/install_conda_docker.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
#!/bin/bash
22
# Script used only in CD pipeline
33
set -ex
4-
54
# Anaconda
65
# Latest anaconda is using openssl-3 which is incompatible with all currently published versions of git
76
# Which are using openssl-1.1.1, see https://anaconda.org/anaconda/git/files?version=2.40.1 for example
8-
MINICONDA_URL=https://repo.anaconda.com/miniconda/Miniconda3-py311_23.5.2-0-Linux-x86_64.sh
7+
MINICONDA_URL=https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh
98
wget -q $MINICONDA_URL
109
# NB: Manually invoke bash per https://github.com/conda/conda/issues/10431
1110
bash $(basename "$MINICONDA_URL") -b -p /opt/conda
1211
rm $(basename "$MINICONDA_URL")
1312
export PATH=/opt/conda/bin:$PATH
14-
# See https://github.com/pytorch/builder/issues/1473
13+
14+
# First specifically install Python 3.11 which is compatible with conda 23.5.2
15+
conda install -y python=3.11
16+
1517
# Pin conda to 23.5.2 as it's the last one compatible with openssl-1.1.1
1618
conda install -y conda=23.5.2 conda-build anaconda-client git ninja
19+
1720
# The cmake version here needs to match with the minimum version of cmake
1821
# supported by PyTorch (3.18). There is only 3.18.2 on anaconda
1922
/opt/conda/bin/pip3 install cmake==3.18.2

common/install_rocm_drm.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ python3 -m pip install meson ninja
2424
###########################
2525
### clone repo
2626
###########################
27-
# TEMPORARY FIX: https://gitlab.freedesktop.org/mesa/drm.git is down until 2025/03/22
28-
# GIT_SSL_NO_VERIFY=true git clone https://gitlab.freedesktop.org/mesa/drm.git
29-
GIT_SSL_NO_VERIFY=true git clone git://anongit.freedesktop.org/mesa/drm
27+
GIT_SSL_NO_VERIFY=true git clone https://gitlab.freedesktop.org/mesa/drm.git
3028
pushd drm
3129

3230
###########################

0 commit comments

Comments
 (0)