Commit 52bfbc99 authored by Jan Kiene's avatar Jan Kiene
Browse files

specify output format as well in complexity jobs

parent 3b3de345

.gitlab-ci.yml

+19 −13
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ coverage-test-on-main-scheduled: 
  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

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

  # patch the format in the title

  - sed -i "s/<title>IVAS FORMAT/<title>IVAS $format/g" ${public_dir}/index.html

  - sed -i "s/<title>IVAS FORMAT/<title>IVAS $in_format to $out_format/g" ${public_dir}/index.html

  # do separately here to avoid overwrite complaints by mv

  - mv -f ci/complexity_measurements/style.css ${public_dir}/
@@ -973,8 +973,9 @@ measure-complexity-linux-stereo-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - format=stereo

    - bash ci/complexity_measurements/getWmops.sh $stereo

    - in_format=stereo

    - out_format=stereo

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

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-ism-test:
@@ -984,8 +985,9 @@ measure-complexity-linux-ism-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - format=ISM

    - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4"

    - in_format=ISM

    - out_format=EXT

    - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" $out_format

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-sba-test:
@@ -995,8 +997,9 @@ measure-complexity-linux-sba-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - format=SBA

    - bash ci/complexity_measurements/getWmops.sh $format

    - in_format=SBA

    - out_format=HOA3

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

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-mc-test:
@@ -1006,8 +1009,9 @@ measure-complexity-linux-mc-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - format=MC

    - bash ci/complexity_measurements/getWmops.sh $format

    - in_format=MC

    - out_format=7_1_4

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

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-masa-test:
@@ -1017,8 +1021,9 @@ measure-complexity-linux-masa-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - format=MASA

    - bash ci/complexity_measurements/getWmops.sh $format

    - in_format=MASA

    - out_format=EXT

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

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-StereoDmxEVS-test:
@@ -1028,8 +1033,9 @@ measure-complexity-linux-StereoDmxEVS-test: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - format=StereoDmxEVS

    - bash ci/complexity_measurements/getWmops.sh $format

    - in_format=StereoDmxEVS

    - out_format=mono

    - bash ci/complexity_measurements/getWmops.sh $format $out_format

    - *complexity-measurements-prepare-artifacts



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

ci/complexity_measurements/getWmops.sh

+5 −4
Original line number Diff line number Diff line
@@ -29,12 +29,13 @@ 
# the United Nations Convention on Contracts on the International Sales of Goods.



# get format from command line

if [ $# -ne 1 ]; then

  echo "Usage: $0 ivas-format"

if [ $# -ne 2 ]; then

  echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\""

  exit 1

fi



ivas_format=$1

output_format=$2



date=`date +%Y%m%d`                         # used for log-file file ending

shortDate=`date "+%b %d" | sed -e "s/\ /_/g"`    # stored in the log-file
@@ -56,8 +57,8 @@ wmopsFilenameFlc48kHzLast=wmops_newsletter_stereo_48kHz__${commit_sha}_${date} 
wmopsFilenameFlc48kHz=${destDir}/wmops/logs/${wmopsFilenameFlc48kHzLast}



# instrument and build

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

./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc48kHz} -C $ivas_format -R 48 -S 48 -U $duration -f ${ep}

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

./scripts/IvasBuildAndRunChecks.py -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc48kHz} -C $ivas_format -R 48 -S 48 -U $duration -f ${ep} --oc $output_format



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

### WMOPS