diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfdebcd2dc8e7a5cec4e5111eae5541a21bebfd2..a56a9c0284c478164ce633b2d152fbb6f5bd8e6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,19 @@ build:main: - $CI_PROJECT_DIR/build-cmake/doc/html/ expire_in: 1 week +build:python3: + script: + - cd /opt/dune/venv + - virtualenv dorie3 --py=/usr/bin/python3 + - source /opt/dune/venv/dorie3/bin/activate && python --version && python -m pip install virtualenv + - cd /opt/dune + - python --version + - ./dune-common/bin/dunecontrol exec "rm -rf build-cmake" + - ./dune-common/bin/dunecontrol all + - export PATH=/opt/dune/dorie/build-cmake/bin:$PATH + - ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test + stage: build + build:update_dune: script: - ./dune-common/bin/dunecontrol update || true diff --git a/bin/dorie.in b/bin/dorie.in index db19bea32b203de736a20df579d2ab4c45f84634..75a7dbe249691068eb787eb01589e4e4b811b44c 100644 --- a/bin/dorie.in +++ b/bin/dorie.in @@ -25,8 +25,8 @@ MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@" DORIE_EXECUTABLE = os.path.join(DORIEDIR, "dune/dorie/dorie") PARAMETERDIR = os.path.join(DORIEDIR, "doc/default_files") DORIE_PYTHON = os.path.join(DORIEDIR, "dune-env") -def MPIRUN(nproc,exe,*args,mpi_flags=None): - mpi_flags = [] if not mpi_flags else list(mpi_flags) +def MPIRUN(nproc,exe,*args,**kwargs): + mpi_flags = [] if not "mpi_flags" in kwargs else kwargs["mpi_flags"] return [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc)] \ + mpi_flags + [MPIEXEC_PREFLAG,str(exe), MPIEXEC_POSTFLAGS] + list(args) if k] diff --git a/python/parfield/wrapper/pf_from_file.py.in b/python/parfield/wrapper/pf_from_file.py.in index c107280046f3b3ac724969a166e9b4dee0bd753b..5a68fc50eba0c471bbeae9d6288d37462fa29804 100644 --- a/python/parfield/wrapper/pf_from_file.py.in +++ b/python/parfield/wrapper/pf_from_file.py.in @@ -23,8 +23,8 @@ MPIEXEC_POSTFLAGS = "@MPIEXEC_POSTFLAGS@" # RFG_EXEC = os.path.join(DORIEDIR, "dune/dorie-rfg/dorie-rfg") -def MPIRUN(nproc,exe,*args,mpi_flags=None): - mpi_flags = [] if not mpi_flags else list(mpi_flags) +def MPIRUN(nproc,exe,*args,**kwargs): + mpi_flags = [] if not "mpi_flags" in kwargs else kwargs["mpi_flags"] return [k for k in [MPIEXEC,MPIEXEC_NUMPROC_FLAG,str(nproc)] \ + mpi_flags + [MPIEXEC_PREFLAG,str(exe), MPIEXEC_POSTFLAGS] + list(args) if k]