From ac40e963d3cc138863e8448a9fc4e2f0e3c6f6a2 Mon Sep 17 00:00:00 2001 From: Charis Poag Date: Fri, 19 Jul 2024 16:33:41 -0500 Subject: [PATCH 1/2] Fix TypeError: 'type' object is not subscriptable Python 3.8 requires typing import to specify. Python 3.10, no longer requires typing import. Change-Id: I5d9844c91932bc3af53acc6dd56eb258f4d18d9b Signed-off-by: Charis Poag --- amdsmi_cli/amdsmi_helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amdsmi_cli/amdsmi_helpers.py b/amdsmi_cli/amdsmi_helpers.py index a6fec6d318..e3647eac31 100644 --- a/amdsmi_cli/amdsmi_helpers.py +++ b/amdsmi_cli/amdsmi_helpers.py @@ -31,6 +31,7 @@ from subprocess import run from subprocess import PIPE, STDOUT from typing import List from enum import Enum +from typing import Set from amdsmi_init import * from BDF import BDF @@ -789,7 +790,7 @@ class AMDSMIHelpers(): """ return int(float(val) * unit_in / unit_out) - def get_pci_device_ids(self) -> set[str]: + def get_pci_device_ids(self) -> Set[str]: pci_devices_path = "/sys/bus/pci/devices" pci_devices: set[str] = set() for device in os.listdir(pci_devices_path): From 47c8cd10cf9e25697a753c53602c085d0b6ae9b6 Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Fri, 19 Jul 2024 14:03:53 -0500 Subject: [PATCH 2/2] Fix missing c_str() introduced in 8bc8307 Change-Id: Ife778276aaebd109a413efb3db703de36b730613 Signed-off-by: Galantsev, Dmitrii --- third_party/shared_mutex/shared_mutex.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/shared_mutex/shared_mutex.cc b/third_party/shared_mutex/shared_mutex.cc index 59504ee1fc..54b0584887 100755 --- a/third_party/shared_mutex/shared_mutex.cc +++ b/third_party/shared_mutex/shared_mutex.cc @@ -259,7 +259,7 @@ shared_mutex_t shared_mutex_init(const char *name, mode_t mode, bool retried) { std::vector ids = lsof(shared_mutex_filename.c_str()); if (ids.size() == 0) { // no process is using it fprintf(stderr, "%d re-init the mutex %s since no one use it. ret:%d ptr:%p\n", - cur_pid, shared_mutex_filename, ret, reinterpret_cast(addr)->ptr); + cur_pid, shared_mutex_filename.c_str(), ret, reinterpret_cast(addr)->ptr); memset(mutex_ptr, 0, sizeof(pthread_mutex_t)); // Set mutex.created == 1 so that it can be initialized latter. mutex.created = 1;