Skip to content

Commit 339e49c

Browse files
Google-ML-AutomationGoogle-ML-Automation
committed
Merge pull request #33484 from emilyfertig:emilyaf-ft-portpicker
PiperOrigin-RevId: 835935258
2 parents 8919e1c + 3d8c7df commit 339e49c

11 files changed

+59
-19
lines changed

‎build/nonfreethreading-requirements.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ zstandard; python_version<"3.14"
1212
tensorstore; python_version<"3.14"
1313

1414
# For jax2tf_test
15-
tensorflow; python_version<"3.14"
16-
17-
# For multiprocess tests.
18-
portpicker
15+
tensorflow; python_version<"3.14"

‎build/requirements_lock_3_11.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ pluggy==1.6.0 \
12971297
portpicker==1.6.0 \
12981298
--hash=sha256:b2787a41404cf7edbe29b07b9e0ed863b09f2665dcc01c1eb0c2261c1e7d0755 \
12991299
--hash=sha256:bd507fd6f96f65ee02781f2e674e9dc6c99bbfa6e3c39992e3916204c9d431fa
1300-
# via -r build/nonfreethreading-requirements.txt
1300+
# via -r build/test-requirements.txt
13011301
protobuf==6.33.1 \
13021302
--hash=sha256:023af8449482fa884d88b4563d85e83accab54138ae098924a985bcbb734a213 \
13031303
--hash=sha256:0f4cf01222c0d959c2b399142deb526de420be8236f22c71356e2a544e153c53 \

‎build/requirements_lock_3_12.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ pluggy==1.6.0 \
12971297
portpicker==1.6.0 \
12981298
--hash=sha256:b2787a41404cf7edbe29b07b9e0ed863b09f2665dcc01c1eb0c2261c1e7d0755 \
12991299
--hash=sha256:bd507fd6f96f65ee02781f2e674e9dc6c99bbfa6e3c39992e3916204c9d431fa
1300-
# via -r build/nonfreethreading-requirements.txt
1300+
# via -r build/test-requirements.txt
13011301
protobuf==6.33.1 \
13021302
--hash=sha256:023af8449482fa884d88b4563d85e83accab54138ae098924a985bcbb734a213 \
13031303
--hash=sha256:0f4cf01222c0d959c2b399142deb526de420be8236f22c71356e2a544e153c53 \

‎build/requirements_lock_3_13.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ pluggy==1.6.0 \
13071307
portpicker==1.6.0 \
13081308
--hash=sha256:b2787a41404cf7edbe29b07b9e0ed863b09f2665dcc01c1eb0c2261c1e7d0755 \
13091309
--hash=sha256:bd507fd6f96f65ee02781f2e674e9dc6c99bbfa6e3c39992e3916204c9d431fa
1310-
# via -r build/nonfreethreading-requirements.txt
1310+
# via -r build/test-requirements.txt
13111311
protobuf==6.33.1 \
13121312
--hash=sha256:023af8449482fa884d88b4563d85e83accab54138ae098924a985bcbb734a213 \
13131313
--hash=sha256:0f4cf01222c0d959c2b399142deb526de420be8236f22c71356e2a544e153c53 \

‎build/requirements_lock_3_13_ft.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,31 @@ pluggy==1.6.0 \
822822
--hash=sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 \
823823
--hash=sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746
824824
# via pytest
825+
portpicker==1.6.0 \
826+
--hash=sha256:b2787a41404cf7edbe29b07b9e0ed863b09f2665dcc01c1eb0c2261c1e7d0755 \
827+
--hash=sha256:bd507fd6f96f65ee02781f2e674e9dc6c99bbfa6e3c39992e3916204c9d431fa
828+
# via -r build/test-requirements.txt
829+
psutil==7.1.3 \
830+
--hash=sha256:0005da714eee687b4b8decd3d6cc7c6db36215c9e74e5ad2264b90c3df7d92dc \
831+
--hash=sha256:1068c303be3a72f8e18e412c5b2a8f6d31750fb152f9cb106b54090296c9d251 \
832+
--hash=sha256:18349c5c24b06ac5612c0428ec2a0331c26443d259e2a0144a9b24b4395b58fa \
833+
--hash=sha256:19644c85dcb987e35eeeaefdc3915d059dac7bd1167cdcdbf27e0ce2df0c08c0 \
834+
--hash=sha256:2bdbcd0e58ca14996a42adf3621a6244f1bb2e2e528886959c72cf1e326677ab \
835+
--hash=sha256:31d77fcedb7529f27bb3a0472bea9334349f9a04160e8e6e5020f22c59893264 \
836+
--hash=sha256:3792983e23b69843aea49c8f5b8f115572c5ab64c153bada5270086a2123c7e7 \
837+
--hash=sha256:3bb428f9f05c1225a558f53e30ccbad9930b11c3fc206836242de1091d3e7dd3 \
838+
--hash=sha256:56d974e02ca2c8eb4812c3f76c30e28836fffc311d55d979f1465c1feeb2b68b \
839+
--hash=sha256:6c86281738d77335af7aec228328e944b30930899ea760ecf33a4dba66be5e74 \
840+
--hash=sha256:8f33a3702e167783a9213db10ad29650ebf383946e91bc77f28a5eb083496bc9 \
841+
--hash=sha256:95ef04cf2e5ba0ab9eaafc4a11eaae91b44f4ef5541acd2ee91d9108d00d59a7 \
842+
--hash=sha256:ad81425efc5e75da3f39b3e636293360ad8d0b49bed7df824c79764fb4ba9b8b \
843+
--hash=sha256:b403da1df4d6d43973dc004d19cee3b848e998ae3154cc8097d139b77156c353 \
844+
--hash=sha256:bc31fa00f1fbc3c3802141eede66f3a2d51d89716a194bf2cd6fc68310a19880 \
845+
--hash=sha256:bd0d69cee829226a761e92f28140bec9a5ee9d5b4fb4b0cc589068dbfff559b1 \
846+
--hash=sha256:c525ffa774fe4496282fb0b1187725793de3e7c6b29e41562733cae9ada151ee \
847+
--hash=sha256:f39c2c19fe824b47484b96f9692932248a54c43799a84282cfe58d05a6449efd \
848+
--hash=sha256:fac9cd332c67f4422504297889da5ab7e05fd11e3c4392140f7370f4208ded1f
849+
# via portpicker
825850
pyelftools==0.32 \
826851
--hash=sha256:013df952a006db5e138b1edf6d8a68ecc50630adbd0d83a2d41e7f846163d738 \
827852
--hash=sha256:6de90ee7b8263e740c8715a925382d4099b354f29ac48ea40d840cf7aa14ace5

‎build/requirements_lock_3_14.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ pluggy==1.6.0 \
525525
portpicker==1.6.0 \
526526
--hash=sha256:b2787a41404cf7edbe29b07b9e0ed863b09f2665dcc01c1eb0c2261c1e7d0755 \
527527
--hash=sha256:bd507fd6f96f65ee02781f2e674e9dc6c99bbfa6e3c39992e3916204c9d431fa
528-
# via -r build/nonfreethreading-requirements.txt
528+
# via -r build/test-requirements.txt
529529
psutil==7.1.3 \
530530
--hash=sha256:0005da714eee687b4b8decd3d6cc7c6db36215c9e74e5ad2264b90c3df7d92dc \
531531
--hash=sha256:1068c303be3a72f8e18e412c5b2a8f6d31750fb152f9cb106b54090296c9d251 \

‎build/requirements_lock_3_14_ft.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,31 @@ pluggy==1.6.0 \
522522
--hash=sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 \
523523
--hash=sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746
524524
# via pytest
525+
portpicker==1.6.0 \
526+
--hash=sha256:b2787a41404cf7edbe29b07b9e0ed863b09f2665dcc01c1eb0c2261c1e7d0755 \
527+
--hash=sha256:bd507fd6f96f65ee02781f2e674e9dc6c99bbfa6e3c39992e3916204c9d431fa
528+
# via -r build/test-requirements.txt
529+
psutil==7.1.3 \
530+
--hash=sha256:0005da714eee687b4b8decd3d6cc7c6db36215c9e74e5ad2264b90c3df7d92dc \
531+
--hash=sha256:1068c303be3a72f8e18e412c5b2a8f6d31750fb152f9cb106b54090296c9d251 \
532+
--hash=sha256:18349c5c24b06ac5612c0428ec2a0331c26443d259e2a0144a9b24b4395b58fa \
533+
--hash=sha256:19644c85dcb987e35eeeaefdc3915d059dac7bd1167cdcdbf27e0ce2df0c08c0 \
534+
--hash=sha256:2bdbcd0e58ca14996a42adf3621a6244f1bb2e2e528886959c72cf1e326677ab \
535+
--hash=sha256:31d77fcedb7529f27bb3a0472bea9334349f9a04160e8e6e5020f22c59893264 \
536+
--hash=sha256:3792983e23b69843aea49c8f5b8f115572c5ab64c153bada5270086a2123c7e7 \
537+
--hash=sha256:3bb428f9f05c1225a558f53e30ccbad9930b11c3fc206836242de1091d3e7dd3 \
538+
--hash=sha256:56d974e02ca2c8eb4812c3f76c30e28836fffc311d55d979f1465c1feeb2b68b \
539+
--hash=sha256:6c86281738d77335af7aec228328e944b30930899ea760ecf33a4dba66be5e74 \
540+
--hash=sha256:8f33a3702e167783a9213db10ad29650ebf383946e91bc77f28a5eb083496bc9 \
541+
--hash=sha256:95ef04cf2e5ba0ab9eaafc4a11eaae91b44f4ef5541acd2ee91d9108d00d59a7 \
542+
--hash=sha256:ad81425efc5e75da3f39b3e636293360ad8d0b49bed7df824c79764fb4ba9b8b \
543+
--hash=sha256:b403da1df4d6d43973dc004d19cee3b848e998ae3154cc8097d139b77156c353 \
544+
--hash=sha256:bc31fa00f1fbc3c3802141eede66f3a2d51d89716a194bf2cd6fc68310a19880 \
545+
--hash=sha256:bd0d69cee829226a761e92f28140bec9a5ee9d5b4fb4b0cc589068dbfff559b1 \
546+
--hash=sha256:c525ffa774fe4496282fb0b1187725793de3e7c6b29e41562733cae9ada151ee \
547+
--hash=sha256:f39c2c19fe824b47484b96f9692932248a54c43799a84282cfe58d05a6449efd \
548+
--hash=sha256:fac9cd332c67f4422504297889da5ab7e05fd11e3c4392140f7370f4208ded1f
549+
# via portpicker
525550
pyelftools==0.32 \
526551
--hash=sha256:013df952a006db5e138b1edf6d8a68ecc50630adbd0d83a2d41e7f846163d738 \
527552
--hash=sha256:6de90ee7b8263e740c8715a925382d4099b354f29ac48ea40d840cf7aa14ace5

‎build/test-requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ flatbuffers
55
hypothesis==6.142.1 # TODO(justinfu): Fix test failures surfaced by Hypothesis 6.147.0 and remove pin.
66
mpmath>=1.3
77
pillow>=11.3
8+
portpicker
89
pytest<9.0 # Works around https://github.com/pytest-dev/pytest/issues/13895
910
pytest-xdist
1011
rich

‎ci/run_bazel_test_cpu_rbe.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fi
6464

6565
# TODO(b/446172564): Remove this condition when the test is fixed on all
6666
# platforms.
67-
if [[ $os == "linux" ]] && [[ $arch == "x86_64" ]] && [[ $FREETHREADED_FLAG_VALUE == "no" ]]; then
67+
if [[ $os == "linux" ]] && [[ $arch == "x86_64" ]]; then
6868
IGNORE_TESTS=""
6969
else
7070
IGNORE_TESTS="-//tests/multiprocess:array_test_cpu"

‎ci/run_bazel_test_cuda_non_rbe.sh‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,6 @@ bazel test --config=$TEST_CONFIG \
129129
first_bazel_cmd_retval=$?
130130

131131
echo "Running multi-accelerator tests (without RBE)..."
132-
if [[ $FREETHREADED_FLAG_VALUE == "yes" ]]; then
133-
# TODO(emilyaf): Enable multiprocess tests once portpicker is available.
134-
IGNORE_TESTS="-//tests/multiprocess:gpu_tests"
135-
else
136-
IGNORE_TESTS=""
137-
fi
138132
# Runs multiaccelerator tests with all GPUs directly on the VM without RBE..
139133
bazel test --config=$TEST_CONFIG \
140134
$CACHE_OPTION \
@@ -153,10 +147,8 @@ bazel test --config=$TEST_CONFIG \
153147
--action_env=NCCL_DEBUG=WARN \
154148
--color=yes \
155149
--config=cuda_libraries_from_stubs \
156-
-- \
157150
//tests:gpu_tests //tests/pallas:gpu_tests \
158-
//tests/multiprocess:gpu_tests \
159-
$IGNORE_TESTS
151+
//tests/multiprocess:gpu_tests
160152

161153
# Store the return value of the second bazel command.
162154
second_bazel_cmd_retval=$?

0 commit comments

Comments
 (0)