From c4caed95ae3122f3dd42ff18cf95a931da8d2caa Mon Sep 17 00:00:00 2001
From: DFRJ <fujiangjie@huawei.com>
Date: Tue, 12 Aug 2025 11:43:49 +0000
Subject: [PATCH] =?UTF-8?q?update=20src/installService.py.=201=E3=80=81?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3HMPI=E5=B8=A6=E2=80=9CRC=E2=80=9D=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=202=E3=80=81HMPI?=
 =?UTF-8?q?=2025.1.RC1=E7=89=88=E6=9C=AC=E5=BC=80=E5=A7=8B=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=E6=9C=89=E5=8F=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E6=9C=89=E4=BB=A3=E7=A0=81=E4=B8=8D=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: DFRJ <fujiangjie@huawei.com>
---
 src/installService.py | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/installService.py b/src/installService.py
index 790e3558..796677e8 100644
--- a/src/installService.py
+++ b/src/installService.py
@@ -109,33 +109,19 @@ class InstallService:
     def get_icc_info(self):
         return self.gen_compiler_dict("icc", ('2018', "2018.4"))
     
-    def get_hmpi_version(self, hmpi_v3_info):
-        if hmpi_v3_info != "":
-            ucg_path = self.get_cmd_output('which ucg_info')[0] 
-            ucg_path = os.path.dirname(ucg_path)
-            libr_path = os.path.join(ucg_path, "../../../../../")
-        else: 
+    def get_hmpi_info(self):
+        name = 'hmpi'
+
+        ucg_info = self.get_cmd_output("ucg_info -v")[0]
+        if "UCG" in ucg_info:
+            version = ucg_info.split()[3]
+        else:
             ucg_path = self.get_cmd_output('which ucx_info')[0]
             ucg_path = os.path.dirname(ucg_path)
             libr_path = os.path.join(ucg_path, "../../../")
+            version = os.listdir(libr_path)[0]
 
-        version = None
-        for version in os.listdir(libr_path):
-            print(version)
-            if version != "latest":
-              return self.get_version_info(version)
-              
-        return self.get_version_info(version)
-
-    def get_hmpi_info(self):
-        hmpi_v3_info = (self.get_cmd_output('ucg_info -c | grep -i PLANC')[0]).upper() 
-        hmpi_v2_info = (self.get_cmd_output('ucx_info -c | grep -i BUILT')[0]).upper()
-        
-        if "BUILT" not in hmpi_v2_info and "PLANC" not in hmpi_v3_info:
-            return None
-        name = 'hmpi'
-        version = self.get_hmpi_version(hmpi_v3_info)
-        return self.gen_mpi_dict(name, version)
+        return self.gen_mpi_dict(name, (version,version))
  
     def get_openmpi_info(self):
         mpi_info_list = self.get_cmd_output('mpirun -version')
-- 
Gitee