Commit 0ff48724 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci/fix-complexity-latest-log-for-basop-reference' into 'main' 

[CI] fix complexity latest log for basop reference

See merge request !2101
parents d881de38 b115aae8

ci/basop-pages/create_report_pages.py

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from functools import partial 


FORMATS = ["Stereo", "ISM", "Multichannel", "MASA", "SBA", "OSBA", "OMASA", "Renderer"]



CSV_DELIM = ";"

CSV_DELIM = ","

SUBPAGE_TMPL_CSS = """

<style type="text/css">

.tbase  {border-collapse:collapse;border-spacing:0;}
@@ -104,7 +104,7 @@ COLUMNS = [ 
    "Category",

    "Result",

    "MLD",

    "MAXIMUM ABS DIFF",

    "MAX_ABS_DIFF",

    "MIN_SSNR",

    "MIN_ODG",

]
@@ -158,7 +158,7 @@ def create_subpage( 


def write_out_csv(data, col_names, outfile):

    with open(outfile, "w") as f:

        writer = csv.DictWriter(f, col_names, delimiter=";")

        writer = csv.DictWriter(f, col_names, delimiter=CSV_DELIM)

        writer.writeheader()

        for row in data:

            writer.writerow(row)

ci/complexity_measurements/getWmops.sh

+4 −4
Original line number Diff line number Diff line
@@ -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}

tests/cmp_pcm.py

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ def cmp_pcm( 
            f"file 2 = {s2.shape[0]}",

            file=output_target,

        )

        reason = "FAIL: File lengths differ. MAXIMUM ABS DIFF: None"

        reason = "FAIL: File lengths differ. MAX_ABS_DIFF: None"

        if get_mld:

            reason += " - MLD: None"
@@ -119,12 +119,12 @@ def cmp_pcm( 
        if not cmp_result["bitexact"] and cmp_result["max_abs_diff"] <= abs_tol:

            reason = "SUCCESS: Maximum absolute diff below threshold"

        elif not cmp_result["bitexact"]:

            diff_msg = f"MAXIMUM ABS DIFF ==> {cmp_result['max_abs_diff']} at sample num {cmp_result['max_abs_diff_pos_sample']} (assuming {nchannels} channels)"

            diff_msg = f"MAX_ABS_DIFF ==> {cmp_result['max_abs_diff']} at sample num {cmp_result['max_abs_diff_pos_sample']} (assuming {nchannels} channels)"

            first_msg = f"First diff found at sample num {cmp_result['first_diff_pos_sample']} in channel {cmp_result['first_diff_pos_channel']}, frame {cmp_result['first_diff_pos_frame']} (assuming {nchannels} channels, {fs} sampling rate)"

            print(diff_msg, file=output_target)

            print(first_msg, file=output_target)



            reason = f"Non-BE - MAXIMUM ABS DIFF: {cmp_result['max_abs_diff']}"

            reason = f"Non-BE - MAX_ABS_DIFF: {cmp_result['max_abs_diff']}"

            output_differs = 1



        if get_mld:

tests/constants.py

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ DMX_SSNR = "DMX_SSNR" 


# regex patterns for parsing the output from comparisons -> mainly for BASOP ci

MLD_PATTERN = r"MLD: ([\d\.]*)"

MAX_DIFF_PATTERN = r"MAXIMUM ABS DIFF: (\d*)"

MAX_DIFF_PATTERN = r"MAX_ABS_DIFF: (\d*)"

ODG_PATTERN_PQEVALAUDIO = r"Objective Difference Grade: (-*\d*\.\d*)"

ODG_PATTERN = r"(?<!Delta-)ODG: (-*\d*\.\d*)"

DELTA_ODG_PATTERN = r"Delta-ODG: (-?\d*\.\d+)"