Skip to content

Commit 2eb63a2

Browse files
fix ci
1 parent 23da49f commit 2eb63a2

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

.github/workflows/run_tests_against_package.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,11 @@ jobs:
9494
XLA_PYTHON_CLIENT_MEM_FRACTION: ${{ inputs.xla_python_client_mem_fraction }}
9595
TF_FORCE_GPU_ALLOW_GROWTH: ${{ inputs.tf_force_gpu_allow_growth }}
9696
TPU_SKIP_MDS_QUERY: ${{ inputs.device_type == 'cpu' && '1' || '' }}
97+
# ROCm installs the wheel with --no-deps plus a pinned requirements file; never use TPU wheel extras.
9798
MAXTEXT_PACKAGE_EXTRA: >-
9899
${{
99-
!contains(inputs.pytest_marker, 'not post_training') && 'tpu-post-train'
100+
inputs.device_type == 'rocm' && 'rocm'
101+
|| !contains(inputs.pytest_marker, 'not post_training') && 'tpu-post-train'
100102
|| (inputs.device_type == 'cpu' && 'tpu' || inputs.device_type)
101103
}}
102104
ALLOW_MULTIPLE_LIBTPU_LOAD: ${{ inputs.device_type == 'cpu' && 'true' || '' }} # bypass /tmp/libtpu_lockfile check for cpu tests, which don't actually use accelerators (to allow concurrency)
@@ -131,7 +133,11 @@ jobs:
131133
uv pip install -r "${{ inputs.requirements_file }}"
132134
fi
133135
uv pip install ${maxtext_wheel} --no-deps
134-
uv pip install -r src/dependencies/github_deps/pre_train_deps.txt
136+
# When a requirements file is set (e.g. decoupled or rocm-unit JAX stacks), it already
137+
# carries test/runtime pins; otherwise add GitHub-sourced pins (no TPU extra / scripts).
138+
if [ -z "${{ inputs.requirements_file }}" ]; then
139+
uv pip install -r src/dependencies/extra_deps/pre_train_github_deps.txt --no-deps
140+
fi
135141
else
136142
if [ -n "${{ inputs.requirements_file }}" ]; then
137143
echo "Installing requirements from ${{ inputs.requirements_file }}"

.github/workflows/run_tests_coordinator.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ jobs:
116116
"gpu-integration": "not cpu_only and not tpu_only and integration_test and not post_training",
117117
"cpu-unit": "cpu_only and not post_training",
118118
"cpu-post-training-unit": "cpu_only and post_training",
119-
"rocm-unit": "not cpu_only and not tpu_only and not integration_test and not post_training and not decoupled",
120-
"rocm-decoupled": "decoupled"
119+
"rocm-unit": "not cpu_only and not tpu_only and not decoupled",
120+
"rocm-decoupled": "not cpu_only and not tpu_only and decoupled"
121121
}')[inputs.flavor] }}
122122
123123
pytest_addopts: >-
@@ -144,7 +144,7 @@ jobs:
144144
"gpu-integration": "--ignore=tests/post_training",
145145
"cpu-unit": "--ignore=tests/post_training",
146146
"cpu-post-training-unit": "",
147-
"rocm-unit": "--ignore=tests/post_training",
147+
"rocm-unit": "",
148148
"rocm-decoupled": ""
149149
}')[inputs.flavor] }}
150150

0 commit comments

Comments
 (0)