Skip to content

Commit 54634c4

Browse files
authored
Merge branch 'main' into gemma4_mlx
2 parents b5285d5 + 41a38d8 commit 54634c4

197 files changed

Lines changed: 4446 additions & 1389 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/docker/common/install_android.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ install_ndk() {
4343
ARCH=$(uname -m)
4444
if [ "${ARCH}" = "aarch64" ]; then
4545
# aarch64 NDK is not cached on S3, download from Google directly
46-
curl -Os --retry 3 "https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux.zip"
46+
curl -Os --retry 3 --retry-all-errors "https://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux.zip"
4747
else
4848
# The NDK installation is cached on ossci-android S3 bucket
49-
curl -Os --retry 3 "https://ossci-android.s3.amazonaws.com/android-ndk-${ANDROID_NDK_VERSION}-linux.zip"
49+
curl -Os --retry 3 --retry-all-errors "https://ossci-android.s3.amazonaws.com/android-ndk-${ANDROID_NDK_VERSION}-linux.zip"
5050
fi
5151
unzip -qo "android-ndk-${ANDROID_NDK_VERSION}-linux.zip"
5252

@@ -62,7 +62,7 @@ install_cmdtools() {
6262

6363
pushd /tmp
6464
# The file is cached on ossci-android S3 bucket
65-
curl -Os --retry 3 "https://ossci-android.s3.us-west-1.amazonaws.com/${CMDTOOLS_FILENAME}"
65+
curl -Os --retry 3 --retry-all-errors "https://ossci-android.s3.us-west-1.amazonaws.com/${CMDTOOLS_FILENAME}"
6666
unzip -qo "${CMDTOOLS_FILENAME}" -d /opt
6767

6868
ls -lah /opt/cmdline-tools/bin

.ci/docker/common/install_cache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ install_ubuntu() {
3434

3535
install_binary() {
3636
echo "Downloading sccache binary from S3 repo"
37-
curl --retry 3 https://s3.amazonaws.com/ossci-linux/sccache -o /opt/cache/bin/sccache
37+
curl --retry 3 --retry-all-errors https://s3.amazonaws.com/ossci-linux/sccache -o /opt/cache/bin/sccache
3838
chmod +x /opt/cache/bin/sccache
3939
}
4040

.ci/docker/common/install_docs_reqs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ if [ -n "$BUILD_DOCS" ]; then
1212
# Ignore error if gpg-agent doesn't exist (for Ubuntu 16.04)
1313
apt-get install -y gpg-agent || :
1414

15-
curl --retry 3 -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
15+
curl --retry 3 --retry-all-errors -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
1616
sudo apt-get install -y nodejs
1717

18-
curl --retry 3 -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
18+
curl --retry 3 --retry-all-errors -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
1919
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
2020

2121
apt-get update

.ci/docker/common/install_linter.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
1515
pip_install -r requirements-lintrunner.txt
1616

1717
# Install google-java-format
18-
curl -L --retry 3 https://github.com/google/google-java-format/releases/download/v1.23.0/google-java-format_linux-x86-64 > /opt/google-java-format
18+
curl -L --retry 3 --retry-all-errors https://github.com/google/google-java-format/releases/download/v1.23.0/google-java-format_linux-x86-64 > /opt/google-java-format
1919
chmod +x /opt/google-java-format

.ci/scripts/setup-emscripten.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -ex
99

1010
# need version >= 17
1111
install_node() {
12-
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
12+
curl --retry 3 --retry-all-errors -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
1313
source "$HOME/.nvm/nvm.sh"
1414
nvm install 22
1515
}

.ci/scripts/setup-macos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ install_buck() {
3434
# team for help.
3535
BUCK2_VERSION=$(cat ci_commit_pins/buck2.txt)
3636
BUCK2=buck2-aarch64-apple-darwin-${BUCK2_VERSION}.zst
37-
curl -s "https://ossci-macos.s3.amazonaws.com/${BUCK2}" -o "${BUCK2}"
37+
curl -s --retry 3 --retry-all-errors "https://ossci-macos.s3.amazonaws.com/${BUCK2}" -o "${BUCK2}"
3838

3939
zstd -d "${BUCK2}" -o buck2
4040

@@ -68,7 +68,7 @@ install_sccache() {
6868
# NB: The function is adopted from PyTorch MacOS build workflow
6969
# https://github.com/pytorch/pytorch/blob/main/.github/workflows/_mac-build.yml
7070
if ! command -v sccache &> /dev/null; then
71-
sudo curl --retry 3 "https://s3.amazonaws.com/ossci-macos/sccache/sccache-v0.4.1-${RUNNER_ARCH}" --output "${SCCACHE_PATH}/sccache"
71+
sudo curl --retry 3 --retry-all-errors "https://s3.amazonaws.com/ossci-macos/sccache/sccache-v0.4.1-${RUNNER_ARCH}" --output "${SCCACHE_PATH}/sccache"
7272
sudo chmod +x "${SCCACHE_PATH}/sccache"
7373
fi
7474

.ci/scripts/setup-mediatek-deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ install_neuropilot() {
1414
echo "Start installing neuropilot."
1515
mkdir -p "${MEDIATEK_INSTALLATION_DIR}"
1616

17-
curl -Lo /tmp/neuropilot-express.tar.gz "https://s3.ap-southeast-1.amazonaws.com/mediatek.neuropilot.com/06302508-4c94-4bf2-9789-b0ee44e83e27.gz"
17+
curl -Lo /tmp/neuropilot-express.tar.gz --retry 3 --retry-all-errors "https://s3.ap-southeast-1.amazonaws.com/mediatek.neuropilot.com/06302508-4c94-4bf2-9789-b0ee44e83e27.gz"
1818
echo "Finishing downloading neuropilot sdk."
1919
tar zxvf /tmp/neuropilot-express.tar.gz --strip-components=1 --directory "${MEDIATEK_INSTALLATION_DIR}"
2020
echo "Finishing unzip neuropilot sdk."
@@ -33,7 +33,7 @@ setup_neuropilot() {
3333
}
3434

3535
setup_calibration_data() {
36-
curl -Lo /tmp/imagenette2-160.tgz https://s3.amazonaws.com/fast-ai-imageclas/imagenette2-160.tgz
36+
curl -Lo /tmp/imagenette2-160.tgz --retry 3 --retry-all-errors https://s3.amazonaws.com/fast-ai-imageclas/imagenette2-160.tgz
3737
tar zxvf /tmp/imagenette2-160.tgz --strip-components=1 --directory "${MEDIATEK_INSTALLATION_DIR}"
3838
}
3939

.ci/scripts/setup-openvino.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ else
3737
echo "Using OpenVINO stable release: ${OPENVINO_BUILD}"
3838
fi
3939

40-
curl -Lo /tmp/openvino_toolkit.tgz --retry 3 --fail ${OPENVINO_URL}
40+
curl -Lo /tmp/openvino_toolkit.tgz --retry 3 --retry-all-errors --fail ${OPENVINO_URL}
4141
tar -xzf /tmp/openvino_toolkit.tgz
4242
mv "${OPENVINO_EXTRACTED_DIR}" openvino
4343

.ci/scripts/setup-samsung-linux-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ download_and_extract() {
4343
local out_file="$3"
4444

4545
echo "Downloading from ${download_url}..."
46-
curl -fsSL --retry 3 \
46+
curl -fsSL --retry 3 --retry-all-errors \
4747
-H "apikey: ${API_KEY}" \
4848
-o "${out_file}" \
4949
"${download_url}"

.ci/scripts/setup-vulkan-linux-deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ install_swiftshader() {
1616

1717
_tmp_archive="/tmp/${_swiftshader_archive}"
1818

19-
curl --silent --show-error --location --fail --retry 3 \
19+
curl --silent --show-error --location --fail --retry 3 --retry-all-errors \
2020
--output "${_tmp_archive}" "$_https_amazon_aws/${_swiftshader_archive}"
2121

2222
tar -C "${_swiftshader_dir}" -xzf "${_tmp_archive}"
@@ -35,7 +35,7 @@ install_vulkan_sdk() {
3535

3636
_tmp_archive="/tmp/vulkansdk.tar.gz"
3737

38-
curl --silent --show-error --location --fail --retry 3 \
38+
curl --silent --show-error --location --fail --retry 3 --retry-all-errors \
3939
--output "${_tmp_archive}" "${_vulkan_sdk_url}"
4040

4141
tar -C "${_vulkan_sdk_dir}" -xJf "${_tmp_archive}"

0 commit comments

Comments
 (0)