Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/_build_test_publish_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
rm LICENSE || true
docker run --rm -e NO_VCS_VERSION=1 -v $(pwd):/workspace -w /workspace $IMAGE bash -c '\
for python_version in cp311 cp312 cp313; do \
/opt/python/${python_version}-${python_version}/bin/pip install --upgrade "setuptools<80.0.0,>=77.0.0" build; \
/opt/python/${python_version}-${python_version}/bin/pip install --upgrade "setuptools>=80" build; \
done && \
for python_version in cp311 cp312 cp313; do \
/opt/python/${python_version}-${python_version}/bin/python -m build; \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ci.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# syntax=docker/dockerfile:1.3-labs

ARG FROM_IMAGE_NAME
FROM ${FROM_IMAGE_NAME} as main

Check warning on line 5 in docker/Dockerfile.ci.dev

View workflow job for this annotation

GitHub Actions / cicd-container-build (gcp, us-east4-docker.pkg.dev/nv-projdgxchipp-20260113193621/megatron-lm, nv...

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG ${FROM_IMAGE_NAME} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/

Check warning on line 5 in docker/Dockerfile.ci.dev

View workflow job for this annotation

GitHub Actions / cicd-container-build (gcp, us-east4-docker.pkg.dev/nv-projdgxchipp-20260113193621/megatron-lm, nv...

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 5 in docker/Dockerfile.ci.dev

View workflow job for this annotation

GitHub Actions / cicd-container-build (aws, 766267172432.dkr.ecr.us-east-1.amazonaws.com, nvidia-ci-aws-gpu-x8)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 5 in docker/Dockerfile.ci.dev

View workflow job for this annotation

GitHub Actions / cicd-container-build (aws, 766267172432.dkr.ecr.us-east-1.amazonaws.com, nvidia-ci-aws-gpu-x8)

Default value for global ARG results in an empty or invalid base image name

InvalidDefaultArgInFrom: Default value for ARG ${FROM_IMAGE_NAME} results in empty or invalid base image name More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
ENV PIP_CONSTRAINT=""
ENV DEBIAN_FRONTEND=noninteractive
ARG UV_VERSION=0.7.2
Expand Down Expand Up @@ -82,7 +82,7 @@
ENV UV_PYTHON=$UV_PROJECT_ENVIRONMENT/bin/python

##### For NVIDIANS only #####
FROM main as jet

Check warning on line 85 in docker/Dockerfile.ci.dev

View workflow job for this annotation

GitHub Actions / cicd-container-build (gcp, us-east4-docker.pkg.dev/nv-projdgxchipp-20260113193621/megatron-lm, nv...

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 85 in docker/Dockerfile.ci.dev

View workflow job for this annotation

GitHub Actions / cicd-container-build (aws, 766267172432.dkr.ecr.us-east-1.amazonaws.com, nvidia-ci-aws-gpu-x8)

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
ARG JET_API_VERSION
ENV PATH="$PATH:/opt/jet/bin"
RUN --mount=type=secret,id=JET_INDEX_URLS bash -ex <<"EOF"
Expand All @@ -97,7 +97,7 @@
JET_INDEX_URLS=$(cat /run/secrets/JET_INDEX_URLS)
LOGGER_INDEX_URL=$(cat /run/secrets/LOGGER_INDEX_URL)
uv pip install --no-cache-dir --upgrade $LOGGER_INDEX_URL "one-logger"
uv pip install --no-cache-dir --upgrade "setuptools<80.0.0,>=77.0.0"
uv pip install --no-cache-dir --upgrade "setuptools>=80"
uv pip install --no-cache-dir --upgrade $JET_INDEX_URLS "jet-client~=4.0"
EOF
###
2 changes: 1 addition & 1 deletion docker/common/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ main() {
. $UV_PROJECT_ENVIRONMENT/bin/activate

pip install --pre --no-cache-dir --upgrade pip
pip install --pre --no-cache-dir torch pybind11 wheel_stub ninja wheel packaging "setuptools<80.0.0,>=77.0.0"
pip install --pre --no-cache-dir torch pybind11 wheel_stub ninja wheel packaging "setuptools>=80"
pip install --pre --no-cache-dir --no-build-isolation .
fi

Expand Down
2 changes: 1 addition & 1 deletion docker/common/install_source_wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ fi
uv pip install --no-cache-dir \
$MAMBA_WHEEL \
$CAUSALCONV1D_WHEEL \
"setuptools<80.0.0,>=77.0.0"
"setuptools>=80"
2 changes: 1 addition & 1 deletion megatron/core/distributed/fsdp/src/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.

[build-system]
requires = ["setuptools<80.0.0", "pybind11"]
requires = ["setuptools>=80", "pybind11"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.

[build-system]
requires = ["setuptools<80.0.0", "pybind11", "packaging>=24.2"]
requires = ["setuptools>=80", "pybind11", "packaging>=24.2"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
Expand Down Expand Up @@ -88,7 +88,7 @@ mlm = [
]

dev = [
"nvidia-modelopt[torch]; sys_platform != 'darwin'",
"nvidia-modelopt[torch]>=0.43; sys_platform != 'darwin'",
"nvidia-resiliency-ext",
"tqdm",
"einops~=0.8",
Expand Down Expand Up @@ -161,7 +161,7 @@ docs = [
"nvidia-sphinx-theme", # Our NVIDIA theme
]
build = [
"setuptools<80.0.0,>=77.0.0",
"setuptools>=80",
"packaging>=24.2",
"hatchling",
"pybind11",
Expand Down
65 changes: 52 additions & 13 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading