more robust storage of runtime measurements

This commit is contained in:
Martin Diehl 2021-11-12 19:48:53 +01:00
parent e8d2281bb5
commit 579f3ba5d3
2 changed files with 17 additions and 28 deletions

View File

@ -7,7 +7,6 @@ stages:
- fortran - fortran
- performance - performance
- deploy - deploy
- backup
- update_master - update_master
- distclean - distclean
- clean - clean
@ -127,7 +126,7 @@ compile_grid_GNU:
script: script:
- module load $GNUCompiler $MPI_GNU $PETSc_GNU - module load $GNUCompiler $MPI_GNU $PETSc_GNU
- cd pytest - cd pytest
- COLUMNS=256 pytest -k 'compile and grid' --basetemp=${TESTROOT}/compile_grid_GNU - COLUMNS=256 pytest -k 'compile and grid' --basetemp ${TESTROOT}/compile_grid_GNU
except: except:
- master - master
- release - release
@ -137,7 +136,7 @@ compile_mesh_GNU:
script: script:
- module load $GNUCompiler $MPI_GNU $PETSc_GNU - module load $GNUCompiler $MPI_GNU $PETSc_GNU
- cd pytest - cd pytest
- COLUMNS=256 pytest -k 'compile and mesh' --basetemp=${TESTROOT}/compile_mesh_GNU - COLUMNS=256 pytest -k 'compile and mesh' --basetemp ${TESTROOT}/compile_mesh_GNU
except: except:
- master - master
- release - release
@ -147,7 +146,7 @@ compile_Marc:
script: script:
- module load $IntelMarc $HDF5Marc $MSC - module load $IntelMarc $HDF5Marc $MSC
- cd pytest - cd pytest
- COLUMNS=256 pytest -k 'compile and Marc' --basetemp=${TESTROOT}/compile_Marc - COLUMNS=256 pytest -k 'compile and Marc' --basetemp ${TESTROOT}/compile_Marc
except: except:
- master - master
- release - release
@ -158,8 +157,7 @@ setup_grid:
stage: setup stage: setup
script: script:
- module load $IntelCompiler $MPI_Intel $PETSc_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- BUILD_DIR=$(mktemp -d) - cd $(mktemp -d)
- cd ${BUILD_DIR}
- cmake -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT} - cmake -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT}
- make -j2 all install - make -j2 all install
except: except:
@ -170,8 +168,7 @@ setup_mesh:
stage: setup stage: setup
script: script:
- module load $IntelCompiler $MPI_Intel $PETSc_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- BUILD_DIR=$(mktemp -d) - cd $(mktemp -d)
- cd ${BUILD_DIR}
- cmake -DDAMASK_SOLVER=MESH -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT} - cmake -DDAMASK_SOLVER=MESH -DCMAKE_INSTALL_PREFIX=${DAMASKROOT} ${DAMASKROOT}
- make -j2 all install - make -j2 all install
except: except:
@ -184,7 +181,7 @@ core:
script: script:
- module load $IntelCompiler $MPI_Intel $PETSc_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- cd pytest - cd pytest
- COLUMNS=256 pytest -k 'not compile' --basetemp=${TESTROOT}/fortran -v - COLUMNS=256 pytest -k 'not compile' --basetemp ${TESTROOT}/fortran -v
except: except:
- master - master
- release - release
@ -198,16 +195,18 @@ core:
# - release # - release
################################################################################################### ###################################################################################################
SpectralRuntime: grid_runtime:
stage: performance stage: performance
script: script:
- module load $IntelCompiler $MPI_Intel $PETSc_Intel - module load $IntelCompiler $MPI_Intel $PETSc_Intel
- cd $DAMASKROOT - cd $DAMASKROOT
- make clean grid OPTIMIZATION=AGGRESSIVE - make clean grid OPTIMIZATION=AGGRESSIVE
- cd $LOCAL_HOME/performance # location of old results - REPO_DIR=$(mktemp -d)
- git checkout . # undo any changes (i.e. run time data from non-development branch) - git clone -q git@git.damask.mpie.de:damask/performance.git ${REPO_DIR}
- cd $DAMASKROOT/PRIVATE/testing - cd ${DAMASKROOT}/PRIVATE/testing/
- ./runtime.py --results ${LOCAL_HOME}/performance --damask_root ${DAMASKROOT} --tag ${CI_COMMIT_SHA} - ./runtime.py --input_dir $DAMASKROOT/examples/grid --output_dir ${REPO_DIR} --tag ${CI_COMMIT_SHA}
- if [ ${CI_COMMIT_BRANCH} == development ]; then git commit -am ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}; git push; fi
resource_group: runtime
except: except:
- master - master
- release - release
@ -217,28 +216,18 @@ source_distribution:
stage: deploy stage: deploy
script: script:
- cd $(mktemp -d) - cd $(mktemp -d)
- $DAMASKROOT/PRIVATE/releasing/tar.xz/create.sh $DAMASKROOT $CI_COMMIT_SHA - ${DAMASKROOT}/PRIVATE/releasing/tar.xz/create.sh ${DAMASKROOT} ${CI_COMMIT_SHA}
except: except:
- master - master
- release - release
##################################################################################################
backup_runtime_measurement:
stage: backup
script:
- cd $LOCAL_HOME/performance # location of new runtime results
- git commit -am"${CI_PIPELINE_ID}_${CI_COMMIT_SHA}"
- git push
only:
- development
################################################################################################## ##################################################################################################
merge_into_master: merge_into_master:
stage: update_master stage: update_master
script: script:
- cd $DAMASKROOT - cd ${DAMASKROOT}
- export TESTEDREV=$(git describe) # might be detached from development branch - export TESTEDREV=$(git describe) # might be detached from development branch
- echo $TESTEDREV > python/damask/VERSION - echo ${TESTEDREV} > python/damask/VERSION
- git add python/damask/VERSION - git add python/damask/VERSION
- > - >
git diff-index --quiet HEAD || git diff-index --quiet HEAD ||

@ -1 +1 @@
Subproject commit 532cfadc1fda4f0f7f6a993e2bd029f14a50668f Subproject commit f2a1c70879a892fa3b139e14a2eef199bcde5abf