Skip to content

Commit cc6aea2

Browse files
committed
Move install_maxtext_extra_deps to dependencies directory
1 parent 093ab89 commit cc6aea2

16 files changed

Lines changed: 16 additions & 16 deletions

.github/workflows/build_and_test_maxtext.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ jobs:
262262
tf_force_gpu_allow_growth: false
263263
container_resource_option: "--privileged"
264264
is_scheduled_run: ${{ github.event_name == 'schedule' }}
265-
extra_pip_deps_file: 'src/install_maxtext_extra_deps/extra_post_train_base_deps_from_github.txt'
265+
extra_pip_deps_file: 'src/dependencies/install_maxtext_extra_deps/extra_post_train_base_deps_from_github.txt'
266266
maxtext_sha: ${{ needs.build_and_upload_maxtext_package.outputs.maxtext_sha }}
267267

268268
maxtext_post_training_tpu_unit_tests:
@@ -284,7 +284,7 @@ jobs:
284284
tf_force_gpu_allow_growth: false
285285
container_resource_option: "--privileged"
286286
is_scheduled_run: ${{ github.event_name == 'schedule' }}
287-
extra_pip_deps_file: 'src/install_maxtext_extra_deps/extra_post_train_base_deps_from_github.txt'
287+
extra_pip_deps_file: 'src/dependencies/install_maxtext_extra_deps/extra_post_train_base_deps_from_github.txt'
288288
maxtext_sha: ${{ needs.build_and_upload_maxtext_package.outputs.maxtext_sha }}
289289

290290
maxtext_gpu_integration_tests:

.github/workflows/run_pathways_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
source .venv/bin/activate
8686
maxtext_wheel=$(ls maxtext-*-py3-none-any.whl 2>/dev/null)
8787
uv pip install ${maxtext_wheel}[tpu] --resolution=lowest
88-
uv pip install -r src/install_maxtext_extra_deps/extra_deps_from_github.txt
88+
uv pip install -r src/dependencies/install_maxtext_extra_deps/extra_deps_from_github.txt
8989
python3 --version
9090
python3 -m pip freeze
9191
- name: Copy test assets files

.github/workflows/run_tests_against_package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
source .venv/bin/activate
9797
maxtext_wheel=$(ls maxtext-*-py3-none-any.whl 2>/dev/null)
9898
uv pip install ${maxtext_wheel}[${MAXTEXT_PACKAGE_EXTRA}] --resolution=lowest
99-
uv pip install -r src/install_maxtext_extra_deps/extra_deps_from_github.txt
99+
uv pip install -r src/dependencies/install_maxtext_extra_deps/extra_deps_from_github.txt
100100
python3 --version
101101
python3 -m pip freeze
102102
uv pip install pytest-cov

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@
120120
os.path.join("run_maxtext", "run_maxtext_via_multihost_runner.md"),
121121
os.path.join("reference", "core_concepts", "llm_calculator.ipynb"),
122122
os.path.join("reference", "api_generated", "modules.rst"),
123-
os.path.join("reference", "api_generated", "install_maxtext_extra_deps.rst"),
124-
os.path.join("reference", "api_generated", "install_maxtext_extra_deps.install_github_deps.rst"),
123+
os.path.join("reference", "api_generated", "dependencies.install_maxtext_extra_deps.rst"),
124+
os.path.join("reference", "api_generated", "dependencies.install_maxtext_extra_deps.install_github_deps.rst"),
125125
]
126126

127127

docs/install_maxtext.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ To update dependencies, you will follow these general steps:
104104
1. **Modify Base Requirements**: Update the desired dependencies in `base_requirements/requirements.txt` or the hardware-specific files (`base_requirements/tpu-base-requirements.txt`, `base_requirements/gpu-base-requirements.txt`).
105105
2. **Generate New Files**: Run the `seed-env` CLI tool to generate new, fully-pinned requirements files based on your changes.
106106
3. **Update Project Files**: Copy the newly generated files into the `generated_requirements/` directory.
107-
4. **Handle GitHub Dependencies**: Move any dependencies that are installed directly from GitHub from the generated files to `src/install_maxtext_extra_deps/extra_deps_from_github.txt`.
107+
4. **Handle GitHub Dependencies**: Move any dependencies that are installed directly from GitHub from the generated files to `src/dependencies/install_maxtext_extra_deps/extra_deps_from_github.txt`.
108108
5. **Verify**: Test the new dependencies to ensure the project installs and runs correctly.
109109

110110
The following sections provide detailed instructions for each step.

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ Repository = "https://github.com/AI-Hypercomputer/maxtext.git"
4040
allow-direct-references = true
4141

4242
[tool.hatch.build.targets.wheel]
43-
packages = ["src/MaxText", "src/maxtext", "src/install_maxtext_extra_deps", "src/dependencies"]
43+
packages = ["src/MaxText", "src/maxtext", "src/dependencies/install_maxtext_extra_deps", "src/dependencies"]
4444

4545
# TODO: Add this hook back when it handles device-type parsing
4646
# [tool.hatch.build.targets.wheel.hooks.custom]
4747
# path = "build_hooks.py"
4848

4949
[project.scripts]
50-
install_maxtext_tpu_github_deps = "install_maxtext_extra_deps.install_github_deps:main"
51-
install_maxtext_cuda12_github_deps = "install_maxtext_extra_deps.install_github_deps:main"
52-
install_maxtext_tpu_post_train_extra_deps = "install_maxtext_extra_deps.install_post_train_extra_deps:main"
50+
install_maxtext_tpu_github_deps = "dependencies.install_maxtext_extra_deps.install_github_deps:main"
51+
install_maxtext_cuda12_github_deps = "dependencies.install_maxtext_extra_deps.install_github_deps:main"
52+
install_maxtext_tpu_post_train_extra_deps = "dependencies.install_maxtext_extra_deps.install_post_train_extra_deps:main"
5353
docker_build_dependency_image = "dependencies.scripts.docker_build_dependency_image:main"
5454
docker_upload_runner = "dependencies.scripts.docker_upload_runner:main"

src/dependencies/dockerfiles/maxtext_gpu_dependencies.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ WORKDIR /deps
4949
# Copy setup files and dependency files separately for better caching
5050
COPY tools/setup tools/setup/
5151
COPY src/dependencies/requirements/ src/dependencies/requirements/
52-
COPY src/install_maxtext_extra_deps/extra_deps_from_github.txt src/install_maxtext_extra_deps/
52+
COPY src/dependencies/install_maxtext_extra_deps/extra_deps_from_github.txt src/dependencies/install_maxtext_extra_deps/
5353

5454
# Install dependencies - these steps are cached unless the copied files change
5555
RUN echo "Running command: bash setup.sh MODE=$ENV_MODE JAX_VERSION=$ENV_JAX_VERSION DEVICE=${ENV_DEVICE}"

src/dependencies/dockerfiles/maxtext_tpu_dependencies.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ WORKDIR /deps
4646
# Copy setup files and dependency files separately for better caching
4747
COPY tools/setup tools/setup/
4848
COPY src/dependencies/requirements/ src/dependencies/requirements/
49-
COPY src/install_maxtext_extra_deps/ src/install_maxtext_extra_deps/
49+
COPY src/dependencies/install_maxtext_extra_deps/ src/dependencies/install_maxtext_extra_deps/
5050
COPY src/maxtext/integration/vllm/ src/maxtext/integration/vllm/
5151

5252
# Copy the custom libtpu.so file if it exists inside maxtext repository
File renamed without changes.

src/install_maxtext_extra_deps/extra_deps_from_github.txt renamed to src/dependencies/install_maxtext_extra_deps/extra_deps_from_github.txt

File renamed without changes.

0 commit comments

Comments
 (0)