From 360bd3e981a26d3fd8faa7f77c75be4f47bed4a3 Mon Sep 17 00:00:00 2001 From: Vasudevan Rengasamy Date: Mon, 15 Apr 2024 11:11:55 -0700 Subject: [PATCH] Fix merge conflicts Signed-off-by: Vasudevan Rengasamy --- nemo/core/optim/distributed_adam.py | 2 +- nemo/package_info.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nemo/core/optim/distributed_adam.py b/nemo/core/optim/distributed_adam.py index c23c180984a2f..750fd0fcd93d2 100644 --- a/nemo/core/optim/distributed_adam.py +++ b/nemo/core/optim/distributed_adam.py @@ -69,7 +69,7 @@ def __init__( ): # Initialize process groups - if 'process_group' not in kwargs and parallel_state.is_initialized(): + if 'process_group' not in kwargs and not parallel_state.is_unitialized(): kwargs['process_group'] = parallel_state.get_data_parallel_group(with_context_parallel=True) if disable_distributed_parameters: world_size = torch.distributed.get_world_size() diff --git a/nemo/package_info.py b/nemo/package_info.py index ea26e33317af9..e0ff2247e6ada 100644 --- a/nemo/package_info.py +++ b/nemo/package_info.py @@ -13,10 +13,10 @@ # limitations under the License. -MAJOR = 2 -MINOR = 0 +MAJOR = 1 +MINOR = 23 PATCH = 0 -PRE_RELEASE = 'rc0.beta' +PRE_RELEASE = 'rc0' # Use the following formatting: (major, minor, patch, pre-release) VERSION = (MAJOR, MINOR, PATCH, PRE_RELEASE)