Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade py-cpuinfo to version 3.2.0 #178

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Upgrade py-cpuinfo to version 3.2.0 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/lib/xpedite/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion scripts/lib/xpedite/util/cpuInfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading