Commit 30c0f378 authored by norvell's avatar norvell
Browse files

Merge branch 'main-pc-update' into 'main-pc' 

[Non-BE][Renderer Non-BE][allow regression] Merge main into main-pc

See merge request !1064
parents e2f388a3 ffb8ed0c

.gitlab-ci.yml

+142 −84
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ variables: 
  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"

  TESTCASE_TIMEOUT_STV: 900

  TESTCASE_TIMEOUT_LTV: 2400

  TESTCASE_TIMEOUT_STV_SANITIZERS: 1800

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 6000

  CI_REGRESSION_THRESH_MLD: "0.1"

  CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"

  CI_REGRESSION_THRESH_SSNR: "-1"
@@ -33,6 +33,7 @@ variables: 
  TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection"

  BUILD_WITH_DEBUG_MODE_INFO: ""

  ENCODER_TEST: ""

  SKIP_REGRESSION_CHECK: ""

  MANUAL_PIPELINE_TYPE:

    description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."

    value: 'default'
@@ -295,17 +296,6 @@ stages: 
    - if: $CI_PIPELINE_SOURCE == 'schedule'

      when: never



# TODO: only temporary as long the MR encoder tests should not compare to main

.rules-pytest-to-ref-enc-short-temp:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

    - if: $CI_PIPELINE_SOURCE == 'schedule'

      when: never



.rules-pytest-to-main-short:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main
@@ -521,6 +511,7 @@ stages: 
    IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"

    SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"

  script:

    - set -euxo pipefail

    - *print-common-info

    - *update-scripts-repo

    - if [ $USE_LTV -eq 1 ]; then
@@ -568,7 +559,10 @@ stages: 
    - diff_sba=0

    - diff_param=0

    - diff_report=0

    # SHORT_TEST_SUITE_ENCODER does not contain test_sba.py. This leads to non-existing output folders being compared and to diff_sba=1. Therefore, this is skipped for the encoder tests

    - if [ "$TEST_SUITE" != "$SHORT_TEST_SUITE_ENCODER" ]; then

    -     python3 scripts/batch_comp_audio.py --tool pyaudio3dtools -sd tests/dut/sba_bs/raw tests/dut_branch/sba_bs/raw || diff_sba=$?

    - fi

    - python3 scripts/batch_comp_audio.py --tool pyaudio3dtools -sd tests/dut/param_file/dec tests/dut_branch/param_file/dec || diff_param=$?

    - diff $CSV_BRANCH $CSV_MAIN || diff_report=$?

    - if [ $diff_param -eq 0 ] && [ $diff_sba -eq 0 ] && [ $diff_report -eq 0 ] && [ $zero_errors_branch -eq 1 ]; then
@@ -584,11 +578,11 @@ stages: 


    ### compare the two csv files for regressions

    - regressions_found=0

    - python3 scripts/basop_check_for_changes_in_testcases.py $CSV_BRANCH $CSV_MAIN || regressions_found=$?

    - python3 scripts/basop_check_for_changes_in_testcases.py --xml_report $XML_REPORT_BRANCH $CSV_MAIN $CSV_BRANCH || regressions_found=$?



    - if [ $exit_code -eq 1 ]; then echo "Differences encountered"; exit_code=$EXIT_CODE_NON_BE; fi

    - if [ $zero_errors_branch != 1 ]; then echo "Run errors encountered!"; exit_code=$EXIT_CODE_NON_BE; fi

    - if [ $regressions_found != 0 ]; then

    - if [ $regressions_found != 0 ] && [ "$SKIP_REGRESSION_CHECK" != "true" ]; then

    -    if [ $allow_regressions_flag == 0 ]; then

    -        echo "Detected regression wrt to main, [allow regression] not set!"

    -        exit_code=$EXIT_CODE_FAIL;
@@ -643,12 +637,13 @@ stages: 
  script:

    - *print-common-info

    - *update-scripts-repo

    - *copy-ltv-files-to-testv-dir

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *build-reference-and-dut-binaries

    - make clean

    - make -j CLANG=$CLANG_NUM

    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi

    - testcase_timeout=$TESTCASE_TIMEOUT_STV_SANITIZERS

    - testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS

    - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH

  artifacts:

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
@@ -966,39 +961,41 @@ build-codec-linux-debugging-make: 
# ---------------------------------------------------------------



### jobs that test fx encoder -> flt decoder

# TODO: reenable once encoder tests shall compare to main

# ivas-pytest-compare_to_main-short-enc:

#   extends:

#     - .rules-pytest-to-main-short

#     - .test-job-linux

#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

#     - LEVEL_SCALING=1.0

#   <<: *ivas-pytest-on-merge-request-anchor



# ivas-pytest-compare_to_main-short-enc-lev-10:

#   extends:

#     - .rules-pytest-to-main-short

#     - .test-job-linux

#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

#     - LEVEL_SCALING=0.3162

#   <<: *ivas-pytest-on-merge-request-anchor



# ivas-pytest-compare_to_main-short-enc-lev+10:

#   extends:

#     - .rules-pytest-to-main-short

#     - .test-job-linux

#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

#     - LEVEL_SCALING=3.162

#   <<: *ivas-pytest-on-merge-request-anchor

ivas-pytest-compare_to_main-short-enc:

  extends:

    - .rules-pytest-to-main-short

    - .test-job-linux

  before_script:

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

    - SKIP_REGRESSION_CHECK="true"

  <<: *ivas-pytest-on-merge-request-anchor



ivas-pytest-compare_to_main-short-enc-lev-10:

  extends:

    - .rules-pytest-to-main-short

    - .test-job-linux

  before_script:

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=0.3162

    - SKIP_REGRESSION_CHECK="true"

  <<: *ivas-pytest-on-merge-request-anchor



ivas-pytest-compare_to_main-short-enc-lev+10:

  extends:

    - .rules-pytest-to-main-short

    - .test-job-linux

  before_script:

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=3.162

    - SKIP_REGRESSION_CHECK="true"

  <<: *ivas-pytest-on-merge-request-anchor



### jobs that test flt encoder -> fx decoder

ivas-pytest-compare_to_main-short-dec:
@@ -1084,6 +1081,8 @@ ivas-pytest-compare_to_ref-short-enc-lev+10: 
ivas-pytest-enc-msan:

  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

  before_script:

    - CLANG_NUM=1

    - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1093,6 +1092,8 @@ ivas-pytest-enc-msan: 
ivas-pytest-enc-asan:

  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

  before_script:

    - CLANG_NUM=2

    - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1102,6 +1103,8 @@ ivas-pytest-enc-asan: 
ivas-pytest-enc-usan:

  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

  before_script:

    - CLANG_NUM=3

    - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1168,24 +1171,30 @@ ivas-pytest-compare-to-input-short-enc: 
ivas-pytest-dec-msan:

  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

  before_script:

    - CLANG_NUM=1

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-asan:

  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

  before_script:

    - CLANG_NUM=2

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-usan:

  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

  before_script:

    - CLANG_NUM=3

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1511,6 +1520,21 @@ renderer-pytest-on-merge-request: 


    - *merge-request-comparison-check



  allow_failure:

    exit_codes:

      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml

      - report.html

    expose_as: "pytest renderer results"

    reports:

      junit:

        - report-junit.xml



# compare bit exactness between target and source branch

ivas-pytest-on-merge-request:

  extends:
@@ -1584,6 +1608,9 @@ ivas-pytest-on-merge-request: 


  - job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID)

  - echo $job_id

  # this is a testing/maintenance mechanism to force getting the log history from a specific job id

  # see below in the concrete complexity jobs

  - if [ "$JOB_ID_INJECT" != "" ]; then job_id=$JOB_ID_INJECT; fi

  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip

  - unzip artifacts.zip || true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html

  - ls
@@ -1594,21 +1621,13 @@ ivas-pytest-on-merge-request: 
  - rm artifacts.zip

  - rm -rf $public_dir



  ### 1.5.part: get the corresponding measurement from ivas-float-update-cmplx

  - job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update-cmplx $CI_JOB_NAME $CI_PROJECT_ID)

  ### 1.5.part: get the corresponding measurement from ivas-float-update

  - job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update $CI_JOB_NAME $CI_PROJECT_ID)

  - echo $job_id

  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip

  - unzip -j artifacts_ref.zip "*latest_WMOPS.csv"



  ### 2. part: setup specific for BASOP repo

  # hack for using the reference encoder -> need to build manually to make script use ref enc and BASOP dec

  - mkdir COMPLEXITY

  - cp IVAS_cod_ref COMPLEXITY/IVAS_cod

  # build branch code aain with instrumentation

  - make clean

  - bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY

  - make -j -C $INSTR_DIR

  - cp $INSTR_DIR/IVAS_dec COMPLEXITY/IVAS_dec

  - unzip -j artifacts_ref.zip "*latest_WMOPS.csv" || true

  # add file to arguments only if the artifact could be retrieved to prevent error later.

  - if [ -f latest_WMOPS.csv ]; then GET_WMOPS_ARGS="$GET_WMOPS_ARGS latest_WMOPS.csv"; fi



.complexity-measurements-prepare-artifacts:

  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
@@ -1636,6 +1655,7 @@ ivas-pytest-on-merge-request: 
  stage: test

  variables:

    ret_val: 0

    GET_WMOPS_ARGS: "mem_only basop"

  timeout: 3 hours 30 minutes

  before_script:

    - *print-common-info
@@ -1656,10 +1676,12 @@ complexity-stereo-in-stereo-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=stereo

    - out_format=stereo

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1670,11 +1692,13 @@ complexity-ism-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 1 hour

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=ISM

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1685,11 +1709,13 @@ complexity-ism-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 2 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=ISM

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1700,11 +1726,13 @@ complexity-ism-in-ext-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 3 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=ISM

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1715,11 +1743,13 @@ complexity-sba-hoa3-in-hoa3-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 4 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=HOA3

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1730,11 +1760,13 @@ complexity-sba-hoa3-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 5 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=HOA3

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1745,11 +1777,13 @@ complexity-sba-hoa3-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 6 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=HOA3

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1760,11 +1794,13 @@ complexity-mc-in-7_1_4-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 7 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MC

    - out_format=7_1_4

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1775,11 +1811,13 @@ complexity-mc-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 10 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MC

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1790,11 +1828,13 @@ complexity-mc-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 12 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MC

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1805,11 +1845,13 @@ complexity-masa-in-ext-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 15 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MASA

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1820,11 +1862,13 @@ complexity-masa-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 16 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1835,11 +1879,13 @@ complexity-masa-in-hoa3-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 17 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1850,11 +1896,13 @@ complexity-masa-in-hoa3-out: 
#     - if: $MEASURE_COMPLEXITY_LINUX

#       when: delayed

#       start_in: 13 hours

  # variables:

  #   JOB_ID_INJECT: ""

#   script:

#     - in_format=OMASA

#     - out_format=EXT

#     - ret_val=0

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1865,11 +1913,13 @@ complexity-omasa-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 18 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OMASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1880,11 +1930,13 @@ complexity-omasa-in-hoa3-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 20 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OMASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1895,11 +1947,13 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 22 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=StereoDmxEVS

    - out_format=mono

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1914,7 +1968,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
#     - in_format=OSBA

#     - out_format=EXT

#     - ret_val=0

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1925,11 +1979,13 @@ complexity-osba-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 22 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OSBA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1940,11 +1996,13 @@ complexity-osba-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 25 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OSBA

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" $GET_WMOPS_ARGS || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val

.gitlab/issue_templates/float-update-porting.md

0 → 100644
+8 −0
Original line number Diff line number Diff line 
# Basic Info



<!--- Remember to add issue and MR links to the status page in wiki here https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/wikis/IVAS-PC-MR-conversion-status -->

- Original merge request in float repo:

- Branch for float ref update:

- Branch for BASOP update:



/label ~Type:FloatUpdatePorting ~Status::ToDo

.gitlab/merge_request_templates/float-update-porting.md

0 → 100644
+6 −0
Original line number Diff line number Diff line 


- Link to issue in BASOP repo:

- Link to original issue in float repo:

- Requested reviewers:



/label Type:FloatUpdatePorting

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ 
    <ClInclude Include="..\lib_com\ivas_error.h" />

    <ClInclude Include="..\lib_com\ivas_error_utils.h" />

    <ClInclude Include="..\lib_com\ivas_prot.h" />

    <ClInclude Include="..\lib_com\ivas_prot_fx.h" />

    <ClInclude Include="..\lib_com\ivas_rom_com.h" />

    <ClInclude Include="..\lib_com\ivas_stat_com.h" />

    <ClInclude Include="..\lib_com\move.h" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -501,6 +501,9 @@ 
      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\options_warnings.h" />

    <ClInclude Include="..\lib_com\ivas_prot_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">