@@ -178,33 +178,33 @@ jobs:
178178 mkdir pytest
179179 cp mpi_tester.py pytest
180180
181- - name: Run single-process tests with Pytest
182- working-directory: ./pytest
183- run: |
184- export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
185- export OMP_NUM_THREADS=2
186- python -m pytest -n auto --pyargs psydac -m "not parallel and not petsc"
187-
188- - name: Run MPI tests with Pytest
189- working-directory: ./pytest
190- run: |
191- export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
192- export OMP_NUM_THREADS=2
193- python mpi_tester.py --mpirun="mpiexec -n 4 ${MPI_OPTS}" --pyargs psydac -m "parallel and not petsc"
194-
195- - name: Run single-process PETSc tests with Pytest
196- working-directory: ./pytest
197- run: |
198- export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
199- export OMP_NUM_THREADS=2
200- python -m pytest -n auto --pyargs psydac -m "not parallel and petsc"
201-
202- - name: Run MPI PETSc tests with Pytest
203- working-directory: ./pytest
204- run: |
205- export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
206- export OMP_NUM_THREADS=2
207- python mpi_tester.py --mpirun="mpiexec -n 4 ${MPI_OPTS}" --pyargs psydac -m "parallel and petsc"
181+ - name : Run single-process tests with Pytest
182+ working-directory : ./pytest
183+ run : |
184+ export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
185+ export OMP_NUM_THREADS=2
186+ python -m pytest -n auto --pyargs psydac -m "not parallel and not petsc"
187+
188+ - name : Run MPI tests with Pytest
189+ working-directory : ./pytest
190+ run : |
191+ export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
192+ export OMP_NUM_THREADS=2
193+ python mpi_tester.py --mpirun="mpiexec -n 4 ${MPI_OPTS}" --pyargs psydac -m "parallel and not petsc"
194+
195+ - name : Run single-process PETSc tests with Pytest
196+ working-directory : ./pytest
197+ run : |
198+ export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
199+ export OMP_NUM_THREADS=2
200+ python -m pytest -n auto --pyargs psydac -m "not parallel and petsc"
201+
202+ - name : Run MPI PETSc tests with Pytest
203+ working-directory : ./pytest
204+ run : |
205+ export PSYDAC_MESH_DIR=$GITHUB_WORKSPACE/mesh
206+ export OMP_NUM_THREADS=2
207+ python mpi_tester.py --mpirun="mpiexec -n 4 ${MPI_OPTS}" --pyargs psydac -m "parallel and petsc"
208208 - name : Set up environment variables
209209 run : |
210210 echo "PSYDAC_DIR=$GITHUB_WORKSPACE" >> $GITHUB_ENV
@@ -215,21 +215,22 @@ jobs:
215215 # TODO: Use the struphy devel branch here when it's ready
216216 git clone --branch struphy-with-psydac-devel https://gitlab.mpcdf.mpg.de/struphy/struphy.git $STRUPHY_DIR
217217
218- - name : Install struphy without dependencies
218+ - name : Install struphy
219219 working-directory : ${{ env.STRUPHY_DIR }}
220220 run : |
221221 python -m pip install .
222222 pip show psydac
223223
224224 - name : Re-install Psydac from the current branch
225225 run : |
226- python -m pip install -e ${{ env.PSYDAC_DIR }} --force-reinstall
226+ python -m pip install ${{ env.PSYDAC_DIR }} --force-reinstall
227227 pip show psydac
228228
229229 - name : Compile struphy
230230 working-directory : ${{ env.STRUPHY_DIR }}
231231 run : |
232232 pip show psydac
233+ struphy -h
233234 struphy compile -y
234235
235236 - name : Run struphy tests
0 commit comments