Merge branch 'r1.21.0' into nb_online_asr_fix

NVIDIA · Oct 19, 2023 · cb18cab · cb18cab
2 parents 861a7b9 + be47a3d
commit cb18cab
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -57,16 +57,17 @@ pipeline {
       }
     }
 
-    stage('Megatron Core installation') {
-      steps {
-        // pinned MCore https://github.com/NVIDIA/Megatron-LM/commit/ab0336a5c8eab77aa74ae604ba1e73decbf6d560
-        // ToT for 23.08 branch
-        sh 'git clone https://github.com/NVIDIA/Megatron-LM.git && \
-            cd Megatron-LM && \
-            git checkout ab0336a5c8eab77aa74ae604ba1e73decbf6d560 && \
-            pip install -e .'
-      }
-    }
+    // megatron-core 0.3 has been pinned in the requirements, this should not be needed on r1.21.0
+    // stage('Megatron Core installation') {
+    //   steps {
+    //     // pinned MCore https://github.com/NVIDIA/Megatron-LM/commit/ab0336a5c8eab77aa74ae604ba1e73decbf6d560
+    //     // ToT for 23.08 branch
+    //     sh 'git clone https://github.com/NVIDIA/Megatron-LM.git && \
+    //         cd Megatron-LM && \
+    //         git checkout ab0336a5c8eab77aa74ae604ba1e73decbf6d560 && \
+    //         pip install -e .'
+    //   }
+    // }
 
 
     stage('PyTorch Lightning version') {

diff --git a/requirements/requirements_nlp.txt b/requirements/requirements_nlp.txt
@@ -11,13 +11,13 @@ ijson
 jieba
 markdown2
 matplotlib>=3.3.2
-megatron_core==0.2.0
+megatron_core==0.3.0
 nltk>=3.6.5
-opencc
+opencc<1.1.7
 pangu
 rapidfuzz
 rouge_score
 sacrebleu  # manually install sacrebleu[ja] for Japanese support; MeCab is unsupported in Python 3.11+
 sentence_transformers
-tensorstore
+tensorstore<0.1.46
 zarr
diff --git a/tutorials/nlp/Multitask_Prompt_and_PTuning.ipynb b/tutorials/nlp/Multitask_Prompt_and_PTuning.ipynb
@@ -1,6 +1,15 @@
 {
   "cells": [
-   {
+  {
+   "attachments": {},
+   "cell_type": "markdown",
+   "id": "34f20b3b",
+   "metadata": {},
+   "source": [
+    "**Deprecation Notice:** The last supported release for this notebook is 1.20 and is deprecated in all the future versions. For the newest PEFT API please see lora.ipynb which contains instructions on how to make modifications for P-tuning."
+   ]
+  },
+  {
     "cell_type": "code",
     "execution_count": null,
     "id": "b7a434f4",

diff --git a/tutorials/nlp/lora.ipynb b/tutorials/nlp/lora.ipynb
@@ -840,6 +840,10 @@
     "    base_model_cfg.precision = config.trainer.precision\n",
     "    base_model_cfg.answer_only_loss = config.model.answer_only_loss\n",
     "    base_model_cfg.restore_from_path = config.model.restore_from_path\n",
+    "    base_model_cfg.activations_checkpoint_granularity=config.model.get(\"activations_checkpoint_granularity\", None)\n",
+    "    base_model_cfg.activations_checkpoint_layers_per_pipeline=config.model.get(\"activations_checkpoint_layers_per_pipeline\", None)\n",
+    "    base_model_cfg.activations_checkpoint_num_layers=config.model.get(\"activations_checkpoint_num_layers\", None)\n",
+    "    base_model_cfg.activations_checkpoint_method=config.model.get(\"activations_checkpoint_method\", None)\n",
     "    base_model_cfg.resume_from_checkpoint = config.model.resume_from_checkpoint\n",
     "    base_model_cfg.save_nemo_on_validation_end = config.model.save_nemo_on_validation_end\n",
     "    base_model_cfg.peft = config.model.peft\n",