Commit 89b46f25 authored by Jan Kiene's avatar Jan Kiene
Browse files

restore some of the DUT_..CODEC_PATH -> IVAS_... changes

parent 569a3382

main-basop.yml

+6 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ workflow: 


    ### run pytest

    - exit_code=0

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml $comp_args -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path IVAS_cod --dut_decoder_path IVAS_dec || exit_code=$?

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml $comp_args -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true



    ### create histograms
@@ -677,6 +677,8 @@ workflow: 
    - if [[ $CLANG_NUM = 1 ]]; then

    -   testcase_timeout_arg=""

    - fi



    # NOTE: here we do not use the "DUT_..CODER_PATH" variables because we do not build via a script, but directly from the make file (which is done because of the "make_args" - no way to inject that into build-binaries.sh)

    - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml $testcase_timeout_arg --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec

  artifacts:

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
@@ -714,8 +716,7 @@ workflow: 
    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh

    - fi

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref

    - make clean

    - make -j

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh dut



    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")

    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"
@@ -723,7 +724,7 @@ workflow: 
    ### run pytest

    - exit_code=0

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-ref.html --self-contained-html --junit-xml=report-junit-ref.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $REF_ENCODER_PATH --dut_decoder_path $REF_DECODER_PATH  --compare_to_input || exit_code=$?

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path IVAS_cod --dut_decoder_path IVAS_dec --compare_to_input || exit_code=$?

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report-dut.html --self-contained-html --junit-xml=report-junit-dut.xml $comp_args -n auto --testcase_timeout $testcase_timeout --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH --compare_to_input || exit_code=$?

    - zero_errors_ref=$(cat report-junit-ref.xml | grep -c 'errors="0"') || true

    - zero_errors_dut=$(cat report-junit-dut.xml | grep -c 'errors="0"') || true

    - python3 scripts/parse_xml_report.py report-junit-ref.xml report-ref.csv
@@ -2325,6 +2326,7 @@ check-be-between-renderer-framesizes: 
    - python3 ci/remove_unsupported_testcases.py $PRM_FILES



    - exit_code=0

    # NOTE: here we do not use the "DUT_..CODER_PATH" variables because we do not build via a script, but directly from the make file (which is done because of the "make_args" - no way to inject that into build-binaries.sh)

    - python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path ./IVAS_dec --update_ref 1 --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml || exit_code=$?



    - exit_code5=0

snippets/basop/build-and-create-float-ref-outputs.sh

+2 −3
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ cd "${CI_PROJECT_DIR}" 


bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref



make clean

make -j

bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh dut



### prepare pytest

# create short test vectors
@@ -26,4 +25,4 @@ if [ "$COMPARE_DMX" = "true" ]; then 
  enc_dmx_arg="--compare_enc_dmx"

fi



python3 -m pytest $TEST_SUITE -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path IVAS_cod --dut_decoder_path IVAS_dec || exit_code=$?
 
python3 -m pytest $TEST_SUITE -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?