Skip to content

Commit

Permalink
style: Use single quotes
Browse files Browse the repository at this point in the history
  • Loading branch information
ko3n1g committed Apr 22, 2024
1 parent 82d00dd commit 80ccc49
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 52 deletions.
66 changes: 33 additions & 33 deletions .github/workflows/_test_rosetta_t5x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ on:
T5X_IMAGE:
type: string
description: T5X image from ghcr.io/nvidia/t5x
default: "ghcr.io/nvidia/t5x:latest"
default: 'ghcr.io/nvidia/t5x:latest'
required: false
BADGE_FILENAME:
type: string
description: "Name of the endpoint JSON file for shields.io badge"
description: 'Name of the endpoint JSON file for shields.io badge'
required: false
default: "badge-rosetta-t5x-mgmn-test.json"
default: 'badge-rosetta-t5x-mgmn-test.json'
ARTIFACT_NAME:
type: string
description: "Name of the artifact zip file"
description: 'Name of the artifact zip file'
required: false
default: "artifact-rosetta-t5x-mgmn-test"
default: 'artifact-rosetta-t5x-mgmn-test'
FW_NAME:
type: string
description: "Name of the framework being used"
description: 'Name of the framework being used'
required: false
default: "rosetta-t5x"
default: 'rosetta-t5x'
outputs:
TEST_STATUS:
description: "Summary pass/fail value indicating if results from tests are acceptable"
description: 'Summary pass/fail value indicating if results from tests are acceptable'
value: ${{ jobs.sitrep.outputs.STATUS }}

env:
Expand All @@ -37,18 +37,18 @@ jobs:
strategy:
matrix:
include:
- TEST_NAME: "1P1G_te-1"
- TEST_NAME: '1P1G_te-1'
N_GPU: 1
ADDITIONAL_ARGS: ""
EXTRA_GIN_ARGS: "--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False"
- TEST_NAME: "1P1G_te-0"
ADDITIONAL_ARGS: ''
EXTRA_GIN_ARGS: '--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False'
- TEST_NAME: '1P1G_te-0'
N_GPU: 1
ADDITIONAL_ARGS: "--enable-te 0"
EXTRA_GIN_ARGS: ""
- TEST_NAME: "1P8G_te-1"
ADDITIONAL_ARGS: '--enable-te 0'
EXTRA_GIN_ARGS: ''
- TEST_NAME: '1P8G_te-1'
N_GPU: 8
ADDITIONAL_ARGS: ""
EXTRA_GIN_ARGS: "--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False"
ADDITIONAL_ARGS: ''
EXTRA_GIN_ARGS: '--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False'
fail-fast: false

runs-on: ubuntu-22.04
Expand Down Expand Up @@ -233,26 +233,26 @@ jobs:
strategy:
matrix:
include:
- TEST_NAME: "1N1G-te-1"
- TEST_NAME: '1N1G-te-1'
N_GPU: 1
N_NODE: 1
ADDITIONAL_ARGS: ""
EXTRA_GIN_ARGS: "--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False"
- TEST_NAME: "1N8G-te-1"
ADDITIONAL_ARGS: ''
EXTRA_GIN_ARGS: '--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False'
- TEST_NAME: '1N8G-te-1'
N_GPU: 8
N_NODE: 1
ADDITIONAL_ARGS: ""
EXTRA_GIN_ARGS: "--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False"
- TEST_NAME: "2N8G-te-1"
ADDITIONAL_ARGS: ''
EXTRA_GIN_ARGS: '--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False'
- TEST_NAME: '2N8G-te-1'
N_GPU: 8
N_NODE: 2
ADDITIONAL_ARGS: ""
EXTRA_GIN_ARGS: "--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False"
- TEST_NAME: "2N2G_te-0"
ADDITIONAL_ARGS: ''
EXTRA_GIN_ARGS: '--gin.train/utils.DatasetConfig.pack=False --gin.train_eval/utils.DatasetConfig.pack=False'
- TEST_NAME: '2N2G_te-0'
N_GPU: 2
N_NODE: 2
ADDITIONAL_ARGS: "--enable-te 0"
EXTRA_GIN_ARGS: ""
ADDITIONAL_ARGS: '--enable-te 0'
EXTRA_GIN_ARGS: ''
fail-fast: false

runs-on: ubuntu-22.04
Expand Down Expand Up @@ -818,7 +818,7 @@ jobs:
sitrep:
needs: metrics
if: "!cancelled()"
if: '!cancelled()'
uses: ./.github/workflows/_sitrep_mgmn.yaml
secrets: inherit
with:
Expand All @@ -835,7 +835,7 @@ jobs:
vit-single-process-multi-device,
vit-multi-gpu-multi-node,
]
if: "!cancelled()"
if: '!cancelled()'
steps:
- name: Generate TensorBoard query URL
run: |
Expand All @@ -852,7 +852,7 @@ jobs:
outcome:
needs: sitrep
runs-on: ubuntu-22.04
if: "!cancelled()"
if: '!cancelled()'
steps:
- name: Sets workflow status based on test outputs
run: |
Expand Down Expand Up @@ -905,7 +905,7 @@ jobs:
if: ( always() )
secrets: inherit
with:
ENDPOINT_FILENAME: "rosetta-unit-test-status.json"
ENDPOINT_FILENAME: 'rosetta-unit-test-status.json'
PUBLISH: false
SCRIPT: |
ARTIFACTS="${{ needs.rosetta-unit-tests.outputs.TEST_ARTIFACT_NAME }}/*.jsonl"
Expand Down
36 changes: 17 additions & 19 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
schedule:
- cron: '30 9 * * *' # Pacific Time 01:30 AM in UTC
- cron: '30 9 * * *' # Pacific Time 01:30 AM in UTC
pull_request:
types:
- opened
Expand All @@ -25,7 +25,7 @@ on:
required: false
MERGE_BUMPED_MANIFEST:
type: boolean
description: "(used if BUMP_MANIFEST=true) If true: attempt to PR/merge manifest branch"
description: '(used if BUMP_MANIFEST=true) If true: attempt to PR/merge manifest branch'
default: false
required: false

Expand All @@ -34,16 +34,15 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

permissions:
contents: write # to fetch code and push branch
actions: write # to cancel previous workflows
packages: write # to upload container
pull-requests: write # to make pull request for manifest bump
contents: write # to fetch code and push branch
actions: write # to cancel previous workflows
packages: write # to upload container
pull-requests: write # to make pull request for manifest bump

env:
DEFAULT_MANIFEST_ARTIFACT_NAME: bumped-manifest

jobs:

metadata:
runs-on: ubuntu-22.04
outputs:
Expand Down Expand Up @@ -115,7 +114,7 @@ jobs:
shell: bash -x -e {0}
run: |
bash bump.sh --input-manifest manifest.yaml --output-manifest manifest.yaml.new --base-patch-dir ./patches-new
- name: Maybe replace current manifest/patches with the new one and show diff
working-directory: .github/container
shell: bash -x -e {0}
Expand Down Expand Up @@ -168,12 +167,11 @@ jobs:
steps:
- name: "Tests Succeeded: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}"
id: test_result
run:
echo "SUCCEEDED=${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}" | tee -a $GITHUB_OUTPUT
run: echo "SUCCEEDED=${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}" | tee -a $GITHUB_OUTPUT

- name: Check out the repository under ${GITHUB_WORKSPACE}
uses: actions/checkout@v4

- name: Delete checked-out manifest and patches
run: |
rm .github/container/manifest.yaml
Expand All @@ -185,7 +183,7 @@ jobs:
name: ${{ needs.metadata.outputs.MANIFEST_ARTIFACT_NAME }}
path: .github/container/

- name: "Create local manifest branch: ${{ needs.metadata.outputs.MANIFEST_BRANCH }}"
- name: 'Create local manifest branch: ${{ needs.metadata.outputs.MANIFEST_BRANCH }}'
id: local_branch
shell: bash -x -e {0}
run: |
Expand Down Expand Up @@ -213,7 +211,7 @@ jobs:
git merge --ff-only ${{ needs.metadata.outputs.MANIFEST_BRANCH }}
# Push the new change
git push origin ${{ github.ref_name }}
# We will create a Draft PR & remote branch if:
# 1. The tests failed
# 2. The merge failed
Expand Down Expand Up @@ -244,12 +242,12 @@ jobs:
draft: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Log created PR: #${{ fromJson(steps.create_pr.outputs.data).number }}"

- name: 'Log created PR: #${{ fromJson(steps.create_pr.outputs.data).number }}'
if: steps.create_pr.outcome == 'success'
run: |
echo "https://github.com/NVIDIA/JAX-Toolbox/pull/${{ fromJson(steps.create_pr.outputs.data).number }}" | tee -a $GITHUB_STEP_SUMMARY
# Guard delete in simple check to protect other branches
- name: Check that the branch matches znightly- prefix
run: |
Expand All @@ -271,7 +269,7 @@ jobs:

make-publish-configs:
runs-on: ubuntu-22.04
if: ${{ !cancelled() }}
if: ${{ !cancelled() }}
env:
MEALKIT_IMAGE_REPO: ${{ needs.metadata.outputs.PUBLISH == 'true' && 'jax-mealkit' || 'mock-jax-mealkit' }}
FINAL_IMAGE_REPO: ${{ needs.metadata.outputs.PUBLISH == 'true' && 'jax' || 'mock-jax' }}
Expand Down Expand Up @@ -365,7 +363,7 @@ jobs:
needs:
- metadata
- make-publish-configs
if: ${{ !cancelled() && needs.make-publish-configs.outputs.PUBLISH_CONFIGS.config != '{"config":[]}' }}
if: ${{ !cancelled() && needs.make-publish-configs.outputs.PUBLISH_CONFIGS.config != '{"config":[]}' }}
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.make-publish-configs.outputs.PUBLISH_CONFIGS) }}
Expand All @@ -381,7 +379,7 @@ jobs:
finalize:
needs: [metadata, amd64, arm64, publish-containers]
if: "!cancelled()"
if: '!cancelled()'
uses: ./.github/workflows/_finalize.yaml
with:
BUILD_DATE: ${{ needs.metadata.outputs.BUILD_DATE }}
Expand Down

0 comments on commit 80ccc49

Please sign in to comment.