Skip to content

Commit 50d07cd

Browse files
GNroyGNroy
authored
Merge branch 'main' into k2_rnnt
2 parents 73448b9 + 63f6d44 commit 50d07cd

1,768 files changed

Lines changed: 470229 additions & 34000 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/labeler.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
ASR:
2+
- nemo/collections/asr/**/*
3+
- examples/asr/**/*
4+
- tutorials/asr/**/*
5+
- docs/source/asr/**/*
6+
7+
NLP:
8+
- nemo/collections/nlp/**/*
9+
- examples/nlp/**/*
10+
- tutorials/nlp/**/*
11+
- docs/source/nlp/**/*
12+
13+
Speaker Tasks:
14+
- examples/speaker_tasks/**/*
15+
- tutorials/speaker_tasks/**/*
16+
17+
TTS:
18+
- nemo/collections/tts/**/*
19+
- examples/tts/**/*
20+
- tutorials/tts/**/*
21+
- docs/source/tts/**/*
22+
23+
core:
24+
- nemo/core/**/*
25+
26+
common:
27+
- nemo/collections/common/**/*
28+
29+
CI:
30+
- .github/**/*
31+
- Jenkinsfile
32+
- Dockerfile
33+
- ci.groovy

‎.github/workflows/blossom-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
# This job only runs for pull request comments
3636
if: |
37-
contains( 'okuchaiev,ericharper,', format('{0},', github.actor)) &&
37+
contains( 'okuchaiev,ericharper,titu1994,MaximumEntropy,nithinraok,redoctopus,yidong72,SeanNaren,yzhang123,ekmb,arendu,', format('{0},', github.actor)) &&
3838
github.event.comment.body == '/blossom-ci'
3939
steps:
4040
- name: Check if comment is issued by authorized person

‎.github/workflows/changelog-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
2626
- name: Build Changelog
2727
id: github_tag
28-
uses: mikepenz/release-changelog-builder-action@v2.9.0
28+
uses: mikepenz/release-changelog-builder-action@v3.3.1
2929
env:
3030
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3131
with:

‎.github/workflows/cherry-pick-release-commit.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Create PR to main with cherry-pick from release
2+
3+
on:
4+
pull_request_target:
5+
branches:
6+
- 'r*.*.*'
7+
types: ["closed"]
8+
9+
jobs:
10+
cherry-pick-release-commit:
11+
name: Cherry-pick release commit
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v3
16+
with:
17+
fetch-depth: 0
18+
- name: github-cherry-pick-action v1.0.3
19+
uses: carloscastrojumo/github-cherry-pick-action@bb0869df47c27be4ae4c7a2d93d22827aa5a0054
20+
with:
21+
branch: main
22+
labels: |
23+
cherry-pick
24+
reviewers: |
25+
${{ github.event.pull_request.user.login }}
26+
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/close-inactive-issue-pr.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Stale-Close-Inactive-Issues-PRs
2+
on:
3+
schedule:
4+
- cron: "30 1 * * *"
5+
6+
jobs:
7+
close-issues:
8+
runs-on: ubuntu-latest
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
steps:
13+
- uses: actions/stale@v6
14+
with:
15+
operations-per-run: 100
16+
days-before-issue-stale: 30
17+
days-before-issue-close: 7
18+
stale-issue-label: "stale"
19+
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity. Remove stale label or comment or this will be closed in 7 days."
20+
close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale."
21+
days-before-pr-stale: 14
22+
days-before-pr-close: 7
23+
stale-pr-message: "This PR is stale because it has been open for 14 days with no activity. Remove stale label or comment or update or this will be closed in 7 days."
24+
close-pr-message: "This PR was closed because it has been inactive for 7 days since being marked as stale."
25+
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/codeql.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "main", "[rv][0-9]*", "gh-pages-src" ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ "main" ]
20+
schedule:
21+
- cron: '19 1 * * 4'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'python' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
38+
39+
steps:
40+
- name: Checkout repository
41+
uses: actions/checkout@v3
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v2
46+
with:
47+
languages: ${{ matrix.language }}
48+
# If you wish to specify custom queries, you can do so here or in a config file.
49+
# By default, queries listed here will override any specified in a config file.
50+
# Prefix the list here with "+" to use these queries and those in the config file.
51+
52+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
53+
queries: security-and-quality # security-extended,
54+
55+
56+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
57+
# If this step fails, then you should remove it and run the build manually (see below)
58+
- name: Autobuild
59+
uses: github/codeql-action/autobuild@v2
60+
61+
# ℹ️ Command-line programs to run using the OS shell.
62+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
63+
64+
# If the Autobuild fails above, remove it and uncomment the following three lines.
65+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
66+
67+
# - run: |
68+
# echo "Run, Build Application using script"
69+
# ./location_of_script_within_repo/buildscript.sh
70+
71+
- name: Perform CodeQL Analysis
72+
uses: github/codeql-action/analyze@v2
73+
with:
74+
category: "/language:${{matrix.language}}"

‎.github/workflows/config/changelog-config.json‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,48 @@
22
"categories": [
33
{
44
"title": "## ASR \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
5-
"labels": ["asr"]
5+
"labels": ["asr"],
6+
"exclude_labels": ["cherry-pick"]
67
},
78
{
89
"title": "## TTS \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
9-
"labels": ["tts"]
10+
"labels": ["tts"],
11+
"exclude_labels": ["cherry-pick"]
1012
},
1113
{
1214
"title": "## NLP / NMT \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
13-
"labels": ["nlp", "nmt", "megatron"]
15+
"labels": ["nlp", "nmt", "megatron"],
16+
"exclude_labels": ["cherry-pick"]
1417
},
1518
{
1619
"title": "## Text Normalization / Inverse Text Normalization \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
17-
"labels": ["tn", "itn"]
20+
"labels": ["tn", "itn"],
21+
"exclude_labels": ["cherry-pick"]
1822
},
1923
{
2024
"title": "## NeMo Tools \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
21-
"labels": ["tools"]
25+
"labels": ["tools"],
26+
"exclude_labels": ["cherry-pick"]
2227
},
2328
{
2429
"title": "## Export \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
25-
"labels": ["export"]
30+
"labels": ["export"],
31+
"exclude_labels": ["cherry-pick"]
2632
},
2733
{
2834
"title": "## Documentation \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
29-
"labels": ["docs"]
35+
"labels": ["docs"],
36+
"exclude_labels": ["cherry-pick"]
3037
},
3138
{
3239
"title": "## Bugfixes \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
33-
"labels": ["bug"]
40+
"labels": ["bug"],
41+
"exclude_labels": ["cherry-pick"]
42+
},
43+
{
44+
"title": "## Cherrypick \n\n<details><summary>Changelog</summary>\n\n</details>\n\n",
45+
"labels": ["cherry-pick"],
46+
"exclude_labels": ["cherry-pick"]
3447
}
3548
],
3649
"ignore_labels": [
@@ -94,6 +107,12 @@
94107
"target": "bug",
95108
"flags": "gmu",
96109
"on_property": ["title", "body"]
110+
},
111+
{
112+
"pattern": "(.*cherry-pick.*)|(.*cherrypick.*)",
113+
"target": "cherrypick",
114+
"flags": "gimu",
115+
"on_property": ["title", "body"]
97116
}
98117
],
99118
"duplicate_filter": {
@@ -111,4 +130,5 @@
111130
"tag_resolver": {
112131
"method": "semver"
113132
}
114-
}
133+
}
134+

‎.github/workflows/gh-docs.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: gh-docs-build
2+
on:
3+
push:
4+
pull_request:
5+
paths:
6+
- "**"
7+
8+
# Set the access for individual scopes
9+
permissions: write-all
10+
11+
jobs:
12+
deploy:
13+
runs-on: ubuntu-latest
14+
15+
container:
16+
image: squidfunk/mkdocs-material
17+
18+
steps:
19+
- uses: actions/checkout@v3
20+
if: github.event.repository.fork == false
21+
with:
22+
ref: gh-pages-src
23+
24+
- name: "Correct github config"
25+
if: github.event.repository.fork == false
26+
run: |
27+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
28+
git config --global user.name "${GITHUB_ACTOR}"
29+
git config --global user.email "${GITHUB_ACTOR}@users.noreply.${GITHUB_DOMAIN:-"github.com"}"
30+
remote_repo="https://x-access-token:${GITHUB_TOKEN}@${GITHUB_DOMAIN:-"github.com"}/${GITHUB_REPOSITORY}.git"
31+
echo "${remote_repo}"
32+
git remote rm origin
33+
git remote add origin "${remote_repo}"
34+
35+
- name: "Deploy Github Page"
36+
continue-on-error: true
37+
run: mkdocs gh-deploy --force
38+

‎.github/workflows/labeler.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: "Pull Request Labeler"
2+
on:
3+
- pull_request_target
4+
5+
jobs:
6+
triage:
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/labeler@v4
13+
with:
14+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ work
1212
runs
1313
fastspeech_output
1414
.hydra
15+
.bash_history.local
1516

1617
# Byte-compiled / optimized / DLL files
1718
__pycache__/
@@ -93,6 +94,10 @@ target/
9394
# Jupyter Notebook
9495
.ipynb_checkpoints
9596

97+
# Override Jupyter in Github Language states for more accurate estimate of repo code.
98+
# Reference: https://github.com/github/linguist/blob/master/docs/overrides.md#generated-code
99+
*.ipynb linguist-generated
100+
96101
# IPython
97102
profile_default/
98103
ipython_config.py

0 commit comments

Comments
 (0)