From 125e384b56b8870e2ab75383b71df640d33c7c67 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 28 Jun 2024 08:15:26 +0200 Subject: [PATCH 1/2] avoid failing whole job when getWmops returns something != 0 --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13df7886bc..202bff4607 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2289,8 +2289,8 @@ complexity-stereo-in-stereo-out: - *complexity-measurements-setup - in_format=stereo - out_format=stereo - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" - - ret_val=$? + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val @@ -2307,8 +2307,8 @@ complexity-ism-in-binaural-out: - *complexity-measurements-setup - in_format=ISM - out_format=BINAURAL - - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" - - ret_val=$? + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val @@ -2325,8 +2325,8 @@ complexity-sba-hoa3-in-hoa3-out: - *complexity-measurements-setup - in_format=HOA3 - out_format=HOA3 - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" - - ret_val=$? + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val @@ -2343,8 +2343,8 @@ complexity-mc-in-7_1_4-out: - *complexity-measurements-setup - in_format=MC - out_format=7_1_4 - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" - - ret_val=$? + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val @@ -2361,8 +2361,8 @@ complexity-masa-in-7_1_4-out: - *complexity-measurements-setup - in_format=MASA - out_format=7_1_4 - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" - - ret_val=$? + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val @@ -2379,8 +2379,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out: - *complexity-measurements-setup - in_format=StereoDmxEVS - out_format=mono - - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" - - ret_val=$? + - ret_val=0 + - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$? - *complexity-measurements-prepare-artifacts - exit $ret_val -- GitLab From b92356422bd3783ccfbae5b5e5aed5e10ab326f3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 28 Jun 2024 08:27:44 +0200 Subject: [PATCH 2/2] add printout to check_for_changes.py --- ci/complexity_measurements/check_for_changes.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/complexity_measurements/check_for_changes.py b/ci/complexity_measurements/check_for_changes.py index f43396260f..a6839ee59a 100644 --- a/ci/complexity_measurements/check_for_changes.py +++ b/ci/complexity_measurements/check_for_changes.py @@ -1,7 +1,6 @@ import argparse import csv import sys -import numpy as np THRESH = 0.01 @@ -32,6 +31,10 @@ def check_linewise_logfile(filepath, cols): change_ratios = [abs(float(curr[i]) / float(prev[i]) - 1) > THRESH for i in cols] changes_found = any(change_ratios) + if changes_found: + print("Previous log line:", prev) + print("Current log line:", curr) + return changes_found -- GitLab