Commit 609d381f authored by Jan Kiene's avatar Jan Kiene
Browse files

fix splitting handling until check_for_changes.py 

- separate js files are being created now
- check for changes still to be adapted
parent 75885481

ci/complexity_measurements/genWebpageData.py

+4 −4
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ FILE_DATA = { 
        "var_name": "Graphs_WMOPS",

        "elem_name": "wmops_worstcase",

        "description": "Worst Case WMOPS",

        "filename": "graphs_wmops_flc{}.js",

        "filename": "graphs_wmops_flc_{}.js",

        "references": {

            "3xEVS": REF_WMOPS_3EVS,

            "6xEVS": REF_WMOPS_6EVS,
@@ -215,7 +215,7 @@ FILE_DATA = { 
        "var_name": "Graphs_ROM",

        "elem_name": "rom_worstcase",

        "description": "ROM",

        "filename": "graphs_rom_flc{}.js",

        "filename": "graphs_rom_flc_{}.js",

        "references": {

            "requirementRom": 0,

        },
@@ -224,7 +224,7 @@ FILE_DATA = { 
        "var_name": "Graphs_RAM",

        "elem_name": "ram_worstcase",

        "description": "Worst Case RAM",

        "filename": "graphs_ram_flc{}.js",

        "filename": "graphs_ram_flc_{}.js",

        "references": {

            "requirementRam": 0,

        },
@@ -233,7 +233,7 @@ FILE_DATA = { 
        "var_name": "Graphs_WMOPS_perOP",

        "elem_name": "wmops_worstcase_per_op",

        "description": "Worst Case WMOPS per OP",

        "filename": "graphs_wmops_flc_perOP{}.js",

        "filename": "graphs_wmops_flc_perOP_{}.js",

        "references": {},

    },

}

ci/complexity_measurements/getWmops.sh

+4 −3
Original line number Diff line number Diff line
@@ -96,11 +96,12 @@ fi 
./scripts/IvasBuildAndRunChecks.py $mode_arg_script $repo_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format

ret_val=$?



./ci/complexity_measurements/split_by_levels.py "${wmopsFilenameFlc}*.csv"

./ci/complexity_measurements/split_by_levels.py $(ls ${wmopsFilenameFlc}*.csv)



split_suffixes=("rate_sw", "level_1", "level_2", "level_3")

split_suffixes=("rate_sw" "level_1" "level_2" "level_3")



for suffix in $split_suffixes; do

for suffix in "${split_suffixes[@]}"; do

  echo "$suffix"



  wmopsFilenameFlc_split="${wmopsFilenameFlc}_WMOPS_${suffix}.csv"

  wmopsFilenameFlcLast_split="${wmopsFilenameFlcLast}_WMOPS_${suffix}.csv"

ci/complexity_measurements/split_by_levels.py

+6 −5
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ import argparse 
import pathlib



LEVELS_2_MAX_BR = {

    "level_1": (0, 80),

    "level_2": (96, 192),

    "level_3": (256, 512),

    "_level_1": (0, 80),

    "_level_2": (96, 192),

    "_level_3": (256, 512),

}
@@ -54,6 +54,7 @@ def main(csv_files: list): 
        )



        df_cbr = df[np.logical_not(mask_vbr)]

        columns = df_cbr.columns

        df_cbr["bitrate"] = df_cbr["conf"].str.extract(r"@(.*) kbps").astype("float")



        for lvl_suffix, (min_br, max_br) in LEVELS_2_MAX_BR.items():
@@ -61,8 +62,8 @@ def main(csv_files: list): 
                df_cbr["bitrate"] >= min_br, df_cbr["bitrate"] <= max_br

            )

            df_lvl = df_cbr[mask_lvl]

            filename_lvl = str(csv_file.with_suffix("")) + suffix + csv_file.suffix

            df_lvl.to_csv(

            filename_lvl = str(csv_file.with_suffix("")) + lvl_suffix + csv_file.suffix

            df_lvl[columns].to_csv(

                filename_lvl,

                index=False,

                sep=";",