Skip to content

Commit 67f4d19

Browse files
fix ci
1 parent fd70099 commit 67f4d19

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
@@ -97,9 +97,11 @@ jobs:
9797
XLA_PYTHON_CLIENT_MEM_FRACTION: ${{ inputs.xla_python_client_mem_fraction }}
9898
TF_FORCE_GPU_ALLOW_GROWTH: ${{ inputs.tf_force_gpu_allow_growth }}
9999
TPU_SKIP_MDS_QUERY: ${{ inputs.device_type == 'cpu' && '1' || '' }}
100+
# ROCm installs the wheel with --no-deps plus a pinned requirements file; never use TPU wheel extras.
100101
MAXTEXT_PACKAGE_EXTRA: >-
101102
${{
102-
!contains(inputs.pytest_marker, 'not post_training') && 'tpu-post-train'
103+
inputs.device_type == 'rocm' && 'rocm'
104+
|| !contains(inputs.pytest_marker, 'not post_training') && 'tpu-post-train'
103105
|| (inputs.device_type == 'cpu' && 'tpu' || inputs.device_type)
104106
}}
105107
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)
@@ -134,7 +136,11 @@ jobs:
134136
uv pip install -r "${{ inputs.requirements_file }}"
135137
fi
136138
uv pip install ${maxtext_wheel} --no-deps
137-
uv pip install -r src/dependencies/github_deps/pre_train_deps.txt
139+
# When a requirements file is set (e.g. decoupled or rocm-unit JAX stacks), it already
140+
# carries test/runtime pins; otherwise add GitHub-sourced pins (no TPU extra / scripts).
141+
if [ -z "${{ inputs.requirements_file }}" ]; then
142+
uv pip install -r src/dependencies/extra_deps/pre_train_github_deps.txt --no-deps
143+
fi
138144
else
139145
if [ -n "${{ inputs.requirements_file }}" ]; then
140146
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
@@ -125,8 +125,8 @@ jobs:
125125
"gpu-integration": "not cpu_only and not tpu_only and integration_test and not post_training",
126126
"cpu-unit": "cpu_only and not post_training",
127127
"cpu-post-training-unit": "cpu_only and post_training",
128-
"rocm-unit": "not cpu_only and not tpu_only and not integration_test and not post_training and not decoupled",
129-
"rocm-decoupled": "decoupled"
128+
"rocm-unit": "not cpu_only and not tpu_only and not decoupled",
129+
"rocm-decoupled": "not cpu_only and not tpu_only and decoupled"
130130
}')[inputs.flavor] }}
131131
132132
pytest_addopts: >-
@@ -153,7 +153,7 @@ jobs:
153153
"gpu-integration": "--ignore=tests/post_training",
154154
"cpu-unit": "--ignore=tests/post_training",
155155
"cpu-post-training-unit": "",
156-
"rocm-unit": "--ignore=tests/post_training",
156+
"rocm-unit": "",
157157
"rocm-decoupled": ""
158158
}')[inputs.flavor] }}
159159
${{ inputs.additional_pytest_args }}

0 commit comments

Comments
 (0)