Skip to content

Commit 11916bb

Browse files
committed
Refactor dockerfiles and deprecate stable_stack and jax_ai_image mode
1 parent 2182311 commit 11916bb

20 files changed

Lines changed: 128 additions & 449 deletions

.github/workflows/UploadDockerImages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ jobs:
6565
- device: tpu
6666
build_mode: stable
6767
image_name: maxtext_jax_stable
68-
dockerfile: ./dependencies/dockerfiles/maxtext_dependencies.Dockerfile
68+
dockerfile: ./dependencies/dockerfiles/maxtext_tpu_dependencies.Dockerfile
6969
- device: tpu
7070
build_mode: nightly
7171
image_name: maxtext_jax_nightly
72-
dockerfile: ./dependencies/dockerfiles/maxtext_dependencies.Dockerfile
72+
dockerfile: ./dependencies/dockerfiles/maxtext_tpu_dependencies.Dockerfile
7373
uses: ./.github/workflows/build_and_push_docker_image.yml
7474
with:
7575
image_name: ${{ matrix.image_name }}

.github/workflows/build_and_push_docker_image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
DEVICE=${{ inputs.device }}
114114
MODE=${{ inputs.build_mode }}
115115
JAX_VERSION=NONE
116-
LIBTPU_GCS_PATH=NONE
116+
LIBTPU_VERSION=NONE
117117
BASEIMAGE=gcr.io/tpu-prod-env-multipod/maxtext_jax_stable:${{ inputs.image_date }}
118118
119119
- name: Add tags to Docker image

PREFLIGHT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bash preflight.sh PLATFORM=GCE && numactl --membind 0 --cpunodebind=0 python3 -m
2626
```
2727

2828
For GKE,
29-
`numactl` should be built into your docker image from [maxtext_dependencies.Dockerfile](https://github.com/google/maxtext/blob/main/dependencies/dockerfiles/maxtext_dependencies.Dockerfile), so you can use it directly if you built the maxtext docker image. Here is an example
29+
`numactl` should be built into your docker image from [maxtext_tpu_dependencies.Dockerfile](https://github.com/google/maxtext/blob/main/dependencies/dockerfiles/maxtext_tpu_dependencies.Dockerfile), so you can use it directly if you built the maxtext docker image. Here is an example
3030

3131
```
3232
bash preflight.sh PLATFORM=GKE && numactl --membind 0 --cpunodebind=0 python3 -m MaxText.train src/MaxText/configs/base.yml run_name=$YOUR_JOB_NAME

RESTRUCTURE.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@ comments, or questions by creating a new
2727
├── README.md
2828
├── dependencies/
2929
│ ├── dockerfiles/
30-
│ │ ├── jetstream_pathways.Dockerfile
31-
│ │ ├── maxengine_server.Dockerfile
3230
│ │ ├── maxtext_custom_wheels.Dockerfile
33-
│ │ ├── maxtext_db_dependencies.Dockerfile
34-
│ │ ├── maxtext_dependencies.Dockerfile
31+
│ │ ├── maxtext_tpu_dependencies.Dockerfile
3532
│ │ ├── maxtext_gpu_dependencies.Dockerfile
36-
│ │ ├── maxtext_jax_ai_image.Dockerfile
37-
│ │ ├── maxtext_libtpu_path.Dockerfile
3833
│ │ └── maxtext_runner.Dockerfile
3934
│ ├── requirements/
4035
│ │ └── requirements.txt

dependencies/dockerfiles/jetstream_pathways.Dockerfile

Lines changed: 0 additions & 54 deletions
This file was deleted.

dependencies/dockerfiles/maxengine_server.Dockerfile

Lines changed: 0 additions & 48 deletions
This file was deleted.

dependencies/dockerfiles/maxtext_dependencies.Dockerfile

Lines changed: 0 additions & 55 deletions
This file was deleted.

dependencies/dockerfiles/maxtext_jax_ai_image.Dockerfile

Lines changed: 0 additions & 78 deletions
This file was deleted.

dependencies/dockerfiles/maxtext_libtpu_path.Dockerfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

dependencies/dockerfiles/maxtext_post_training_dependencies.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG BASEIMAGE
15+
ARG BASEIMAGE=maxtext_base_image
1616
FROM ${BASEIMAGE}
17-
ARG MODE
1817

18+
ARG MODE
1919
ENV MODE=$MODE
2020

2121
RUN echo "Installing Post-Training dependencies (vLLM, tpu-inference, tunix) with MODE=${MODE}"

0 commit comments

Comments
 (0)