Fix for MVAPICH-PLUS support for MCR-DL (#14)

* Fix for MVAPICH-PLUS

Signed-off-by: Radha Guhane <[email protected]>

* Rename config to build config for clarity

* Changes required for config.yml-> build_config.yml , Revert testing changes

Signed-off-by: Radha Guhane <[email protected]>

* Remove build_config.yml cached file

Signed-off-by: Radha Guhane <[email protected]>

---------

Signed-off-by: Radha Guhane <[email protected]>
Co-authored-by: Quentin Anthony <[email protected]>

Author: RadhaGulhane13

.gitignore

@@ -1,4 +1,4 @@
 __pycache__
 mcr_dl/git_version_info_installed.py
 mcr_dl.egg-info/
-mcr_dl/config.yml
+mcr_dl/build_config.yml

README.md

@@ -30,7 +30,7 @@ python setup.py install
 ```
 
 ### Update Configurations
-Update mpi, cuda, and nccl paths appropriately in [mcr_dl/config.yml](/mcr_dl/config.yml)
+Update mpi, cuda, and nccl paths appropriately in [mcr_dl/config.yml](/mcr_dl/build_config.yml)
 
 ### The MCR-DL Communication Benchmarking Suite
 

mcr_dl/config.yml

@@ -22,8 +22,7 @@
 
 class ConfigPath():
     def __init__(self, file_path = None):
-        self.file_path = os.path.join(os.path.dirname(mcr_dl.__file__), "config.yml") if file_path is None else file_path
-        print(self.file_path)
+        self.file_path = os.path.join(os.path.dirname(mcr_dl.__file__), "build_config.yml") if file_path is None else file_path
         self.config_data = self.load_config()
         self.mpi_path = self.config_data.get("mpi", {}).get("path")
         self.mpi_include = self.config_data.get("mpi", {}).get("include")

mcr_dl/ops/op_builder/config.py

@@ -156,12 +156,12 @@ def set_mpi_dist_environemnt(master_addr = None):
     if master_addr is not None:
         os.environ['MASTER_ADDR'] = master_addr
     local_rank = env2int(
-        ['LOCAL_RANK', 'MPI_LOCALRANKID', 'OMPI_COMM_WORLD_LOCAL_RANK', 'MV2_COMM_WORLD_LOCAL_RANK', 'SLURM_LOCALID'])
+        ['LOCAL_RANK', 'MPI_LOCALRANKID', 'OMPI_COMM_WORLD_LOCAL_RANK', 'MV2_COMM_WORLD_LOCAL_RANK', 'SLURM_LOCALID', 'MVP_COMM_WORLD_LOCAL_RANK'])
     if 'LOCAL_RANK' not in os.environ:
         os.environ['LOCAL_RANK'] = str(local_rank)
-    rank = env2int(['RANK', 'MPI_RANKID', 'OMPI_COMM_WORLD_RANK', 'MV2_COMM_WORLD_RANK', 'SLURM_PROCID'])
+    rank = env2int(['RANK', 'MPI_RANKID', 'OMPI_COMM_WORLD_RANK', 'MV2_COMM_WORLD_RANK', 'SLURM_PROCID', 'MVP_COMM_WORLD_LOCAL_RANK'])
     if 'RANK' not in os.environ:
         os.environ['RANK'] = str(rank)
-    world_size = env2int(['WORLD_SIZE', 'OMPI_COMM_WORLD_SIZE', 'MV2_COMM_WORLD_SIZE', 'SLURM_NPROCS'])
+    world_size = env2int(['WORLD_SIZE', 'OMPI_COMM_WORLD_SIZE', 'MV2_COMM_WORLD_SIZE', 'SLURM_NPROCS', 'MVP_COMM_WORLD_LOCAL_RANK'])
     if 'WORLD_SIZE' not in os.environ:
         os.environ['WORLD_SIZE'] = str(world_size)