Skip to content

Commit 5521ebf

Browse files
authored
Merge branch 'main' into fast-masking
2 parents ac242b3 + 907edfd commit 5521ebf

21 files changed

Lines changed: 613 additions & 330 deletions

.github/actions/test-template/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ runs:
121121
--name nemo_container_${{ github.run_id }}_${{ inputs.runner }} ${ARG[@]} \
122122
--shm-size=64g \
123123
--env TRANSFORMERS_OFFLINE=0 \
124+
--env NEMO_HOME="/home/TestData/nemo_home" \
124125
--env HYDRA_FULL_ERROR=1 \
125126
--env HF_HOME=/home/TestData/HF_HOME \
126127
--env RUN_ID=${{ github.run_id }} \

.github/workflows/cicd-main-speech.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: ./.github/workflows/_build_container.yml
3939
with:
4040
image-name: ${{ inputs.image-name }}
41-
dockerfile: docker/Dockerfile.ci
41+
dockerfile: docker/Dockerfile
4242
runner: ${{ inputs.runner }}
4343

4444
unit-tests:

.github/workflows/cicd-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
&& !cancelled()
177177
with:
178178
image-name: nemo_container
179-
dockerfile: docker/Dockerfile.ci
179+
dockerfile: docker/Dockerfile
180180
runner: ${{ needs.pre-flight.outputs.runner_prefix }}
181181
registry: ${{ needs.pre-flight.outputs.registry }}
182182

.github/workflows/release-freeze.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ jobs:
5858
cd ${{ github.run_id }}
5959
find tutorials -type f -name "*.ipynb" -exec sed -i "s/BRANCH = 'main'/BRANCH = '${{ needs.code-freeze.outputs.release-branch }}'/g" {} +
6060
61-
- name: Pin MCore in Dockerfile
62-
run: |
63-
cd ${{ github.run_id }}
64-
sed -i 's/^ARG MCORE_TAG=.*$/ARG MCORE_TAG=${{ inputs.mcore_version }}/' docker/Dockerfile.ci
65-
6661
- name: Show status
6762
run: |
6863
cd ${{ github.run_id }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
!cancelled() && !failure()
8181
&& !(needs.pre-flight.outputs.docs_only == 'true'
8282
|| needs.pre-flight.outputs.is_deployment_workflow == 'true')
83-
uses: NVIDIA-NeMo/FW-CI-templates/.github/workflows/_release_library.yml@v1.4.0
83+
uses: NVIDIA-NeMo/FW-CI-templates/.github/workflows/_release_library.yml@v1.4.3
8484
with:
8585
release-ref: ${{ inputs.release-ref || github.sha }}
8686
python-package: nemo

.github/workflows/update-buildcache.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ COPY nemo/__init__.py nemo/package_info.py /workspace/nemo/
5353
RUN <<"EOF" bash -ex
5454
uv sync --link-mode copy --locked --extra all --extra cu13 --group test
5555
EOF
56+
COPY nemo /workspace/nemo
5657

5758
FROM base-image AS automodel-deps
5859
ARG GPU_TARGET=h100plus
@@ -188,13 +189,13 @@ EOF
188189
FROM base-image
189190
COPY --from=automodel-deps /opt/venv /opt/venv
190191

191-
ENV NEMO_HOME="/home/TestData/nemo_home"
192+
ENV NVIDIA_BUILD_ID=${NVIDIA_BUILD_ID:-<unknown>}
193+
LABEL com.nvidia.build.id="${NVIDIA_BUILD_ID}"
194+
ARG NVIDIA_BUILD_REF
195+
LABEL com.nvidia.build.ref="${NVIDIA_BUILD_REF}"
196+
ARG RC_DATE=00.00
197+
ARG TARGETARCH
192198

193-
ARG IMAGE_LABEL
194-
LABEL "nemo.library"=${IMAGE_LABEL}
195-
196-
ARG PR_NUMBER
197-
LABEL "nemo.pr_number"=${PR_NUMBER}
198-
199-
ARG NVIDIA_BUILD_ID
200-
LABEL "NVIDIA_BUILD_ID"=${NVIDIA_BUILD_ID}
199+
# NOTICES.txt file points to where the OSS source code is archived
200+
RUN echo "This distribution includes open source which is archived at the following URL: https://opensource.nvidia.com/oss/teams/nvidia/nemo/${RC_DATE}:linux-${TARGETARCH}/index.html" > NOTICES.txt && \
201+
echo "For further inquiries or assistance, contact us at oss-requests@nvidia.com" >> NOTICES.txt

docker/Dockerfile.stable

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

docs/source/apis.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
:orphan:
2+
13
=========
24
NeMo APIs
35
=========

docs/source/collections.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
:orphan:
2+
13
================
24
NeMo Collections
35
================

0 commit comments

Comments
 (0)