changed default regex

Author: jaspals

nodescraper/plugins/inband/package/analyzer_args.py

@@ -34,18 +34,15 @@
 class PackageAnalyzerArgs(AnalyzerArgs):
     exp_package_ver: Dict[str, Optional[str]] = Field(default_factory=dict)
     regex_match: bool = False
-    rocm_regex: str = (
-        r"ocl-icd|kfdtest|llvm-amd|miopen|half|hip|hcc|hsa|rocm|atmi|comgr|composa|amd-smi|aomp|amdgpu|rock|mivision|migraph|rocprofiler|roctracer|rocbl|hipify|rocsol|rocthr|rocff|rocalu|rocprim|rocrand|rccl|rocspar|rdc|rocwmma|rpp|openmp|amdfwflash|ocl|opencl"
-    )
+    # rocm_regex is optional and should be specified in plugin_config.json if needed
+    rocm_regex: Optional[str] = None
     enable_rocm_regex: bool = False
 
     @classmethod
     def build_from_model(cls, datamodel: PackageDataModel) -> "PackageAnalyzerArgs":
         # Use custom rocm_regex from collection_args if enable_rocm_regex is true
+        rocm_regex = None
         if datamodel.enable_rocm_regex and datamodel.rocm_regex:
             rocm_regex = datamodel.rocm_regex
-        else:
-            # Use default rocm_regex
-            rocm_regex = PackageAnalyzerArgs().rocm_regex
 
         return cls(exp_package_ver=datamodel.version_info, rocm_regex=rocm_regex)

nodescraper/plugins/inband/package/package_collector.py

@@ -232,24 +232,29 @@ def collect_data(
             self.result.status = ExecutionStatus.NOT_RAN
             return self.result, None
 
-        # Filter and log ROCm packages if on Linux
+        # Filter and log ROCm packages if on Linux and rocm_regex is provided
         if self.system_info.os_family == OSFamily.LINUX and packages:
-            # Get ROCm pattern from args or use default
-            rocm_pattern = args.rocm_regex if args else PackageAnalyzerArgs().rocm_regex
-            self.logger.info("Using rocm_pattern: %s", rocm_pattern)
-            rocm_packages = self._filter_rocm_packages(packages, rocm_pattern)
-            if rocm_packages:
-                self.result.message = f"Found {len(rocm_packages)} ROCm-related packages installed"
-                self.result.status = ExecutionStatus.OK
-                self._log_event(
-                    category=EventCategory.OS,
-                    description=f"Found {len(rocm_packages)} ROCm-related packages installed",
-                    priority=EventPriority.INFO,
-                    data={"rocm_packages": sorted(rocm_packages.keys())},
-                )
+            # Get ROCm pattern from args if provided
+            rocm_pattern = args.rocm_regex if args else None
+            if rocm_pattern:
+                self.logger.info("Using rocm_pattern: %s", rocm_pattern)
+                rocm_packages = self._filter_rocm_packages(packages, rocm_pattern)
+                if rocm_packages:
+                    self.result.message = (
+                        f"Found {len(rocm_packages)} ROCm-related packages installed"
+                    )
+                    self.result.status = ExecutionStatus.OK
+                    self._log_event(
+                        category=EventCategory.OS,
+                        description=f"Found {len(rocm_packages)} ROCm-related packages installed",
+                        priority=EventPriority.INFO,
+                        data={"rocm_packages": sorted(rocm_packages.keys())},
+                    )
+            else:
+                self.logger.info("No rocm_regex provided, skipping ROCm package filtering")
 
         # Extract rocm_regex and enable_rocm_regex from args if provided
-        rocm_regex = args.rocm_regex if args else ""
+        rocm_regex = args.rocm_regex if (args and args.rocm_regex) else ""
         enable_rocm_regex = getattr(args, "enable_rocm_regex", False) if args else False
 
         try:

test/unit/plugin/test_package_collector.py

@@ -224,40 +224,6 @@ def test_bad_splits_ubuntu(collector, conn_mock, command_results):
     assert res.status == ExecutionStatus.OK
 
 
-def test_rocm_package_filtering_default_regex(collector, conn_mock, command_results):
-    """Test ROCm package filtering with default regex pattern."""
-    # Mock Ubuntu system with ROCm packages
-    ubuntu_packages = """rocm-core 5.7.0
-                    hip-runtime-amd 5.7.0
-                    hsa-rocr 1.9.0
-                    amdgpu-dkms 6.3.6
-                    gcc 11.4.0
-                    python3 3.10.12"""
-
-    conn_mock.run_command.side_effect = [
-        CommandArtifact(
-            command="",
-            exit_code=0,
-            stdout=command_results["ubuntu_rel"],
-            stderr="",
-        ),
-        CommandArtifact(
-            command="",
-            exit_code=0,
-            stdout=ubuntu_packages,
-            stderr="",
-        ),
-    ]
-
-    res, data = collector.collect_data()
-    assert res.status == ExecutionStatus.OK
-    # Check that ROCm packages are found
-    assert "rocm" in res.message.lower()
-    assert data is not None
-    # Verify all packages are collected
-    assert len(data.version_info) == 6
-
-
 def test_rocm_package_filtering_custom_regex(collector, conn_mock, command_results):
     """Test ROCm package filtering with custom regex pattern."""
     from nodescraper.plugins.inband.package.analyzer_args import PackageAnalyzerArgs