diff --git a/.github/workflows/_build_base.yaml b/.github/workflows/_build_base.yaml index 8806a2f13..b7270d611 100644 --- a/.github/workflows/_build_base.yaml +++ b/.github/workflows/_build_base.yaml @@ -19,7 +19,7 @@ on: value: ${{ jobs.build.outputs.DOCKER_TAGS }} env: - UPLD_IMAGE: ghcr.io/nvidia/jax-toolbox-internal + UPLD_IMAGE: nvcr.io/nvidian/jax-toolbox-internal permissions: contents: read # to fetch code @@ -39,12 +39,12 @@ jobs: - name: Check out the repository under ${GITHUB_WORKSPACE} uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Set docker metadata id: meta diff --git a/.github/workflows/_build_jax.yaml b/.github/workflows/_build_jax.yaml index e5374e9bc..8cd2bf60b 100644 --- a/.github/workflows/_build_jax.yaml +++ b/.github/workflows/_build_jax.yaml @@ -39,7 +39,7 @@ on: value: ${{ jobs.build.outputs.DOCKER_TAGS }} env: - UPLD_IMAGE: ghcr.io/nvidia/jax-toolbox-internal + UPLD_IMAGE: nvcr.io/nvidian/jax-toolbox-internal permissions: contents: read # to fetch code @@ -59,12 +59,12 @@ jobs: - name: Check out the repository under ${GITHUB_WORKSPACE} uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Set docker metadata id: meta diff --git a/.github/workflows/_build_pax.yaml b/.github/workflows/_build_pax.yaml index cd4acd671..55d7dcbe2 100644 --- a/.github/workflows/_build_pax.yaml +++ b/.github/workflows/_build_pax.yaml @@ -39,7 +39,7 @@ on: value: ${{ jobs.build.outputs.DOCKER_TAGS }} env: - UPLD_IMAGE: ghcr.io/nvidia/jax-toolbox-internal + UPLD_IMAGE: nvcr.io/nvidian/jax-toolbox-internal permissions: contents: read # to fetch code @@ -59,12 +59,12 @@ jobs: - name: Check out the repository under ${GITHUB_WORKSPACE} uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Set docker metadata id: meta diff --git a/.github/workflows/_build_rosetta.yaml b/.github/workflows/_build_rosetta.yaml index db4c0c71f..69ddcec53 100644 --- a/.github/workflows/_build_rosetta.yaml +++ b/.github/workflows/_build_rosetta.yaml @@ -23,7 +23,7 @@ on: value: ${{ jobs.build.outputs.DOCKER_TAGS }} env: - UPLD_IMAGE: ghcr.io/nvidia/jax-toolbox-internal + UPLD_IMAGE: nvcr.io/nvidian/jax-toolbox-internal DOCKER_REGISTRY: ghcr.io/nvidia permissions: @@ -52,12 +52,12 @@ jobs: - name: Check out the repository under ${GITHUB_WORKSPACE} uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Set docker metadata id: meta diff --git a/.github/workflows/_build_t5x.yaml b/.github/workflows/_build_t5x.yaml index 925eec78b..baca203fe 100644 --- a/.github/workflows/_build_t5x.yaml +++ b/.github/workflows/_build_t5x.yaml @@ -29,7 +29,7 @@ on: value: ${{ jobs.build.outputs.DOCKER_TAGS }} env: - UPLD_IMAGE: ghcr.io/nvidia/jax-toolbox-internal + UPLD_IMAGE: nvcr.io/nvidian/jax-toolbox-internal permissions: contents: read # to fetch code @@ -49,12 +49,12 @@ jobs: - name: Check out the repository under ${GITHUB_WORKSPACE} uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Set docker metadata id: meta diff --git a/.github/workflows/_build_te.yaml b/.github/workflows/_build_te.yaml index 1919be104..035a3aa33 100644 --- a/.github/workflows/_build_te.yaml +++ b/.github/workflows/_build_te.yaml @@ -29,7 +29,7 @@ on: value: ${{ jobs.build.outputs.DOCKER_TAGS }} env: - UPLD_IMAGE: ghcr.io/nvidia/jax-toolbox-internal + UPLD_IMAGE: nvcr.io/nvidian/jax-toolbox-internal permissions: contents: read # to fetch code @@ -49,12 +49,12 @@ jobs: - name: Check out the repository under ${GITHUB_WORKSPACE} uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Set docker metadata id: meta diff --git a/.github/workflows/_publish_nightly.yaml b/.github/workflows/_publish_nightly.yaml index 3c497cebc..6506e0d2f 100644 --- a/.github/workflows/_publish_nightly.yaml +++ b/.github/workflows/_publish_nightly.yaml @@ -36,6 +36,13 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Login to NVIDIA Container Registry + uses: docker/login-action@v2 + with: + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} + - name: Set docker metadata id: meta uses: docker/metadata-action@v4 @@ -48,8 +55,9 @@ jobs: shell: bash -x -e {0} run: | for tag in $(echo "${{ steps.meta.outputs.tags }}"); do - docker manifest create $tag ${{ inputs.SOURCE_IMAGE }} - docker manifest push $tag + docker pull ${{ inputs.SOURCE_IMAGE }} + docker tag ${{ inputs.SOURCE_IMAGE }} $tag + docker push $tag done - name: Generate outputs and artifacts diff --git a/.github/workflows/_sandbox.yaml b/.github/workflows/_sandbox.yaml index 37fa6ca68..dde7f2357 100644 --- a/.github/workflows/_sandbox.yaml +++ b/.github/workflows/_sandbox.yaml @@ -14,6 +14,13 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Login to NVIDIA Container Registry + uses: docker/login-action@v2 + with: + registry: nvcr.io + username: $oauthtoken + password: ${{ secrets.NVCR_TOKEN }} + - name: Print usage run: | cat << EOF diff --git a/.github/workflows/_test_jax.yaml b/.github/workflows/_test_jax.yaml index d98d4cf15..12ba58cf6 100644 --- a/.github/workflows/_test_jax.yaml +++ b/.github/workflows/_test_jax.yaml @@ -20,12 +20,12 @@ jobs: - name: Print GPU information run: nvidia-smi - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Pull JAX image shell: bash -x -e {0} diff --git a/.github/workflows/_test_pax.yaml b/.github/workflows/_test_pax.yaml index 964d17ffb..974dc55f6 100644 --- a/.github/workflows/_test_pax.yaml +++ b/.github/workflows/_test_pax.yaml @@ -75,7 +75,7 @@ jobs: #SBATCH --tasks-per-node=${{ steps.meta.outputs.GPUS_PER_NODE }} #SBATCH --time=00:30:00 #SBATCH --output=${{ steps.meta.outputs.LOG_FILE }} - #SBATCH --export="VOCAB_PATH=gs://t5-data/vocabs/cc_all.32000.100extra/sentencepiece.model,ENROOT_PASSWORD=${{ secrets.GITHUB_TOKEN }}" + #SBATCH --export="VOCAB_PATH=gs://t5-data/vocabs/cc_all.32000.100extra/sentencepiece.model,ENROOT_PASSWORD=${{ secrets.GITHUB_TOKEN }},NVCR_TOKEN=$${{ secrets.NVCR_TOKEN }}" time srun \ --container-image=${{ steps.meta.outputs.IMAGE }} \ --container-mounts=${{ steps.meta.outputs.MODEL_PATH }}:/output \ diff --git a/.github/workflows/_test_rosetta.yaml b/.github/workflows/_test_rosetta.yaml index ddf4700f1..4a220f98f 100644 --- a/.github/workflows/_test_rosetta.yaml +++ b/.github/workflows/_test_rosetta.yaml @@ -27,9 +27,9 @@ jobs: - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Pull Rosetta image shell: bash -x -e {0} diff --git a/.github/workflows/_test_t5x.yaml b/.github/workflows/_test_t5x.yaml index 89e58acdf..6c1aac609 100644 --- a/.github/workflows/_test_t5x.yaml +++ b/.github/workflows/_test_t5x.yaml @@ -69,7 +69,7 @@ jobs: #SBATCH --gpus-per-node=${{ matrix.N_GPU }} #SBATCH --time=00:30:00 #SBATCH --output=${{ steps.meta.outputs.LOG_FILE }} - #SBATCH --export="ENROOT_PASSWORD=${{ secrets.GITHUB_TOKEN }}" + #SBATCH --export="ENROOT_PASSWORD=${{ secrets.GITHUB_TOKEN }},NVCR_TOKEN=$${{ secrets.NVCR_TOKEN }}" time srun \ --container-image=${{ steps.meta.outputs.IMAGE }} \ --container-mounts=${{ steps.meta.outputs.MODEL_PATH }}:/output \ @@ -167,7 +167,7 @@ jobs: #SBATCH --tasks-per-node=${{ matrix.N_GPU }} #SBATCH --time=00:30:00 #SBATCH --output=${{ steps.meta.outputs.LOG_FILE }} - #SBATCH --export="ENROOT_PASSWORD=${{ secrets.GITHUB_TOKEN }}" + #SBATCH --export="ENROOT_PASSWORD=${{ secrets.GITHUB_TOKEN }},NVCR_TOKEN=$${{ secrets.NVCR_TOKEN }}" time srun \ --container-image=${{ steps.meta.outputs.IMAGE }} \ --container-mounts=${{ steps.meta.outputs.MODEL_PATH }}:/output \ diff --git a/.github/workflows/_test_te.yaml b/.github/workflows/_test_te.yaml index ce795ed03..ba28f6333 100644 --- a/.github/workflows/_test_te.yaml +++ b/.github/workflows/_test_te.yaml @@ -20,12 +20,12 @@ jobs: - name: Print GPU information run: nvidia-smi - - name: Login to GitHub Container Registry + - name: Login to NVIDIA Container Registry uses: docker/login-action@v2 with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + registry: nvcr.io + username: '$oauthtoken' + password: ${{ secrets.NVCR_TOKEN }} - name: Pull JAX-TE image shell: bash -x -e {0}