3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-06 10:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1704 from alicevision/fix/stats

Browse source 
Fix stats
This commit is contained in:
Fabien Castan 2022-06-02 14:19:53 +02:00 • committed by GitHub
commit 8eaef0b367
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
meshroom/core/stats.py
View file

@ -95,23 +95,34 @@ class ComputerStatistics:
return return
try: try:
p = subprocess.Popen([self.nvidia_smi, "-q", "-x"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen([self.nvidia_smi, "-q", "-x"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
xmlGpu, stdError = p.communicate(timeout=10) # 10 seconds if sys.version_info[0] == 2:
# no timeout in python-2
xmlGpu, stdError = p.communicate()
else:
xmlGpu, stdError = p.communicate(timeout=10) # 10 seconds
smiTree = ET.fromstring(xmlGpu) smiTree = ET.fromstring(xmlGpu)
gpuTree = smiTree.find('gpu') gpuTree = smiTree.find('gpu')
try: try:
self._addKV('gpuMemoryUsed', gpuTree.find('fb_memory_usage').find('used').text.split(" ")[0]) gpuMemoryUsed = gpuTree.find('fb_memory_usage').find('used').text.split(" ")[0]
self._addKV('gpuMemoryUsed', gpuMemoryUsed)
except Exception as e: except Exception as e:
logging.debug('Failed to get gpuMemoryUsed: "{}".'.format(str(e))) logging.debug('Failed to get gpuMemoryUsed: "{}".'.format(str(e)))
pass pass
try: try:
self._addKV('gpuUsed', gpuTree.find('utilization').find('gpu_util').text.split(" ")[0]) self.gpuMemoryTotal = gpuTree.find('fb_memory_usage').find('total').text.split(" ")[0]
except Exception as e:
pass
try:
gpuUsed = gpuTree.find('utilization').find('gpu_util').text.split(" ")[0]
self._addKV('gpuUsed', gpuUsed)
except Exception as e: except Exception as e:
logging.debug('Failed to get gpuUsed: "{}".'.format(str(e))) logging.debug('Failed to get gpuUsed: "{}".'.format(str(e)))
pass pass
try: try:
self._addKV('gpuTemperature', gpuTree.find('temperature').find('gpu_temp').text.split(" ")[0]) gpuTemperature = gpuTree.find('temperature').find('gpu_temp').text.split(" ")[0]
self._addKV('gpuTemperature', gpuTemperature)
except Exception as e: except Exception as e:
logging.debug('Failed to get gpuTemperature: "{}".'.format(str(e))) logging.debug('Failed to get gpuTemperature: "{}".'.format(str(e)))
pass pass
@ -191,7 +202,7 @@ class ProcStatistics:
data = proc.as_dict(self.dynamicKeys) data = proc.as_dict(self.dynamicKeys)
for k, v in data.items(): for k, v in data.items():
self._addKV(k, v) self._addKV(k, v)
## Note: Do not collect stats about open files for now, ## Note: Do not collect stats about open files for now,
# as there is bug in psutil-5.7.2 on Windows which crashes the application. # as there is bug in psutil-5.7.2 on Windows which crashes the application.
# https://github.com/giampaolo/psutil/issues/1763 # https://github.com/giampaolo/psutil/issues/1763

2
meshroom/ui/reconstruction.py
View file

@ -360,7 +360,7 @@ class ViewpointWrapper(QObject):
return None return None
focalLength = self.solvedIntrinsics["focalLength"] focalLength = self.solvedIntrinsics["focalLength"]
sensorHeight = self.solvedIntrinsics["sensorHeight"] sensorHeight = self.solvedIntrinsics["sensorHeight"]
return 2.0 * math.atan(sensorHeight / (2.0 * float(focalLength))) * 180 / math.pi return 2.0 * math.atan(float(sensorHeight) / (2.0 * float(focalLength))) * 180.0 / math.pi
@Property(type=QUrl, notify=denseSceneParamsChanged) @Property(type=QUrl, notify=denseSceneParamsChanged)
def undistortedImageSource(self): def undistortedImageSource(self):