Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6a9a183

Browse files
committedApr 24, 2024·
AZP: Fix CI issues
1 parent bd12572 commit 6a9a183

File tree

2 files changed

+28
-42
lines changed

2 files changed

+28
-42
lines changed
 

‎azure-pipelines.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ jobs:
4747
python.version: '3.10'
4848
Python311:
4949
python.version: '3.11'
50+
Python312:
51+
python.version: '3.12'
5052

5153
steps:
5254
- bash: echo "##vso[task.prependpath]$CONDA/bin"
@@ -61,8 +63,8 @@ jobs:
6163
- bash: |
6264
conda create --name mpi4py_fft_env \
6365
python=$PYTHON_VERSION \
64-
numpy fftw mpi4py mpich \
65-
pyfftw=0.12 scipy coverage
66+
mpi4py mpich numpy fftw \
67+
pyfftw scipy coverage
6668
source activate mpi4py_fft_env
6769
pip install -vvv --no-deps .
6870
pip install codecov

‎tests/runtests.sh

+24-40
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,31 @@
11
#!/bin/sh
22
set -e
33

4-
PY=$(python -c 'import sys; print(sys.version_info.major)')
5-
export OMPI_MCA_plm=isolated
6-
export OMPI_MCA_btl_vader_single_copy_mechanism=none
7-
export OMPI_MCA_rmaps_base_oversubscribe=yes
4+
export OMPI_MCA_plm_ssh_agent=false
5+
export OMPI_MCA_pml=ob1
6+
export OMPI_MCA_btl=tcp,self
7+
export OMPI_MCA_mpi_yield_when_idle=true
8+
export OMPI_MCA_btl_base_warn_component_unused=false
9+
export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
810

9-
if [ $PY -eq 3 ]; then
10-
# coverage only for python version 3
11+
python -m coverage erase
1112

12-
python -m coverage erase
13+
python -m coverage run -m test_fftw
14+
python -m coverage run -m test_libfft
15+
python -m coverage run -m test_io
16+
python -m coverage run -m test_darray
17+
mpiexec -n 2 python -m coverage run -m test_pencil
1318

14-
python -m coverage run -m test_fftw
15-
python -m coverage run -m test_libfft
16-
python -m coverage run -m test_io
17-
python -m coverage run -m test_darray
18-
mpiexec -n 2 python -m coverage run -m test_pencil
19+
#mpiexec -n 4 python -m coverage test_pencil.py
20+
#mpiexec -n 8 python -m coverage test_pencil.py
21+
mpiexec -n 2 python -m coverage run -m test_mpifft
22+
#mpiexec -n 4 python -m coverage test_mpifft.py
23+
# mpiexec -n 8 python -m coverage test_mpifft.py
24+
# mpiexec -n 12 python -m coverage test_mpifft.py
25+
mpiexec -n 2 python -m coverage run spectral_dns_solver.py
26+
mpiexec -n 2 python -m coverage run -m test_io
27+
#mpiexec -n 4 python -m coverage run -m test_io
28+
mpiexec -n 2 python -m coverage run -m test_darray
29+
#mpiexec -n 4 python -m coverage run -m test_darray
1930

20-
#mpiexec -n 4 python -m coverage test_pencil.py
21-
#mpiexec -n 8 python -m coverage test_pencil.py
22-
mpiexec -n 2 python -m coverage run -m test_mpifft
23-
#mpiexec -n 4 python -m coverage test_mpifft.py
24-
# mpiexec -n 8 python -m coverage test_mpifft.py
25-
# mpiexec -n 12 python -m coverage test_mpifft.py
26-
mpiexec -n 2 python -m coverage run spectral_dns_solver.py
27-
mpiexec -n 2 python -m coverage run -m test_io
28-
#mpiexec -n 4 python -m coverage run -m test_io
29-
mpiexec -n 2 python -m coverage run -m test_darray
30-
#mpiexec -n 4 python -m coverage run -m test_darray
31-
32-
python -m coverage combine
33-
34-
else
35-
python test_fftw.py
36-
python test_libfft.py
37-
mpiexec -n 2 python test_pencil.py
38-
#mpiexec -n 4 python test_pencil.py
39-
#mpiexec -n 8 python test_pencil.py
40-
mpiexec -n 2 python test_mpifft.py
41-
#mpiexec -n 4 python test_mpifft.py
42-
# mpiexec -n 8 python test_mpifft.py
43-
# mpiexec -n 12 python test_mpifft.py
44-
mpiexec -n 2 python test_io.py
45-
mpiexec -n 2 python test_darray.py
46-
mpiexec -n 2 python spectral_dns_solver.py
47-
fi
31+
python -m coverage combine

0 commit comments

Comments
 (0)
Please sign in to comment.