Skip to content

Commit c65cbd1

Browse files
committed
source install wheels script from the build scripts
1 parent de73307 commit c65cbd1

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

ci/run_pytest_cpu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ set -exu -o history -o allexport
2626
# Inherit default JAXCI environment variables.
2727
source ci/envs/default.env
2828

29-
# Install jaxlib wheel on the system.
30-
export JAXCI_INSTALL_WHEELS_LOCALLY=1
29+
echo "Installing wheels locally..."
30+
source ./ci/utilities/install_wheels_locally.sh
3131

3232
# Set up the build environment.
3333
source "ci/utilities/setup_build_environment.sh"

ci/run_pytest_gpu.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ set -exu -o history -o allexport
2727
source ci/envs/default.env
2828

2929
# Install jaxlib, jax-cuda-plugin, and jax-cuda-pjrt wheels on the system.
30-
export JAXCI_INSTALL_WHEELS_LOCALLY=1
30+
echo "Installing wheels locally..."
31+
source ./ci/utilities/install_wheels_locally.sh
3132

3233
# Set up the build environment.
3334
source "ci/utilities/setup_build_environment.sh"

ci/run_pytest_tpu.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ source ci/envs/default.env
2828

2929
# Install jaxlib wheel on the system. Requires a jaxlib wheel to be present
3030
# inside $JAXCI_OUTPUT_DIR (../dist)
31-
export JAXCI_INSTALL_WHEELS_LOCALLY=1
31+
echo "Installing wheels locally..."
32+
source ./ci/utilities/install_wheels_locally.sh
3233

3334
# Set up the build environment.
3435
source "ci/utilities/setup_build_environment.sh"

ci/utilities/setup_build_environment.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,4 @@ if [[ $(uname -s) =~ "MSYS_NT" ]]; then
7272
echo 'Converting MSYS Linux-like paths to Windows paths (for Docker, Python, etc.)'
7373
# Convert all "_DIR" variables to Windows paths.
7474
source <(python3 ./ci/utilities/convert_msys_paths_to_win_paths.py)
75-
fi
76-
77-
# When running Pytests, we need to install the wheels locally.
78-
if [[ "$JAXCI_INSTALL_WHEELS_LOCALLY" == 1 ]]; then
79-
echo "Installing wheels locally..."
80-
source ./ci/utilities/install_wheels_locally.sh
8175
fi

0 commit comments

Comments
 (0)