From 7df3921159a47f79ad15bbfd7070a86ce00e9510 Mon Sep 17 00:00:00 2001 From: Brooke Elizabeth Cantwell Date: Tue, 9 Jul 2024 09:54:41 -0400 Subject: [PATCH] Upgrade py-cpuinfo to version 3.2.0 --- scripts/lib/xpedite/requirements.txt | 2 +- scripts/lib/xpedite/util/cpuInfo.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/xpedite/requirements.txt b/scripts/lib/xpedite/requirements.txt index 26e129d0..c9c266bd 100644 --- a/scripts/lib/xpedite/requirements.txt +++ b/scripts/lib/xpedite/requirements.txt @@ -7,7 +7,7 @@ pygments>=2.0.2 rpyc>=4.0.1 cement>=3.0.10 termcolor>=1.1.0 -py-cpuinfo>=0.1.2 +py-cpuinfo>=3.2.0 six>=1.12.0 nbclassic>=1.0.0 setuptools diff --git a/scripts/lib/xpedite/util/cpuInfo.py b/scripts/lib/xpedite/util/cpuInfo.py index fb48eb86..09f152ec 100644 --- a/scripts/lib/xpedite/util/cpuInfo.py +++ b/scripts/lib/xpedite/util/cpuInfo.py @@ -22,11 +22,11 @@ def __init__(self, info=None): self.advertisedHz = self._loadAdvertisedHz() def _loadId(self): - """Returns the cpu identifier from vendor, family, model and stepping""" + """Returns the cpu identifier from vendor, family and model""" vendorId = self.info.get('vendor_id') vendorId = vendorId if vendorId else self.info.get('vendor_id_raw') if vendorId: - return '{}-{}-{:02X}-{}'.format(vendorId, self.info['family'], self.info['model'], self.info['stepping']) + return '{}-{}-{:02X}'.format(vendorId, self.info['family'], self.info['model']) raise Exception('failed to load cpuInfo - missing cpu vendor id\n{}'.format(self.info)) def _loadAdvertisedHz(self):