From 45976b23ae5b73fe469ec46fac26e5fc9f92be10 Mon Sep 17 00:00:00 2001
From: Yiltan Hassan Temucin <yiltan.temucin@amd.com>
Date: Wed, 9 Oct 2024 13:10:50 -0700
Subject: [PATCH] Fix initialization order bug

[ROCm/rocshmem commit: 1baa071edf525572fe4de6c03883ed8fb69047a1]
---
 projects/rocshmem/src/ipc/backend_ipc.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/projects/rocshmem/src/ipc/backend_ipc.cpp b/projects/rocshmem/src/ipc/backend_ipc.cpp
index 70a9295486..7475fb2c8b 100644
--- a/projects/rocshmem/src/ipc/backend_ipc.cpp
+++ b/projects/rocshmem/src/ipc/backend_ipc.cpp
@@ -56,18 +56,18 @@ int get_ls_non_zero_bit(char *bitmask, int mask_length) {
 IPCBackend::IPCBackend(MPI_Comm comm)
     :  Backend() {
   type = BackendType::IPC_BACKEND;
-    
+
   if (auto maximum_num_contexts_str = getenv("ROC_SHMEM_MAX_NUM_CONTEXTS")) {
     std::stringstream sstream(maximum_num_contexts_str);
     sstream >> maximum_num_contexts_;
   }
 
   init_mpi_once(comm);
-    
+
   initIPC();
-    
+
   auto *bp{ipc_backend_proxy.get()};
-    
+
   bp->heap_ptr = &heap;
 
   /* Initialize the host interface */
@@ -85,7 +85,6 @@ IPCBackend::IPCBackend(MPI_Comm comm)
   setup_team_world();
 
   TeamInfo *tinfo = team_tracker.get_team_world()->tinfo_wrt_world;
-  default_context_proxy_ = IPCDefaultContextProxyT(this, tinfo);
 
   roc_shmem_collective_init();
 
@@ -93,8 +92,9 @@ IPCBackend::IPCBackend(MPI_Comm comm)
 
   teams_init();
 
+  default_context_proxy_ = IPCDefaultContextProxyT(this, tinfo);
+
   setup_ctxs();
-  
 }
 
 IPCBackend::~IPCBackend() {
@@ -108,7 +108,7 @@ IPCBackend::~IPCBackend() {
    * Free the atomic_ret array.
    */
   CHECK_HIP(hipFree(bp->atomic_ret->atomic_base_ptr));
-  
+
   // TODO(Avinash) Free g_ret
 
   // delete host_interface;
@@ -402,4 +402,4 @@ void IPCBackend::teams_init() {
   NET_CHECK(MPI_Barrier(thread_comm));
 }
 
-}  // namespace rocshmem
\ No newline at end of file
+}  // namespace rocshmem