Commit f51dfa90 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge remote-tracking branch 'origin/main' into add-pytest-html-report-on-be-comparison-tests

parents 318c9e5b 3b889ac8

.gitlab-ci.yml

+14 −14
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ external-renderer-pytest-on-merge-request: 
    - *print-common-info



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend(erer)*[ -]*non[ -]*be\]") || true

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]") || true

    # TODO: needs splitting the test between reference and cut generation

    #- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true
@@ -957,9 +957,6 @@ coverage-test-on-main-scheduled: 
  - echo $log_files

  - ls wmops/logs

  - for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done

  - log_files_48=$(cat $public_dir/graphs_wmops_flc_48kHz.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")

  - echo $log_files_48

  - for f in $log_files_48; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done

  # copy index page blueprint

  - cp ci/complexity_measurements/index_complexity.html ${public_dir}/index.html

  # patch the format in the title
@@ -973,7 +970,7 @@ coverage-test-on-main-scheduled: 
    - .test-job-linux-needs-testv-dir

  tags:

    - test-complexity-measurement

  timeout: 7 hours

  timeout: 3 hours 30 minutes

  stage: test

  artifacts:

    name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
@@ -1000,7 +997,7 @@ complexity-ism-in-binaural-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 2 hours

      start_in: 1 hour

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1016,7 +1013,7 @@ complexity-sba-hoa3-in-hoa3-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 5 hours

      start_in: 2 hours 30 minutes

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1032,7 +1029,7 @@ complexity-mc-in-7_1_4-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 8 hours

      start_in: 4 hours

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1048,7 +1045,7 @@ complexity-masa-in-7_1_4-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 15 hours

      start_in: 7 hours 30 minutes

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1064,7 +1061,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 17 hours

      start_in: 8 hours 30 minutes

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1078,13 +1075,15 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
# Other jobs

# ---------------------------------------------------------------



# job that sets up gitlab pages website

# is run on a separate schedule and collects artifacts from other jobs (currently

# only the complexity measurements) multiple times a day

pages:

  stage: deploy

  tags:

    - test-complexity-measurement

    - ivas-linux

  rules:

    # only run for pipelines that affect the data for the page

    - if: $MEASURE_COMPLEXITY_LINUX

    - if: $UPDATE_PAGES

    # TODO: add coverage job

  script:
@@ -1092,7 +1091,8 @@ pages: 
    - branch=$CI_COMMIT_REF_NAME



    - mkdir public

    # get artifacts for complexity jobs



    ### fetch artifacts from latest run of complexity jobs

    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

Workspace_msvc/lib_dec.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -314,10 +314,10 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_stereo_td_low_rate_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_svd_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_td_decorr.c" />

    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_vbap.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4sb.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −9
Original line number Diff line number Diff line
@@ -466,9 +466,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_stereo_td_low_rate_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -476,15 +473,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_agc_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_spar_foa_md_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_td_decorr.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_spar_foa_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_pca_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -506,6 +497,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_enc.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -330,8 +330,8 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_td_low_rate_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c" />

    <ClCompile Include="..\lib_enc\lead_indexing.c" />

    <ClCompile Include="..\lib_enc\lib_enc.c" />

    <ClCompile Include="..\lib_enc\long_enr.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -550,9 +550,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_stereo_td_low_rate_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>
@@ -584,6 +581,9 @@ 
    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h">