Merge branch 'develop'

Author: rbonghi

Diff for: .github/ISSUE_TEMPLATE/bug-report.md

@@ -58,8 +58,16 @@ journalctl -u jtop.service -n 100 --no-pager
 
 ### Log from jetson-stats installation
 
-Attach here the output from: `sudo -H pip3 install --no-cache-dir -U jetson-stats`
+Attach here the output from: `sudo -H pip3 install --no-cache-dir -v -U jetson-stats`
 
 <!-- Use:
-sudo -H pip3 install --no-cache-dir -U jetson-stats
- -->
+sudo -H pip3 install --no-cache-dir -v -U jetson-stats
+ -->
+
+### RAW Data
+
+File from `jtop --error-log` attached
+
+<!-- Please attach the output from:
+jtop --error-log
+-->

Diff for: .gitignore

@@ -5,6 +5,7 @@
 _build/
 dist/
 doc/
+build/
 
 # Python egg metadata, regenerated from source files by setuptools.
 /*.egg-info

Diff for: docs/jtop/jtop.rst

@@ -304,3 +304,30 @@ INFO
 This page show all technical information about your board. This output is available :py:attr:`jtop.jtop.board`.
 
 Compare all previous versions, now the Serial number is hidden and you can enable only clicking on the area or pressing the key **s**.
+
+Uninstall
+---------
+
+For a complete and *manual* uninstall of this package on your device there are few steps to do
+
+.. warning::
+
+  You need **super user** to execute the commands
+
+.. code-block:: bash
+
+  # Stop, disable and remove jtop.service
+  systemctl stop jtop.service
+  systemctl disable jtop.service
+  rm /etc/systemd/system/jtop.service
+  # reload services
+  systemctl daemon-reload
+
+  # remove jtop pipe
+  rm /run/jtop.sock
+
+  # Remove enviroment variables
+  rm /etc/profile.d/jtop_env.sh
+
+  # Uninstall python package
+  pip3 uninstall jetson-stats

Diff for: docs/troubleshooting.rst

@@ -97,7 +97,7 @@ Before to open an `issue`_, try to reinstall the latest version with this comman
 
 .. code-block:: bash
 
-  sudo pip3 install --no-cache-dir -U jetson-stats
+  sudo pip3 install --no-cache-dir -v -U jetson-stats
 
 Save the output somewhere, if this command doesn't fix can be helpful when you one an `issue`_.
 

Diff for: jtop/__init__.py

@@ -31,5 +31,5 @@
 __copyright__ = "(c) 2024, Raffaello Bonghi"
 # Version package
 # https://packaging.python.org/guides/distributing-packages-using-setuptools/#choosing-a-versioning-scheme
-__version__ = "4.2.4"
+__version__ = "4.2.5"
 # EOF

Diff for: jtop/__main__.py

@@ -19,7 +19,7 @@
 import signal
 import os
 import sys
-import locale
+# import locale
 import argparse
 # control command line
 import curses
@@ -94,8 +94,6 @@ def main():
     # Initialize signals
     # signal.signal(signal.SIGINT, exit_signal)  # Do not needed equivalent to exception KeyboardInterrupt
     signal.signal(signal.SIGTERM, exit_signal)
-    # https://stackoverflow.com/questions/56373360/n-curses-within-python-how-to-catch-and-print-non-ascii-character
-    locale.setlocale(locale.LC_ALL, '')
     # Run jtop service
     if os.getenv('JTOP_SERVICE', False):
         # Initialize logging level
@@ -142,6 +140,9 @@ def main():
         sys.exit(0)
     # jtop client start
     try:
+        # https://stackoverflow.com/questions/56373360/n-curses-within-python-how-to-catch-and-print-non-ascii-character
+        # Commented for issues #466 #393
+        # locale.setlocale(locale.LC_ALL, '')
         # Open jtop client
         with jtop(interval=interval) as jetson:
             # Call the curses wrapper

Diff for: jtop/core/engine.py

@@ -55,7 +55,7 @@ def read_engine(path):
 
 class EngineService(object):
 
-    ENGINES = ['ape', 'dla', 'pva', 'vic', 'nvjpg', 'nvenc', 'nvdec', 'se.', 'cvnas', 'msenc']
+    ENGINES = ['ape', 'dla', 'pva', 'vic', 'nvjpg', 'nvenc', 'nvdec', 'se.', 'cvnas', 'msenc', 'ofa']
 
     def __init__(self):
         # Sort list before start

Diff for: jtop/core/gpu.py

@@ -23,6 +23,8 @@
 from .command import Command
 # Create logger
 logger = logging.getLogger(__name__)
+# default ipgu path for Jetson devices
+DEFAULT_IGPU_PATH = "/sys/class/devfreq/"
 
 
 def check_nvidia_smi():
@@ -95,6 +97,22 @@ def igpu_read_status(path):
     return gpu
 
 
+def get_raw_igpu_devices():
+    igpu_path = DEFAULT_IGPU_PATH
+    raw_output = {}
+    for item in os.listdir(igpu_path):
+        item_path = os.path.join(igpu_path, item)
+        if os.path.isfile(item_path) or os.path.islink(item_path):
+            # Check name device
+            name_path = "{item}/device/of_node/name".format(item=item_path)
+            if os.path.isfile(name_path):
+                # Decode name
+                name = cat(name_path)
+                # path and file
+                raw_output[name_path] = "{}".format(name)
+    return raw_output
+
+
 def find_igpu(igpu_path):
     # Check if exist a integrated gpu
     # if not os.path.exists("/dev/nvhost-gpu") and not os.path.exists("/dev/nvhost-power-gpu"):
@@ -260,7 +278,7 @@ class GPUService(object):
 
     def __init__(self):
         # Detect integrated GPU
-        igpu_path = "/sys/class/devfreq/"
+        igpu_path = DEFAULT_IGPU_PATH
         if os.getenv('JTOP_TESTING', False):
             igpu_path = "/fake_sys/class/devfreq/"
             logger.warning("Running in JTOP_TESTING folder={root_dir}".format(root_dir=igpu_path))

Diff for: jtop/core/jetson_libraries.py

@@ -26,7 +26,7 @@
     FileNotFoundError = IOError
 
 
-MODULES = ['cuDNN', 'TensorRT', 'VPI']  # 'Visionworks'
+MODULES = ['cuDNN', 'TensorRT.', 'VPI']  # 'Visionworks'
 CUDA_FILE_RE = re.compile(r'CUDA Version (.*)')
 CUDA_NVCC_RE = re.compile(r'V([0-9]+.[0-9]+.[0-9]+)')
 
@@ -100,17 +100,24 @@ def get_libraries():
     # Find all modules
     modules = get_all_modules()
     for name in MODULES:
-        os_variables[name] = ''
+        # Fix TensorRT search #462
+        name_dict = name[:-1] if name.endswith('.') else name
+        os_variables[name_dict] = ''
         # Find version if installed
         for module, version in modules.items():
+            if name.endswith('.') and name.lower()[:-1] == module:
+                os_variables[name_dict] = version.split('-')[0]
+                break
             if name.lower() in module:
-                os_variables[name] = version.split('-')[0]
+                os_variables[name_dict] = version.split('-')[0]
                 break
     # Get Vulkan output
     cmd_vulkaninfo = Command(['which', 'vulkaninfo'])
     try:
         lines = cmd_vulkaninfo()
         # Extract version
+        if not lines:
+            raise Command.CommandException("Missing command", -3)
         cmd_vulkan = Command(lines)
         lines = cmd_vulkan()
         for line in lines:

Diff for: jtop/core/jetson_variables.py

@@ -177,7 +177,7 @@ def read_i2c_raw_data(bus, registry, size_block):
     return string_data
 
 
-def get_raw_output():
+def get_jetson_raw_output():
     raw_output = {}
     # Catch all output from all files
     for file in RAW_FILES:

Diff for: jtop/core/memory.py

@@ -24,7 +24,7 @@
 import subprocess as sp
 from .processes import read_process_table
 from .engine import read_engine
-from .common import cat, check_file, GenericInterface
+from .common import cat, GenericInterface
 from .command import Command
 # Create logger
 logger = logging.getLogger(__name__)
@@ -184,6 +184,20 @@ def read_emc(root_path):
     if 'max' in emc:
         if emc_cap > 0 and emc_cap < emc['max']:
             emc['max'] = emc_cap
+    # Percentage utilization
+    # https://forums.developer.nvidia.com/t/real-time-emc-bandwidth-with-sysfs/107479/3
+    if os.access(root_path + "/debug/cactmon/mc_all", os.R_OK):
+        with open(root_path + "/debug/cactmon/mc_all", 'r') as f:
+            utilization = int(f.read())
+    elif os.access(root_path + "/actmon_avg_activity/mc_all", os.R_OK):
+        with open(root_path + "/actmon_avg_activity/mc_all", 'r') as f:
+            utilization = int(f.read())
+    else:
+        # if utilization not accesibile return empty EMC data
+        return {}
+    emc['val'] = utilization // emc['cur']
+    # Set always online this engine
+    emc['online'] = True
     return emc
 
 
@@ -289,6 +303,9 @@ def __init__(self, config):
         self._is_emc = True if read_emc(self._root_path) else False
         if self._is_emc:
             logger.info("Found EMC!")
+        self._is_iram = os.path.isdir(self._root_path + "/debug/nvmap/iram")
+        if self._is_iram:
+            logger.info("Found IRAM!")
         # Initialization memory
         logger.info("Memory service started")
 
@@ -421,17 +438,8 @@ def get_status(self, mem_total):
         # Read EMC status
         if self._is_emc:
             memory['EMC'] = read_emc(self._root_path)
-            # Set always online this engine
-            memory['EMC']['online'] = True
-            # Percentage utilization
-            # https://forums.developer.nvidia.com/t/real-time-emc-bandwidth-with-sysfs/107479/3
-            if check_file(self._root_path + "/debug/cactmon/mc_all"):
-                utilization = int(cat(self._root_path + "/debug/cactmon/mc_all"))
-            else:
-                utilization = int(cat(self._root_path + "/actmon_avg_activity/mc_all"))
-            memory['EMC']['val'] = utilization // memory['EMC']['cur']
         # Read IRAM if available
-        if os.path.isdir(self._root_path + "/debug/nvmap/iram"):
+        if self._is_iram:
             size = 0
             if os.path.isfile(self._root_path + "/debug/nvmap/iram/size"):
                 # Convert from Hex to decimal - Number in bytes

Diff for: jtop/core/nvpmodel.py

@@ -74,6 +74,8 @@ def nvpmodel_query():
         lines = nvpmodel_p(timeout=COMMAND_TIMEOUT)
     except FileNotFoundError:
         raise JtopException("nvpmodel doesn't exist")
+    except Command.CommandException:
+        raise JtopException("nvpmodel command unavailable")
     # Extract lines
     for idx, line in enumerate(lines):
         # Search configuration NVPmodel

Diff for: jtop/core/temperature.py

@@ -33,11 +33,9 @@ def read_temperature(data):
         try:
             value = float(cat(path)) / 1000.0
             values[name] = value
-        except OSError:
+        except (OSError, ValueError):
             # If negative sensor offline
             values[name] = TEMPERATURE_OFFLINE
-        except ValueError:
-            values[name] = TEMPERATURE_OFFLINE
     return values
 
 

Diff for: jtop/github.py

@@ -21,8 +21,9 @@
 
 from copy import deepcopy
 # jtop variable
+from .core.gpu import get_raw_igpu_devices
 from .core.hardware import get_platform_variables
-from .core.jetson_variables import get_raw_output
+from .core.jetson_variables import get_jetson_raw_output
 from .terminal_colors import bcolors
 
 
@@ -79,12 +80,18 @@ def get_hardware_log():
     body = "--------------------- PLATFORM -------------------------\n"
     for name, value in platform.items():
         body += "{name}: {value}\n".format(name=name, value=value)
-    # Print all raw output
-    raw_output = get_raw_output()
-    body += "-------------------- RAW OUTPUT ------------------------"
+    # Print all jetson raw output
+    raw_output = get_jetson_raw_output()
+    body += "-------------------- JETSON RAW OUTPUT -----------------\n"
     for name, value in raw_output.items():
-        body += "\n------------------\n"
-        body += "{name}:\n{value}".format(name=name, value=value)
+        body += "------------------\n"
+        body += "Path: {name}\n{value}\n".format(name=name, value=value)
+    # Print device list
+    raw_output = get_raw_igpu_devices()
+    body += "\n-------------------- IGPU OUTPUT ---------------------\n"
+    for path, value in raw_output.items():
+        body += "------------------\n"
+        body += "Path: {path}\n{value}\n".format(path=path, value=value)
     return body
 
 

Diff for: jtop/gui/lib/process_table.py

@@ -44,7 +44,6 @@ def __init__(self, stdscr, jetson):
         self.type_reverse = True
 
     def draw(self, pos_y, pos_x, width, height, key, mouse):
-        processes = self.jetson.processes
         # Plot low bar background line
         try:
             self.stdscr.addstr(pos_y, 0, " " * width, NColors.igreen())
@@ -67,7 +66,11 @@ def draw(self, pos_y, pos_x, width, height, key, mouse):
             except curses.error:
                 break
         # Sort table for selected line
-        sorted_processes = sorted(processes, key=lambda x: x[self.line_sort], reverse=self.type_reverse)
+        try:
+            sorted_processes = self.jetson.processes
+            sorted_processes = sorted(sorted_processes, key=lambda x: x[self.line_sort], reverse=self.type_reverse)
+        except IndexError:
+            pass
         # Draw all processes
         # Instantiate the number of process variable to avoid an unbound local error if the process table is empty.
         nprocess = 0

Diff for: jtop/jetson_config.py

@@ -37,8 +37,9 @@
 # Detect user
 user = os.environ.get('USER', '')
 # Get user from sudo
-if 'SUDO_USER' in os.environ:
-    user = os.environ['SUDO_USER']
+sudo_user = os.environ.get('SUDO_USER', '')
+# If are both empty assign 'root'
+user = sudo_user or 'root'
 # Locate folder and type of installation
 folder, _ = os.path.split(__file__)
 folder = os.path.dirname(folder)