AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ROCSHMEM_DISABLE_MIXED_IPC a synonym for ROCSHMEM_RO_DISABLE_IPC, ROCSHMEM_DISABLE_IPC (#273)

Browse Source 
* Make ROCSHMEM_DISABLE_IPC a synonym for ROCSHMEM_RO_DISABLE_IPC

* Introduce ROCSHMEM_DISABLE_MIXED_IPC and deprecate old variants

[ROCm/rocshmem commit: db8e5f1086]
This commit is contained in:
Aurelien Bouteiller
2025-10-09 19:57:53 -04:00
committed by GitHub
parent 8837414042
commit 225746b0f0
5 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocshmem/src/envvar.cpp
+2
View File
@@ -47,6 +47,8 @@ namespace envvar {
const var<std::string> requested_dev("USE_IB_HCA", "");
const var<uint32_t> sq_size("SQ_SIZE", "", 1024);
const var<std::string> backend("BACKEND", "");
const var<bool> disable_mixed_ipc("DISABLE_MIXED_IPC", "", false);
const var<bool> disable_ipc("DISABLE_IPC", "", false);
} // inline namespace _base
namespace bootstrap {
projects/rocshmem/src/envvar.hpp
+2
View File
@@ -405,6 +405,8 @@ namespace envvar {
extern const var<size_t> heap_size;
extern const var<size_t> max_num_teams;
extern const var<std::string> backend;
extern const var<bool> disable_mixed_ipc;
extern const var<bool> disable_ipc;
/**
* @brief Maximum number of contexts for the application
projects/rocshmem/src/ipc_policy.cpp
+16 -6
View File
@@ -108,9 +108,14 @@ __host__ void IpcOnImpl::ipcHostInit(int my_pe, const HEAP_BASES_T &heap_bases,
*/
free(vec_ipc_handle);
if (!envvar::ro::disable_ipc) {
int thread_comm_rank {-1};
if (envvar::ro::disable_ipc || envvar::disable_ipc) {
if (0 == my_pe) {
printf("ROCSHMEM_RO_DISABLE_IPC and RO_DISABLE_IPC environment variables have been deprecated.\n"
" Please use ROCSHMEM_DISABLE_MIXED_IPC as a replacement.\n");
}
}
auto disable_ipc = envvar::disable_mixed_ipc || envvar::ro::disable_ipc || envvar::disable_ipc;
if (!disable_ipc) {
CHECK_HIP(hipMalloc(reinterpret_cast<void**>(&pes_with_ipc_avail), shm_size * sizeof(int)));
MPI_Group thread_grp;
@@ -187,9 +192,14 @@ __host__ void IpcOnImpl::ipcHostInit(int my_pe, const HEAP_BASES_T &heap_bases,
*/
free(vec_ipc_handle);
if (!envvar::ro::disable_ipc) {
int thread_comm_rank {-1};
if (envvar::ro::disable_ipc || envvar::disable_ipc) {
if (0 == my_pe) {
printf("ROCSHMEM_RO_DISABLE_IPC and RO_DISABLE_IPC environment variables have been deprecated.\n"
" Please use ROCSHMEM_DISABLE_MIXED_IPC as a replacement.\n");
}
}
auto disable_ipc = envvar::disable_mixed_ipc || envvar::ro::disable_ipc || envvar::disable_ipc;
if (!disable_ipc) {
CHECK_HIP(hipMalloc(reinterpret_cast<void**>(&pes_with_ipc_avail), shm_size * sizeof(int)));
std::copy(shm_ranks.begin(), shm_ranks.end(), pes_with_ipc_avail);
}