Commit 735e589b authored by Martin Reinecke's avatar Martin Reinecke

Merge remote-tracking branch 'origin/NIFTy_5' into cleanup

parents 1cbaf2d0 8af5299c
......@@ -36,8 +36,10 @@ build_docker_from_cache:
test_python2_with_coverage:
stage: test
variables:
OMPI_MCA_btl_vader_single_copy_mechanism: none
script:
- mpiexec -n 2 --bind-to none pytest -q test 2> /dev/null
- mpiexec -n 2 --bind-to none pytest -q test
- pytest -q --cov=nifty5 test
- >
python -m coverage report --omit "*plotting*,*distributed_do*"
......@@ -46,9 +48,11 @@ test_python2_with_coverage:
test_python3:
stage: test
variables:
OMPI_MCA_btl_vader_single_copy_mechanism: none
script:
- pytest-3 -q
- mpiexec -n 2 --bind-to none pytest-3 -q 2> /dev/null
- mpiexec -n 2 --bind-to none pytest-3 -q
pages:
stage: release
......
......@@ -55,6 +55,7 @@ class DomainTupleFieldInserter(LinearOperator):
def apply(self, x, mode):
self._check_input(x, mode)
# FIXME Make fully MPI compatible without global_data
if mode == self.TIMES:
res = np.zeros(self.target.shape, dtype=x.dtype)
res[self._slc] = x.to_global_data()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment