Merge branch 'master' into log_normal

.gitlab-ci.yml

@@ -47,7 +47,9 @@ test_mpi_fftw_hdf5:
     - ci/install_pyfftw.sh
     - ci/install_h5py.sh
     - python setup.py build_ext --inplace
-    - nosetests -vv --with-coverage --cover-package=nifty --cover-branches
+    - mpiexec --allow-run-as-root -n 2 nosetests -x
+    - mpiexec --allow-run-as-root -n 4 nosetests -x
+    - nosetests -x --with-coverage --cover-package=nifty --cover-branches
     - >
       coverage report | grep TOTAL | awk '{ print "TOTAL: "$6; }'
 

test/test_operators/test_fft_operator.py

@@ -63,7 +63,7 @@ class FFTOperatorTests(unittest.TestCase):
         assert_equal(res[zc1 * (dim1 // 2), zc2 * (dim2 // 2)], 0.)
 
     @expand(product(["numpy", "fftw", "fftw_mpi"],
-                    [12, ], [False, True], [False, True],
+                    [16, ], [False, True], [False, True],
                     [0.1, 1, 3.7],
                     [np.float64, np.complex128, np.float32, np.complex64]))
     def test_fft1D(self, module, dim1, zc1, zc2, d, itp):