Skip to content

Commit

Permalink
Fix Gitlab-CI (#441)
Browse files Browse the repository at this point in the history
* Added Job-Token as needed by Gitlab

* Moved schedule towards nighttime

and triggered CI again, as HPC-Systems are now back

* Schedule gitlab-ci workflow at the same time as github-workflow

* Moved installation of more packages into preparation to avoid parallel access of files

* First try to use virtual envs from python

So that installed packages are available in later CI-Jobs

* Store venv on scratch

* Activate project to use SCRATCH

* Wrong usage of variables

* Try installing mpi4py-fft for later usage
  • Loading branch information
jakob-fritz authored Jun 24, 2024
1 parent 23755d1 commit 3d001e3
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gitlab_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request_target:
types: [opened, synchronize, reopened, labeled]
schedule:
- cron: '1 5 2 * *'
- cron: '1 5 * * 1'

jobs:
check_permission:
Expand Down
31 changes: 26 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,18 @@ stages:

variables:
JUWELS_ACCOUNT: "cstma"
JUWELS_PROJECT: "ccstma"


prepare_JUWELS:
stage: benchmark
rules:
- if: $CI_COMMIT_MESSAGE !~ /.*\[CI-no-benchmarks\]/
id_tokens:
CI_JOB_JWT:
aud: https://gitlab.jsc.fz-juelich.de
SITE_ID_TOKEN:
aud: https://gitlab.jsc.fz-juelich.de
tags:
- jacamar
- juwels
Expand All @@ -29,8 +35,16 @@ prepare_JUWELS:
- module load mpi4py
- module load SciPy-Stack
- module load CuPy
- jutil env activate -p ${JUWELS_PROJECT}
- python -m venv --clear $SCRATCH/.venv/pySDC
- source $SCRATCH/.venv/pySDC/bin/activate
- pip install -e .
- pip install pytest-benchmark coverage
- git submodule add -f https://github.com/brownbaerchen/mpi4py-fft.git
- cd mpi4py-fft
- git checkout cupy_implementation
- FFTW_LIBRARY_DIR="/p/software/juwels/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64" pip install --force-reinstall .
- cd ../


test_JUWELS:
Expand All @@ -39,6 +53,11 @@ test_JUWELS:
- prepare_JUWELS
rules:
- if: $CI_COMMIT_MESSAGE !~ /.*\[CI-no-benchmarks\]/
id_tokens:
CI_JOB_JWT:
aud: https://gitlab.jsc.fz-juelich.de
SITE_ID_TOKEN:
aud: https://gitlab.jsc.fz-juelich.de
tags:
- jacamar
- juwels
Expand All @@ -63,11 +82,8 @@ test_JUWELS:
- module load mpi4py
- module load SciPy-Stack
- module load CuPy
- git submodule add -f https://github.com/brownbaerchen/mpi4py-fft.git
- cd mpi4py-fft
- git checkout cupy_implementation
- FFTW_LIBRARY_DIR="/p/software/juwels/stages/2024/software/FFTW/3.3.10-GCC-12.3.0/lib64" pip install --force-reinstall -e .
- cd ../
- jutil env activate -p ${JUWELS_PROJECT}
- source $SCRATCH/.venv/pySDC/bin/activate
script:
# - touch benchmarks/output.json
- echo $SYSTEMNAME
Expand All @@ -88,6 +104,11 @@ benchmark:
when: manual
tags:
- docker
id_tokens:
CI_JOB_JWT:
aud: https://gitlab.jsc.fz-juelich.de
SITE_ID_TOKEN:
aud: https://gitlab.jsc.fz-juelich.de
rules:
- if: $CI_COMMIT_MESSAGE !~ /.*\[CI-no-benchmarks\]/
artifacts:
Expand Down

0 comments on commit 3d001e3

Please sign in to comment.