From 39f17d7ec7ad14b2af880b977354f862f970b0a8 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Apr 2025 13:55:29 +0200 Subject: [PATCH 1/3] create the latest_WMOPS.csv from the whole file, not from split ones --- ci/complexity_measurements/getWmops.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/complexity_measurements/getWmops.sh b/ci/complexity_measurements/getWmops.sh index 8087cae67b..a2ef0c8379 100755 --- a/ci/complexity_measurements/getWmops.sh +++ b/ci/complexity_measurements/getWmops.sh @@ -83,6 +83,10 @@ fi ./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format ret_val_script=$? +# for runs on ivas-float-update: creat copy of WMOPS csv file with static name so that it is easier to grab from the artifacts +latest_wmops="${wmopsFilenameFlcDir}/latest_WMOPS.csv" +cp ${wmopsFilenameFlc}_WMOPS.csv ${latest_wmops} + # TODO: only split wmops and ram files ./ci/complexity_measurements/split_by_levels.py $(ls ${wmopsFilenameFlc}*.csv) @@ -93,7 +97,6 @@ for suffix in "${split_suffixes[@]}"; do wmopsFilenameFlc_split="${wmopsFilenameFlc}_WMOPS${suffix}.csv" wmopsFilenameFlcLast_split="${wmopsFilenameFlcLast}_WMOPS${suffix}.csv" log_wmops_all_split="${destDir}/wmops/log_wmops_all${suffix}.txt" - latest_wmops_split="${wmopsFilenameFlcDir}/latest_WMOPS${suffix}.csv" heapFilenameFlc_split="${wmopsFilenameFlc}_HEAP${suffix}.csv" stackFilenameFlc_split="${wmopsFilenameFlc}_STACK${suffix}.csv" @@ -105,9 +108,6 @@ for suffix in "${split_suffixes[@]}"; do ### WMOPS ${scriptDir}/parseNewsletterWmops.py ${wmopsFilenameFlc_split} ${wmopsFilenameFlcLast_split} ${commit_sha} ${shortDate} ${fullDate} >>${log_wmops_all_split} - # create copy of WMOPS csv file with special name to easily get it from artifacts when comparing BASOP to float numbers - cp ${wmopsFilenameFlc_split} ${latest_wmops_split} - # get memory info for webpage ### RAM ${scriptDir}/mergeNewsletterRam.py ${heapFilenameFlc_split} ${stackFilenameFlc_split} >${ramFilenameFlc_split} -- GitLab From c7a36b9c8b744d0457c2f3d7796296b6e901e0b1 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Thu, 24 Apr 2025 15:10:47 +0200 Subject: [PATCH 2/3] fix csv delimiter in create_report_pages.py --- ci/basop-pages/create_report_pages.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/basop-pages/create_report_pages.py b/ci/basop-pages/create_report_pages.py index 41ee81af1b..6c50b001a6 100644 --- a/ci/basop-pages/create_report_pages.py +++ b/ci/basop-pages/create_report_pages.py @@ -5,7 +5,7 @@ from functools import partial FORMATS = ["Stereo", "ISM", "Multichannel", "MASA", "SBA", "OSBA", "OMASA", "Renderer"] -CSV_DELIM = ";" +CSV_DELIM = "," SUBPAGE_TMPL_CSS = """