From f689964a493fe2b548be97c6dcea5cb0710095a3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 7 Feb 2025 11:48:19 +0100 Subject: [PATCH 1/6] fix res output id > 9 --- lib_debug/debug.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib_debug/debug.c b/lib_debug/debug.c index 5e65379903..8aadaba041 100644 --- a/lib_debug/debug.c +++ b/lib_debug/debug.c @@ -39,6 +39,7 @@ #include "options.h" #ifdef DEBUGGING #include "debug.h" +#include #ifdef DEBUG_MODE_INFO #ifdef DEBUG_MODE_INFO_TWEAK #include @@ -771,8 +772,10 @@ char *fname( const int16_t id, const int16_t enc_dec ) { - char idd[5] = ".idX"; - idd[3] = (char) ( id + '0' ); + char idd[6]; + + assert( id < 100 ); + sprintf( idd, ".id%d", id ); strcpy( tmp_fname, dir ); strcat( tmp_fname, file ); -- GitLab From bca4076e443aef64fcb8b3e7207f0fceface6929 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 10 Feb 2025 10:44:09 +0100 Subject: [PATCH 2/6] do not use bash strict mode for getWmops.sh could be fixed also by using "|| retval=$?" on the IvasBuildAndRunChecks call, but better stay save to not loose complexity graphs --- ci/complexity_measurements/getWmops.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/complexity_measurements/getWmops.sh b/ci/complexity_measurements/getWmops.sh index 3f49630530..750c2c299b 100755 --- a/ci/complexity_measurements/getWmops.sh +++ b/ci/complexity_measurements/getWmops.sh @@ -28,8 +28,6 @@ # accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and # the United Nations Convention on Contracts on the International Sales of Goods. -set -euxo pipefail - function usage { echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)|mem_only}\" \"repo{float(default)|basop}\" [wmops_ref_logfile]" exit 1 -- GitLab From dd44231f984330610880278ee56f3499b2c15006 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 10 Feb 2025 13:46:45 +0100 Subject: [PATCH 3/6] skip rate switching cases with compare_enc_dmx --- tests/codec_be_on_mr_nonselection/test_param_file.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/codec_be_on_mr_nonselection/test_param_file.py b/tests/codec_be_on_mr_nonselection/test_param_file.py index e760edd470..e4928584cf 100644 --- a/tests/codec_be_on_mr_nonselection/test_param_file.py +++ b/tests/codec_be_on_mr_nonselection/test_param_file.py @@ -60,9 +60,6 @@ from tests.constants import ( MAX_ENC_STATS_DIFF, SCRIPTS_DIR, MAX_ENC_DIFF, - DMX_DIFF, - DMX_MLD, - DMX_SSNR, ) from tests.renderer.utils import check_and_makedir, binauralize_input_and_output @@ -316,8 +313,12 @@ def run_test( bitrate = enc_split.pop() in_sr = sampling_rate - # bitrate can be a filename: remove leading "../" - if bitrate.startswith("../"): + # bitrate can be a filename: change it to an absolute path + if not bitrate.isdigit(): + if compare_enc_dmx: + pytest.skip( + "Rate switching + --compare_enc_dmx currently skipped due to DEBUGGING code limitations with varying number of transport channels" + ) bitrate = Path(bitrate[3:]).absolute() testv_base = testv_file.split("/")[-1] -- GitLab From f06d238c077bcbaeabbe541813129146e1dbfb24 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 10 Feb 2025 14:28:04 +0100 Subject: [PATCH 4/6] add new job that tests BASOP ref compatibility with --compare_enc_dmx --- .gitlab-ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f27836fc82..efaf5c7b1b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ variables: TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400 BASOP_REFERENCE_BRANCH: "ivas-float-update" SCALE_FACTOR: "3.162" + PYTEST_ARGS: "" default: @@ -473,7 +474,7 @@ branch-is-up-to-date-with-main-post: - *get-basop-float-reference - - python3 -m pytest tests/codec_be_on_mr_nonselection --param_file $PARAM_FILE --update_ref 1 --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml || true + - python3 -m pytest tests/codec_be_on_mr_nonselection $PYTEST_ARGS --param_file $PARAM_FILE --update_ref 1 --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml || true - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - if [ $zero_errors != 1 ]; then echo "Run errors encountered with $PARAM_FILE !"; exit $EXIT_CODE_FAIL; fi @@ -522,6 +523,16 @@ check-compatibility-with-basop-reference-branch-encoder-ltv: script: - exit 0 +check-compatibility-with-basop-reference-branch-encoder-dmx-comparison: + extends: + - .basop-ci-branch-compat-template + variables: + PARAM_FILE: scripts/config/self_test_basop_encoder.prm + # USING PYTEST_ADDOPTS env var did not work for some reason when testing locally - maybe because this is a custom option + PYTEST_ARGS: "--compare_dmx_enc" + script: + - exit 0 + # --------------------------------------------------------------- # Build jobs # --------------------------------------------------------------- -- GitLab From 3bdb33b5b59743eefcb90b2244d30075974666ec Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 10 Feb 2025 14:29:52 +0100 Subject: [PATCH 5/6] shorten names for convenience in web pipeline view --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efaf5c7b1b..3f0283ba1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -491,7 +491,7 @@ branch-is-up-to-date-with-main-post: junit: - report-junit.xml -check-compatibility-with-basop-reference-branch-stv: +basop-ref-compat-stv: extends: - .basop-ci-branch-compat-template variables: @@ -499,7 +499,7 @@ check-compatibility-with-basop-reference-branch-stv: script: - exit 0 -check-compatibility-with-basop-reference-branch-ltv: +basop-ref-compat-ltv: extends: - .basop-ci-branch-compat-template variables: @@ -507,7 +507,7 @@ check-compatibility-with-basop-reference-branch-ltv: script: - exit 0 -check-compatibility-with-basop-reference-branch-encoder-stv: +basop-ref-compat-encoder-stv: extends: - .basop-ci-branch-compat-template variables: @@ -515,7 +515,7 @@ check-compatibility-with-basop-reference-branch-encoder-stv: script: - exit 0 -check-compatibility-with-basop-reference-branch-encoder-ltv: +basop-ref-compat-encoder-ltv: extends: - .basop-ci-branch-compat-template variables: @@ -523,7 +523,7 @@ check-compatibility-with-basop-reference-branch-encoder-ltv: script: - exit 0 -check-compatibility-with-basop-reference-branch-encoder-dmx-comparison: +basop-ref-compat-encoder-dmx-comp: extends: - .basop-ci-branch-compat-template variables: -- GitLab From 4751b1ee7c1bd6aa7bda9e8ed32f7a1968a9743d Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Mon, 10 Feb 2025 14:47:15 +0100 Subject: [PATCH 6/6] correct pytest argument --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f0283ba1e..36b589383f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -529,7 +529,7 @@ basop-ref-compat-encoder-dmx-comp: variables: PARAM_FILE: scripts/config/self_test_basop_encoder.prm # USING PYTEST_ADDOPTS env var did not work for some reason when testing locally - maybe because this is a custom option - PYTEST_ARGS: "--compare_dmx_enc" + PYTEST_ARGS: "--compare_enc_dmx" script: - exit 0 -- GitLab