fix(cvs exec): pass logger to Pssh instead of None

Pssh.__init__ calls log.debug immediately; log=None caused
'NoneType' object has no attribute 'debug' when running cvs exec.

Made-with: Cursor
Signed-off-by: Ignatious Johnson <ichristo@amd.com>

Author: cijohnson

cvs/lib/rccl_lib.py

@@ -1260,6 +1260,7 @@ def install_rccl_tests(
     with_mpi=False,
     mpi_home=None,
     rccl_home=None,
+    rocm_home=None,
 ):
     """Install rccl-tests from ROCm/rocm-systems monorepo.
 
@@ -1270,16 +1271,23 @@ def install_rccl_tests(
         repo_branch (str, optional): Git branch to clone. Defaults to 'develop'
         with_mpi (bool, optional): Build with MPI support. Defaults to False
         mpi_home (str, optional): Path to MPI installation. Required if with_mpi=True
-        rccl_home (str, optional): Path to RCCL installation. Required if with_mpi=True
+        rccl_home (str, optional): Path to RCCL library install (e.g. /opt/rocm)
+        rocm_home (str, optional): Path to ROCm root for hipcc/amdclang (e.g. /opt/rocm).
+            Defaults to rccl_home, then /opt/rocm. Must not be the rccl-tests work dir.
 
     Returns:
         str: Path to the install directory containing all *_perf binaries
 
     Raises:
         Exception: If clone, build, or verification fails
     """
-    if with_mpi and (not mpi_home or not rccl_home):
-        raise ValueError("mpi_home and rccl_home are required when with_mpi=True")
+    rocm = (rocm_home or "/opt/rocm").rstrip("/")
+    if rccl_home is None:
+        rccl = rocm
+    else:
+        rccl = str(rccl_home).rstrip("/")
+    if with_mpi and not mpi_home:
+        raise ValueError("mpi_home is required when with_mpi=True")
     sparse_dir = "projects/rccl-tests"
     clone_root = f"{install_path}/rocm-systems"
 
@@ -1308,13 +1316,13 @@ def install_rccl_tests(
         raise Exception(f"Failed to clone rccl-tests: {e}")
 
     # Build rccl-tests using install.sh script
-    gpu_target = "$(/opt/rocm/bin/rocm_agent_enumerator | grep -v gfx000 | head -1)"
+    gpu_target = f"$({rocm}/bin/rocm_agent_enumerator | grep -v gfx000 | head -1)"
 
     if with_mpi:
-        build_cmd = f"cd {clone_root}/{sparse_dir} && ./install.sh --mpi --mpi_home {mpi_home} --rccl_home {rccl_home} --rocm_home {rccl_home} --gpu_targets {gpu_target}"
+        build_cmd = f"cd {clone_root}/{sparse_dir} && ./install.sh --mpi --mpi_home {mpi_home} --rccl_home {rccl} --rocm_home {rocm} --gpu_targets {gpu_target}"
         log.info("[rccl-tests] Building rccl-tests with MPI support using install.sh in shared storage...")
     else:
-        build_cmd = f"cd {clone_root}/{sparse_dir} && ./install.sh --rccl_home {rccl_home} --rocm_home {rccl_home} --gpu_targets {gpu_target}"
+        build_cmd = f"cd {clone_root}/{sparse_dir} && ./install.sh --rccl_home {rccl} --rocm_home {rocm} --gpu_targets {gpu_target}"
         log.info("[rccl-tests] Building rccl-tests without MPI using install.sh in shared storage...")
 
     try:

cvs/tests/rccl/install_rccl_test.py

@@ -68,8 +68,9 @@ def test_build_rccl_tests(shdl, cluster_dict, config_dict):
     num_nodes = len(all_nodes)
     with_mpi = num_nodes > 1  # Automatically enable MPI for multi-node setups
     mpi_home = rccl_cfg.get("mpi_path_var")  # Use existing mpi_path_var
-    rccl_home = rccl_cfg.get("rccl_dir")  # Use existing rccl_dir
-    rocm_path = rccl_cfg.get("rocm_path_var", "/opt/rocm")
+    # install.sh --rccl_home / --rocm_home must point at the ROCm/RCCL *install* (e.g. /opt/rocm), not rccl_dir (work tree).
+    rocm_path = (rccl_cfg.get("rocm_path_var") or "/opt/rocm").rstrip("/")
+    rccl_path = (rccl_cfg.get("rccl_path_var") or rocm_path).rstrip("/")
 
     log.info(f"[rccl-tests] Detected {num_nodes} node(s), MPI support: {'enabled' if with_mpi else 'disabled'}")
 
@@ -98,18 +99,15 @@ def test_build_rccl_tests(shdl, cluster_dict, config_dict):
         elif with_mpi and mpi_exists:
             log.info(f"[rccl-tests] Using existing MPI installation at: {mpi_home}")
 
-        # Use ROCm path as RCCL home if not specified
-        if with_mpi and not rccl_home:
-            rccl_home = rocm_path
-
         install_dir = rccl_lib.install_rccl_tests(
             shdl=shdl,
             install_path=install_path,
             repo_url=repo_url,
             repo_branch=repo_branch,
             with_mpi=with_mpi,
             mpi_home=mpi_home,
-            rccl_home=rccl_home,
+            rccl_home=rccl_path,
+            rocm_home=rocm_path,
         )
 
         mpi_status = "with MPI" if with_mpi else "without MPI"