Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit b555b54

Browse files
authored
[master] CI/CD updates to be more stable (#20740)
* Since website s3 push and publish is not run inside a container, just use the awscli installed in the jenkins slave (which is updated.) When multiple processes are attempting to install a pip package at the same time, there is a race condition that causes them to fail often. * Update variable for CUDA archs in windows make script, so we don't end up building for all. * Fix CUDA arch variable used. * Remove oneapi repo after installing, to alleviate failures when intel publishes corrupt files.
1 parent cea7ab1 commit b555b54

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

ci/build_windows.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class BuildFlavour(Enum):
118118
'-DUSE_BLAS=open '
119119
'-DUSE_LAPACK=ON '
120120
'-DUSE_DIST_KVSTORE=OFF '
121-
'-DMXNET_CUDA_ARCH="5.2" '
121+
'-DMXNET_CUDA_ARCH="5.2 7.5" '
122122
'-DCMAKE_BUILD_TYPE=Release')
123123

124124
, 'WIN_GPU_ONEDNN': (
@@ -131,7 +131,7 @@ class BuildFlavour(Enum):
131131
'-DUSE_BLAS=open '
132132
'-DUSE_LAPACK=ON '
133133
'-DUSE_DIST_KVSTORE=OFF '
134-
'-DMXNET_CUDA_ARCH="5.2" '
134+
'-DMXNET_CUDA_ARCH="5.2 7.5" '
135135
'-DUSE_ONEDNN=ON '
136136
'-DCMAKE_BUILD_TYPE=Release')
137137

ci/docker/Dockerfile.build.ubuntu

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
9191
libb2-dev \
9292
libzstd-dev \
9393
gfortran && \
94-
rm -rf /var/lib/apt/lists/*
94+
rm -rf /var/lib/apt/lists/* && \
95+
add-apt-repository -r "deb https://apt.repos.intel.com/oneapi all main"
9596

9697
# Build OpenBLAS from source
9798
RUN export LIBRARY_PATH=$LIBRARY_PATH:/usr/lib/gcc/x86_64-linux-gnu/7/ && \

ci/docker/runtime_functions.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,6 @@ build_docs_beta() {
13551355
push_docs() {
13561356
folder_name=$1
13571357
set -ex
1358-
pip3 install --user awscli
13591358
export PATH=~/.local/bin:$PATH
13601359
pushd docs/_build
13611360
tar -xzf full_website.tgz --strip-components 1
@@ -1471,7 +1470,6 @@ cd_pypi_publish() {
14711470

14721471
cd_s3_publish() {
14731472
set -ex
1474-
pip3 install --upgrade --user awscli
14751473
filepath=$(readlink -f wheel_build/dist/*.whl)
14761474
filename=$(basename $filepath)
14771475
variant=$(echo $filename | cut -d'-' -f1 | cut -d'_' -f2 -s)

0 commit comments

Comments
 (0)