Skip to content

Commit

Permalink
Small improvements around the CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ko3n1g authored and terrykong committed Jun 14, 2024
1 parent 3c361f9 commit 998e75b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ build
slurm*
logs
.vscode
local/
14 changes: 14 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ workflow:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /Run tests/
variables:
JET_CUSTOM_FILTER: "type == 'build' or 'merge-request' in spec.scope"
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /Build only/
variables:
JET_CUSTOM_FILTER: "type == 'build'"
# always run MR pipelines
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
# always run web pipelines
Expand Down Expand Up @@ -70,6 +73,7 @@ unit_tests-data:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-dist-checkpointing:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -84,6 +88,7 @@ unit_tests-dist-checkpointing:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-fusions:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -98,6 +103,7 @@ unit_tests-fusions:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-inference:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -112,6 +118,7 @@ unit_tests-inference:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-models:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -126,6 +133,7 @@ unit_tests-models:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-pipeline-parallel:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -140,6 +148,7 @@ unit_tests-pipeline-parallel:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-tensor-parallel:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -154,6 +163,7 @@ unit_tests-tensor-parallel:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-transformer:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -168,6 +178,7 @@ unit_tests-transformer:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

unit_tests-top-py:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/mcore_ci:24.01v3
Expand All @@ -182,6 +193,7 @@ unit_tests-top-py:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: never
- when: always
interruptible: true

docs_build_test:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/python-format:0.0.1
Expand All @@ -197,6 +209,7 @@ docs_build_test:
allow_failure: true
except:
- main
interruptible: true

formatting:
image: gitlab-master.nvidia.com:5005/adlr/megatron-lm/python-format:0.0.1
Expand All @@ -208,3 +221,4 @@ formatting:
- isort megatron/core --check
rules:
- when: always
interruptible: true
3 changes: 2 additions & 1 deletion jet-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
stage: jet
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /Run tests/'
- if: $JET_CUSTOM_FILTER != "" && $CI_PIPELINE_SOURCE != 'merge_request_event'
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /Build only/'
# If either $JET_CUSTOM_FILTER or both $CI_MODEL and $CI_TASK are provided
- when: never

default:
Expand Down
26 changes: 4 additions & 22 deletions tests/functional_tests/jet_recipes/build-pyt.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,15 @@
type: build
format_version: 1
maintainers: [maanug]
spec:
name: pyt
platforms: [linux/amd64]
source:
image: gitlab-master.nvidia.com/adlr/megatron-lm/mcore_ci:24.01v3

---
type: build
format_version: 1
maintainers: [maanug]
spec:
name: mcore-pyt
platforms: [linux/amd64]
parent: pyt
source:
repo: https://gitlab-master.nvidia.com/ADLR/megatron-lm.git
ref: main
dockerfile: Dockerfile.ci

---
type: build
format_version: 1
maintainers: [maanug]
spec:
name: nemo
platforms: [linux/amd64]
source:
image: nvcr.io/nvidian/nemo:nightly
arguments:
FROM_IMAGE_NAME: gitlab-master.nvidia.com/adlr/megatron-lm/mcore_ci:24.01v3

---
type: build
Expand All @@ -37,8 +18,9 @@ maintainers: [maanug]
spec:
name: mcore-nemo
platforms: [linux/amd64]
parent: nemo
source:
repo: https://gitlab-master.nvidia.com/ADLR/megatron-lm.git
ref: main
dockerfile: Dockerfile.ci
arguments:
FROM_IMAGE_NAME: nvcr.io/nvidian/nemo:nightly

0 comments on commit 998e75b

Please sign in to comment.