Fix merge conflicts

Signed-off-by: Vasudevan Rengasamy <[email protected]>
NVIDIA · Apr 15, 2024 · 360bd3e · 360bd3e
1 parent 5cf6413
commit 360bd3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)