ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-06-26 18:16:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix PY3.5 support, PEP8

Browse Source
This commit is contained in:
allegroai 2024-05-17 10:15:56 +03:00
parent 6ad3f16bb9
commit 0efdb0b3b9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clearml/utilities/gpu/gpustat.py
View File

@ -537,6 +537,7 @@ class GPUStatCollection(object):
got_mig_info = False got_mig_info = False
for mig_index in range(mig_cnt): for mig_index in range(mig_cnt):
# noinspection PyBroadException
try: try:
mig_handle = N.nvmlDeviceGetMigDeviceHandleByIndex(handle, mig_index) mig_handle = N.nvmlDeviceGetMigDeviceHandleByIndex(handle, mig_index)
mig_info = get_gpu_info(mig_index, mig_handle, is_mig=True) mig_info = get_gpu_info(mig_index, mig_handle, is_mig=True)
@ -550,7 +551,7 @@ class GPUStatCollection(object):
mig_info["fan.speed"] = gpu_info["fan.speed"] mig_info["fan.speed"] = gpu_info["fan.speed"]
gpu_list.append(GPUStat(mig_info)) gpu_list.append(GPUStat(mig_info))
got_mig_info = True got_mig_info = True
except Exception as e: except Exception:
pass pass
if not got_mig_info: if not got_mig_info:
gpu_list.append(GPUStat(gpu_info)) gpu_list.append(GPUStat(gpu_info))

13
clearml/utilities/gpu/pyrsmi.py
View File

@ -20,6 +20,9 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
# flake8: noqa
# This is only to ignore all flake8 errors in this file
# Python bindings for ROCm-SMI library # Python bindings for ROCm-SMI library
from ctypes import * from ctypes import *
from os.path import join, realpath, isfile from os.path import join, realpath, isfile
@ -281,7 +284,7 @@ def _find_lib_rocm():
if search fails, returns empty string if search fails, returns empty string
""" """
rocm_path = os.environ.get('ROCM_PATH', '/opt/rocm') rocm_path = os.environ.get('ROCM_PATH', '/opt/rocm')
rocm_lib_path = join(rocm_path, f'lib/{LIBROCM_NAME}') rocm_lib_path = join(rocm_path, 'lib/{}'.format(LIBROCM_NAME))
return rocm_lib_path if isfile(rocm_lib_path) else '' return rocm_lib_path if isfile(rocm_lib_path) else ''
@ -303,7 +306,7 @@ def smi_initialize():
if _driver_initialized(): if _driver_initialized():
ret_init = rocm_lib.rsmi_init(0) ret_init = rocm_lib.rsmi_init(0)
if ret_init != 0: if ret_init != 0:
logging.error(f'ROCm SMI init returned value {ret_init}') logging.error('ROCm SMI init returned value {}'.format(ret_init))
raise RuntimeError('ROCm SMI initialization failed') raise RuntimeError('ROCm SMI initialization failed')
else: else:
raise RuntimeError('ROCm driver initilization failed') raise RuntimeError('ROCm driver initilization failed')
@ -583,7 +586,7 @@ B1 = '%02x'
B2 = B1 * 2 B2 = B1 * 2
B4 = B1 * 4 B4 = B1 * 4
B6 = B1 * 6 B6 = B1 * 6
nv_fmt = f'GPU-{B4}-{B2}-{B2}-{B2}-{B6}' nv_fmt = 'GPU-{b4}-{b2}-{b2}-{b2}-{b6}'.format(b2=B2, b4=B4, b6=B6)
# UUID function # UUID function
def smi_get_device_uuid(dev, format='roc'): def smi_get_device_uuid(dev, format='roc'):
@ -595,11 +598,11 @@ def smi_get_device_uuid(dev, format='roc'):
if format == 'roc': if format == 'roc':
# use hex strings # use hex strings
return f'GPU-{u_s}' return 'GPU-{}'.format(u_s)
elif format == 'nv': elif format == 'nv':
# break down to ASCII strings according to the format # break down to ASCII strings according to the format
b_a = bytearray() b_a = bytearray()
b_a.extend(map(ord, u_s)) b_a.extend(map(ord, u_s))
return nv_fmt % tuple(b_a) return nv_fmt % tuple(b_a)
else: else:
raise ValueError(f'Invalid format: \'{format}\'; use \'roc\' or \'nv\'') raise ValueError('Invalid format: \'{}\'; use \'roc\' or \'nv\''.format(format))