From 0990035d636fe198aa1f9914543994e08ce27f0b Mon Sep 17 00:00:00 2001 From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Date: Tue, 10 Feb 2026 09:47:02 +0100 Subject: [PATCH] Fix: Loop can be simplified using slices.Contains --- collectors/rocmsmiMetric.go | 16 +++------------- collectors/rocmsmiMetric.md | 6 ++++-- example-configs/collectors.json | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/collectors/rocmsmiMetric.go b/collectors/rocmsmiMetric.go index 80fe502..f27a18f 100644 --- a/collectors/rocmsmiMetric.go +++ b/collectors/rocmsmiMetric.go @@ -11,6 +11,7 @@ import ( "encoding/json" "errors" "fmt" + "slices" "time" cclog "github.com/ClusterCockpit/cc-lib/v2/ccLogger" @@ -87,22 +88,11 @@ func (m *RocmSmiCollector) Init(config json.RawMessage) error { return err } - exclDev := func(s string) bool { - skip_device := false - for _, excl := range m.config.ExcludeDevices { - if excl == s { - skip_device = true - break - } - } - return skip_device - } - m.devices = make([]RocmSmiCollectorDevice, 0) for i := 0; i < numDevs; i++ { str_i := fmt.Sprintf("%d", i) - if exclDev(str_i) { + if slices.Contains(m.config.ExcludeDevices, str_i) { continue } device, ret := rocm_smi.DeviceGetHandleByIndex(i) @@ -126,7 +116,7 @@ func (m *RocmSmiCollector) Init(config json.RawMessage) error { pciInfo.Device, pciInfo.Function) - if exclDev(pciId) { + if slices.Contains(m.config.ExcludeDevices, pciId) { continue } diff --git a/collectors/rocmsmiMetric.md b/collectors/rocmsmiMetric.md index ca440ab..0d5440e 100644 --- a/collectors/rocmsmiMetric.md +++ b/collectors/rocmsmiMetric.md @@ -15,7 +15,9 @@ hugo_path: docs/reference/cc-metric-collector/collectors/rocmsmi.md ```json "rocm_smi": { "exclude_devices": [ - "0","1", "0000000:ff:01.0" + "0", + "1", + "0000000:ff:01.0" ], "exclude_metrics": [ "rocm_mm_util", @@ -23,7 +25,7 @@ hugo_path: docs/reference/cc-metric-collector/collectors/rocmsmi.md ], "use_pci_info_as_type_id": true, "add_pci_info_tag": false, - "add_serial_meta": false, + "add_serial_meta": false } ``` diff --git a/example-configs/collectors.json b/example-configs/collectors.json index a8c1b78..cf50b8f 100644 --- a/example-configs/collectors.json +++ b/example-configs/collectors.json @@ -34,6 +34,20 @@ }, "numastats": {}, "nvidia": {}, + "rocm_smi": { + "exclude_devices": [ + "0", + "1", + "0000000:ff:01.0" + ], + "exclude_metrics": [ + "rocm_mm_util", + "rocm_temp_vrsoc" + ], + "use_pci_info_as_type_id": true, + "add_pci_info_tag": false, + "add_serial_meta": false + }, "schedstat": { }, "tempstat": {