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

Merge amd-staging into amd-master 20220826

Browse Source 
Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: Ibef408e62669ec105571e605f333642cebc33112


[ROCm/rocm_smi_lib commit: a5e286d250]
This commit is contained in:
Hao Zhou
2022-08-26 13:45:55 +08:00
parent f8b5ca55d1 827344a3e8
commit fa6754e2b0
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocm-smi-lib/python_smi_tools/rocm_smi.py
+21 -9
View File
@@ -2022,18 +2022,28 @@ def showProductName(deviceList):
ret = rocmsmi.rsmi_dev_vendor_name_get(device, vendor, 256) ret = rocmsmi.rsmi_dev_vendor_name_get(device, vendor, 256)
# Only continue if GPU vendor is AMD # Only continue if GPU vendor is AMD
if rsmi_ret_ok(ret, device) and isAmdDevice(device): if rsmi_ret_ok(ret, device) and isAmdDevice(device):
device_vendor = vendor.value.decode() try:
device_vendor = vendor.value.decode()
except UnicodeDecodeError:
printErrLog(device, "Unable to read device vendor")
device_vendor = "N/A"
# Retrieve the device series # Retrieve the device series
ret = rocmsmi.rsmi_dev_name_get(device, series, 256) ret = rocmsmi.rsmi_dev_name_get(device, series, 256)
if rsmi_ret_ok(ret, device) and series.value.decode(): if rsmi_ret_ok(ret, device):
device_series = series.value.decode() try:
printLog(device, 'Card series', '\t\t' + device_series) device_series = series.value.decode()
printLog(device, 'Card series', '\t\t' + device_series)
except UnicodeDecodeError:
printErrLog(device, "Unable to read card series")
# Retrieve the device model # Retrieve the device model
ret = rocmsmi.rsmi_dev_subsystem_name_get(device, model, 256) ret = rocmsmi.rsmi_dev_subsystem_name_get(device, model, 256)
if rsmi_ret_ok(ret, device) and model.value.decode(): if rsmi_ret_ok(ret, device):
device_model = model.value.decode() try:
# padHexValue is used for applications that expect 4-digit card models device_model = model.value.decode()
printLog(device, 'Card model', '\t\t' + padHexValue(device_model, 4)) # padHexValue is used for applications that expect 4-digit card models
printLog(device, 'Card model', '\t\t' + padHexValue(device_model, 4))
except UnicodeDecodeError:
printErrLog(device, "Unable to read device model")
printLog(device, 'Card vendor', '\t\t' + device_vendor) printLog(device, 'Card vendor', '\t\t' + device_vendor)
# TODO: Retrieve the SKU using 'rsmi_dev_sku_get' from the LIB # TODO: Retrieve the SKU using 'rsmi_dev_sku_get' from the LIB
# ret = rocmsmi.rsmi_dev_sku_get(device, sku, 256) # ret = rocmsmi.rsmi_dev_sku_get(device, sku, 256)
@@ -2200,7 +2210,9 @@ def showSerialNumber(deviceList):
for device in deviceList: for device in deviceList:
sn = create_string_buffer(256) sn = create_string_buffer(256)
ret = rocmsmi.rsmi_dev_serial_number_get(device, sn, 256) ret = rocmsmi.rsmi_dev_serial_number_get(device, sn, 256)
if not str(sn).isalnum(): try:
sn.value.decode()
except UnicodeDecodeError:
printErrLog(device, "FRU Serial Number contains non-alphanumeric characters. FRU is likely corrupted") printErrLog(device, "FRU Serial Number contains non-alphanumeric characters. FRU is likely corrupted")
continue continue