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

Fix wrongly reported CUE_HT attribute #1630

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix wrongly reported CUE_HT attribute #1630

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
5 changes: 4 additions & 1 deletion rqd/rqd/rqcore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,10 @@ def __createEnvVariables(self):
self.frameEnv['CUE_THREADS'] = str(max(
int(self.frameEnv['CUE_THREADS']),
len(self.runFrame.attributes['CPU_LIST'].split(','))))
self.frameEnv['CUE_HT'] = "True"
if self.rqCore.machine.getHyperthreadingMultiplier() > 1:
self.frameEnv['CUE_HT'] = "True"
else:
self.frameEnv['CUE_HT'] = "False"

# Add GPU's to use all assigned GPU cores
if 'GPU_LIST' in self.runFrame.attributes:
Expand Down
4 changes: 2 additions & 2 deletions rqd/rqd/rqmachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ def getLoadAvg(self):
with open(rqd.rqconstants.PATH_LOADAVG, "r", encoding='utf-8') as loadAvgFile:
loadAvg = int(float(loadAvgFile.read().split()[0]) * 100)
if self.__enabledHT():
loadAvg = loadAvg // self.__getHyperthreadingMultiplier()
loadAvg = loadAvg // self.getHyperthreadingMultiplier()
loadAvg = loadAvg + rqd.rqconstants.LOAD_MODIFIER
loadAvg = max(loadAvg, 0)
return loadAvg
Expand Down Expand Up @@ -893,7 +893,7 @@ def getBootReport(self):
def __enabledHT(self):
return 'hyperthreadingMultiplier' in self.__renderHost.attributes

def __getHyperthreadingMultiplier(self):
def getHyperthreadingMultiplier(self):
return int(self.__renderHost.attributes['hyperthreadingMultiplier'])

def setupTaskset(self):
Expand Down
Loading