Commit 1fe55494 authored by Jan Kiene's avatar Jan Kiene
Browse files

make necessary changes for merging to main 

- remove duration limitation from getWmops.sh
- setup complexity jobs to run in scheduled pipeline as for sanitizers
parent a721f7df

.gitlab-ci.yml

+50 −28
Original line number Diff line number Diff line
@@ -964,22 +964,24 @@ coverage-test-on-main-scheduled: 
  # do separately here to avoid overwrite complaints by mv

  - mv -f ci/complexity_measurements/style.css ${public_dir}/



.measure-complexity-template:

.complexity-template:

  extends:

    # still needed as long as no long MASA testvectors are there

    - .test-job-linux-needs-testv-dir

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

  tags:

    - test-nokia-linux-runner

    - test-complexity-measurement

  timeout: 3 hours

  stage: test

  artifacts:

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

    paths:

      - $CI_JOB_NAME-public



measure-complexity-linux-stereo-test:

complexity-stereo-in-stereo-out:

  extends:

    - .measure-complexity-template

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -989,9 +991,13 @@ measure-complexity-linux-stereo-test: 
    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-ism-test:

complexity-ism-in-binaural-out:

  extends:

    - .measure-complexity-template

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 1 hour

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1001,9 +1007,13 @@ measure-complexity-linux-ism-test: 
    - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-sba-test:

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

  extends:

    - .measure-complexity-template

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 3 hours

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1013,9 +1023,13 @@ measure-complexity-linux-sba-test: 
    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-mc-test:

complexity-mc-in-7_1_4-out:

  extends:

    - .measure-complexity-template

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 6 hours

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1025,9 +1039,13 @@ measure-complexity-linux-mc-test: 
    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-masa-test:

complexity-masa-in-7_1_4-out:

  extends:

    - .measure-complexity-template

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 9 hours

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1037,9 +1055,13 @@ measure-complexity-linux-masa-test: 
    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"

    - *complexity-measurements-prepare-artifacts



measure-complexity-linux-StereoDmxEVS-test:

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

  extends:

    - .measure-complexity-template

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 10 hours

  script:

    - *print-common-info

    - *update-ltv-repo
@@ -1068,38 +1090,38 @@ pages: 


    - mkdir public

    # get artifacts for complexity jobs

    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch measure-complexity-linux-stereo-test)

    - 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"

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_stereo.zip

    - cat artifacts_comp_stereo.zip

    - unzip -o artifacts_comp_stereo.zip

    - mv measure-complexity-linux-stereo-test-public ./public/

    - mv complexity-stereo-in-stereo-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch measure-complexity-linux-ism-test)

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

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_ism.zip

    - unzip -o artifacts_comp_ism.zip

    - mv measure-complexity-linux-ism-test-public ./public/

    - mv complexity-ism-in-binaural-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch measure-complexity-linux-sba-test)

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

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_sba.zip

    - unzip -o artifacts_comp_sba.zip

    - mv measure-complexity-linux-sba-test-public ./public/

    - mv complexity-sba-hoa3-in-hoa3-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch measure-complexity-linux-mc-test)

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

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_mc.zip

    - unzip -o artifacts_comp_mc.zip

    - mv measure-complexity-linux-mc-test-public ./public/

    - mv complexity-mc-in-7_1_4-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch measure-complexity-linux-masa-test)

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

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_masa.zip

    - unzip -o artifacts_comp_masa.zip

    - mv measure-complexity-linux-masa-test-public ./public/

    - mv complexity-masa-in-7_1_4-out-public ./public/



    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch measure-complexity-linux-StereoDmxEVS-test)

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

    - curl --request GET "$API_URL_BASE/$job_id/artifacts" --output artifacts_comp_StereoDmxEVS.zip

    - unzip -o artifacts_comp_StereoDmxEVS.zip

    - mv measure-complexity-linux-StereoDmxEVS-test-public ./public/

    - mv complexity-StereoDmxEVS-stereo-in-mono-out-public ./public/



    - cp ci/index-pages.html public/index.html

  artifacts:

ci/complexity_measurements/getWmops.sh

+2 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ commit_sha=`git rev-parse --short HEAD` 
destDir="."

scriptDir="ci/complexity_measurements"

ep="${scriptDir}/ep_10pct_fer.g192"

duration="2"



config_file="scripts/config/ci_linux_ltv.json"
@@ -57,8 +56,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} --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

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

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



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

### WMOPS