Fix wrongly reported CUE_HT attribute (#1630)

This attribute is only used on the GUI and API to report whether a host
CPU architecture is hyperthreaded or not. For some reason I couldn't get
to the bottom of, this attribute was always hardcoded to true.

rqd/rqd/rqcore.py

@@ -782,7 +782,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:

rqd/rqd/rqmachine.py

@@ -442,7 +442,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
@@ -894,7 +894,11 @@ def getBootReport(self):
     def __enabledHT(self):
         return 'hyperthreadingMultiplier' in self.__renderHost.attributes
 
-    def __getHyperthreadingMultiplier(self):
+    def getHyperthreadingMultiplier(self):
+        """
+        Multiplied used to compute the number of threads that can be allocated simultaneously
+        on a core
+        """
         return int(self.__renderHost.attributes['hyperthreadingMultiplier'])
 
     def setupTaskset(self):

rqd/tests/rqmachine_test.py

@@ -328,7 +328,7 @@ def test_getLoadAvg(self):
     @mock.patch.object(
         rqd.rqmachine.Machine, '_Machine__enabledHT', new=mock.MagicMock(return_value=True))
     @mock.patch.object(
-        rqd.rqmachine.Machine, '_Machine__getHyperthreadingMultiplier',
+        rqd.rqmachine.Machine, 'getHyperthreadingMultiplier',
         new=mock.MagicMock(return_value=2))
     def test_getLoadAvgHT(self):
         self.loadavg.set_contents(LOADAVG_HIGH_USAGE)