diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d24633468..15244cb24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,7 +196,7 @@ Marc: ################################################################################################### -grid_runtime: +grid_performance: stage: statistics before_script: - ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} --blocking @@ -210,22 +210,27 @@ grid_runtime: - export PATH=${PWD}/bin:${PATH} - cd $(mktemp -d) - git clone -q git@git.damask.mpie.de:damask/performance.git . + - ./measure_performance.py --input_dir ${CI_PROJECT_DIR}/examples/grid --tag ${CI_COMMIT_SHA} - > - ${CI_PROJECT_DIR}/PRIVATE/testing/runtime.py - --input_dir ${CI_PROJECT_DIR}/examples/grid - --output_dir ./ - --tag ${CI_COMMIT_SHA} - - if [ ${CI_COMMIT_BRANCH} == development ]; then git commit -am ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}; git push; fi + if [ ${CI_COMMIT_BRANCH} == development ]; then + git add performance.txt + git commit -m ${CI_PIPELINE_ID}_${CI_COMMIT_SHA} + git push + fi -commit_history: +update_plots: stage: statistics script: - cd $(mktemp -d) - - ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 100 - - ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 1000 - - ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 10000 + - git clone -q git@git.damask.mpie.de:damask/performance.git . + - ./plot_commithistory.py --color green -n 5 -N 100 + - ./plot_commithistory.py --color green -n 5 -N 1000 + - ./plot_commithistory.py --color green -n 5 -N 10000 - scp -r ./commits_*.html damask3.mpie.de:~/ - - ssh damask3.mpie.de "./update_statistics.sh" + - ssh damask3.mpie.de "./update_statistics_commits.sh" + - ./plot_performance.py --template=xgridoff + - scp -r ./runtime.html ./memory.html damask3.mpie.de:~/ + - ssh damask3.mpie.de "./update_statistics_performance.sh" only: - development diff --git a/PRIVATE b/PRIVATE index d61d62667..39853f7d8 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit d61d62667fb683a61dcc41cd90194a2d9b279879 +Subproject commit 39853f7d8fb06bb0c83aed5083212bcfd5b52a57