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..ddaeae8f 100644 --- a/scripts/lib/xpedite/util/cpuInfo.py +++ b/scripts/lib/xpedite/util/cpuInfo.py @@ -25,8 +25,12 @@ def _loadId(self): """Returns the cpu identifier from vendor, family, model and stepping""" vendorId = self.info.get('vendor_id') vendorId = vendorId if vendorId else self.info.get('vendor_id_raw') + stepping = self.info.get('stepping') if 'stepping' in self.info else None if vendorId: - return '{}-{}-{:02X}-{}'.format(vendorId, self.info['family'], self.info['model'], self.info['stepping']) + vendorIdString = '{}-{}-{:02X}'.format(vendorId, self.info['family'], self.info['model']) + if stepping: + vendorIdString += '-{}'.format(stepping) + return vendorIdString raise Exception('failed to load cpuInfo - missing cpu vendor id\n{}'.format(self.info)) def _loadAdvertisedHz(self):