Merge branch 'jbarker-main-patch-01829' into 'main'

Fix typo in convert.py

See merge request ADLR/megatron-lm!1584

tools/checkpoint/convert.py

@@ -112,7 +112,7 @@ def main():
                                      allow_abbrev=False, conflict_handler='resolve')
 
     parser.add_argument('--model-type', type=str, required=True,
-                        choice=['GPT', 'BERT'],
+                        choices=['GPT', 'BERT'],
                         help='Type of the model')
     parser.add_argument('--loader', type=str, default='megatron',
                         help='Module name to load checkpoint, should be on python path')