Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy

test/test_nifty_mpi_data.py

@@ -1806,9 +1806,9 @@ class Test_axis(unittest.TestCase):
                            'min', 'amin', 'nanmin', 'argmin', 'max', 'amax',
                            'nanmax', 'argmax'],
                           all_datatypes[1:],
-                          [(4, 2, 3)],
+                          [(3, 2, 3)],
                           all_distribution_strategies,
-                          [(0, 1)]),#, (1, 2), (0, 1, 2)]),
+                          [(0, 1), (1, 2), (0, 1, 2)]),
         testcase_func_name=custom_name_func)
     def test_axis_with_operations_many_dimentions(self, function, dtype,
                                                   global_shape,

test/test_nifty_spaces.py

@@ -1356,7 +1356,7 @@ print generate_space('rg_space')
 
 class Test_axis(unittest.TestCase):
     @parameterized.expand(
-        itertools.product(point_like_spaces, [8, 4],
+        itertools.product(point_like_spaces, [4],
                           ['sum', 'prod', 'mean', 'var', 'std', 'median', 'all',
                            'any', 'amin', 'nanmin', 'argmin', 'amax', 'nanmax',
                            'argmax'],