Commit a0b07b7c authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... 

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into merging-ivas_split_bin_rendering_contributions_21_and_35_add_lc3plus
parents f0f5b5b9 adda5dd5

.gitlab-ci.yml

+16 −3
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ build-codec-sanitizers-linux: 
build-codec-windows-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-main-push

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null
@@ -299,7 +299,7 @@ build-codec-windows-cmake: 
build-codec-windows-msbuild:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-main-push

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null
@@ -753,7 +753,7 @@ lc3plus-ensure-no-code-changes: 
# ---------------------------------------------------------------



# check bitexactness to EVS windows binaries

.be-2-evs-windows: # Temporarily disabled -- Ericsson Windows runner used for HL activities which the reduces capacity for this job. To be resumed after selection

be-2-evs-windows:

  extends:

    - .rules-main-push

  tags:
@@ -1209,6 +1209,7 @@ coverage-test-on-main-scheduled: 
  stage: test

  artifacts:

    name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"

    when: always

    expire_in: 1 week

    paths:

      - $CI_JOB_NAME-public
@@ -1225,7 +1226,9 @@ complexity-stereo-in-stereo-out: 
    - in_format=stereo

    - out_format=stereo

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-ism-in-binaural-out:

  extends:
@@ -1241,7 +1244,9 @@ complexity-ism-in-binaural-out: 
    - in_format=ISM

    - out_format=BINAURAL

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"

    - ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-sba-hoa3-in-hoa3-out:

  extends:
@@ -1257,7 +1262,9 @@ complexity-sba-hoa3-in-hoa3-out: 
    - in_format=SBA

    - out_format=HOA3

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-mc-in-7_1_4-out:

  extends:
@@ -1273,7 +1280,9 @@ complexity-mc-in-7_1_4-out: 
    - in_format=MC

    - out_format=7_1_4

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-masa-in-7_1_4-out:

  extends:
@@ -1289,7 +1298,9 @@ complexity-masa-in-7_1_4-out: 
    - in_format=MASA

    - out_format=7_1_4

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-StereoDmxEVS-stereo-in-mono-out:

  extends:
@@ -1305,7 +1316,9 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
    - in_format=StereoDmxEVS

    - out_format=mono

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



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

# Other jobs

ci/complexity_measurements/getWmops.sh

+4 −1
Original line number Diff line number Diff line
@@ -53,8 +53,11 @@ config_file="scripts/config/ci_linux_ltv.json" 
wmopsFilenameFlcLast=wmops_newsletter_stereo__${commit_sha}_${date}

wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}



ret_val=0



# instrument and build

./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format -f ${ep} --oc $output_format

ret_val=$?



# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode

### WMOPS
@@ -83,4 +86,4 @@ ${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameF 
# generate java script from database

tcsh ${scriptDir}/genWebpageData_Rom.csh ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/graphs_rom_flc.js Graphs_ROM



exit $ret_val
 
 No newline at end of file