Commit 20b46b55 authored by Jan Kiene's avatar Jan Kiene
Browse files

add new complexity jobs and increase width of plots

parent 461b000d

.gitlab-ci.yml

+108 −32
Original line number Diff line number Diff line
@@ -2270,9 +2270,13 @@ coverage-test-on-main-scheduled: 
    # still needed as long as no long MASA testvectors are there

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

  tags:

    - test-complexity-measurement

    - ivas-linux-fast

  timeout: 3 hours 30 minutes

  stage: test

  before_script:

    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

  artifacts:

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

    when: always
@@ -2280,23 +2284,20 @@ coverage-test-on-main-scheduled: 
    paths:

      - $CI_JOB_NAME-public



complexity-stereo-in-stereo-out:

complexity-stereo-in-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

  script:

    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - in_format=stereo

    - out_format=stereo

    - out_format=ext

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-ism-in-binaural-out:

complexity-ism-in-binaural_room_ir-out:

  extends:

    - .complexity-template

  rules:
@@ -2304,35 +2305,44 @@ complexity-ism-in-binaural-out: 
      when: delayed

      start_in: 1 hour

  script:

    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - in_format=ISM

    - out_format=BINAURAL

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

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

complexity-ism-in-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 2 hours 30 minutes

      start_in: 2 hour

  script:

    - in_format=ISM

    - out_format=EXT

    - ret_val=0

    - 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-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 3 hours

  script:

    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - in_format=HOA3

    - out_format=HOA3

    - out_format=EXT

    - ret_val=0

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

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

  extends:

    - .complexity-template

  rules:
@@ -2340,29 +2350,98 @@ complexity-mc-in-7_1_4-out: 
      when: delayed

      start_in: 4 hours

  script:

    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - in_format=HOA3

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-mc-in-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 5 hours

  script:

    - in_format=MC

    - out_format=7_1_4

    - out_format=EXT

    - ret_val=0

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

complexity-mc-in-binaural_room_ir-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 7 hours 30 minutes

      start_in: 6 hours

  script:

    - in_format=MC

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-masa-in-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 7 hours

  script:

    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - in_format=MASA

    - out_format=7_1_4

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-masa-in-binaural-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 8 hours

  script:

    - in_format=MASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-omasa-in-ext-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 9 hours

  script:

    - in_format=OMASA

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val



complexity-omasa-in-binaural-out:

  extends:

    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 10 hours

  script:

    - in_format=OMASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - *complexity-measurements-prepare-artifacts
@@ -2374,11 +2453,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 8 hours 30 minutes

      start_in: 11 hours

  script:

    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

    - in_format=StereoDmxEVS

    - out_format=mono

    - ret_val=0

ci/complexity_measurements/getWmops.sh

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ if [ $# -ne 2 ]; then 
fi



ivas_format=$1

output_format=$2

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

ci/complexity_measurements/style.css

+13 −13
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ hr { 
}

.graph-container {

 margin: 0 auto;

 width:800px;

 width: 1600px;

}

.message-box {  

  margin-top: 2em;
@@ -48,62 +48,62 @@ hr { 
}

#wmops-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#wmops_per_op-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#wmops-48kHz-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#wmops_per_op-48kHz-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#wmops_basop_per_op-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#wmops-graph-basop {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#conversion_factors_basop_flc {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#ram-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#ram-graph-basop {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#rom-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#rom-graph-basop{

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#prom-graph {

 height:500px;

 width:800px;

 width:1600px;

 float:left;

}

#tooltip {

ci/setup_pages.py

+15 −1
Original line number Diff line number Diff line
@@ -13,13 +13,27 @@ PROJECT_ID_BASOP_REPO = 77 




JOBS_FLOAT_REPO = [

    # old ones no longer running -> replaced by "ext" jobs, remove after some time

    "complexity-stereo-in-stereo-out",

    "complexity-ism-in-binaural-out",

    "complexity-sba-hoa3-in-hoa3-out",

    "complexity-mc-in-7_1_4-out",

    "complexity-masa-in-7_1_4-out",

    "complexity-StereoDmxEVS-stereo-in-mono-out",

    "coverage-test-on-main-scheduled",

    # current ones

    "complexity-stereo-in-ext-out",

    "complexity-ism-in-binaural_room_ir-out",

    "complexity-ism-in-ext-out",

    "complexity-sba-hoa3-in-ext-out",

    "complexity-sba-hoa3-in-binaural_room_ir-out",

    "complexity-mc-in-ext-out",

    "complexity-mc-in-binaural_room_ir-out",

    "complexity-masa-in-ext-out",

    "complexity-masa-in-binaural-out",

    "complexity-omasa-in-ext-out",

    "complexity-omasa-in-binaural-out",

    # "timeless" jobs (survivors from the old jobs)

    "complexity-StereoDmxEVS-stereo-in-mono-out",

]

JOBS_BASOP_REPO = [

    "ivas-pytest-mld-long-dec",