Commit 7c50e35f authored by Theo Steininger's avatar Theo Steininger

Applied some fixes to accomplish mpi tests.

parent 0ccd2278
Pipeline #14843 passed with stages
in 12 minutes and 12 seconds
...@@ -300,6 +300,9 @@ class PowerIndices(object): ...@@ -300,6 +300,9 @@ class PowerIndices(object):
(temp_uniqued_pindex, local_temp_pundex) = np.unique( (temp_uniqued_pindex, local_temp_pundex) = np.unique(
local_pindex, local_pindex,
return_index=True) return_index=True)
# cure a bug in numpy
# https://github.com/numpy/numpy/issues/9405
local_temp_pundex = np.asarray(local_temp_pundex, dtype=np.int)
# Shift the local pundices by the nodes' local_dim_offset # Shift the local pundices by the nodes' local_dim_offset
local_temp_pundex += global_pindex.distributor.local_dim_offset local_temp_pundex += global_pindex.distributor.local_dim_offset
......
...@@ -146,7 +146,8 @@ class PowerSpaceConsistencyCheck(unittest.TestCase): ...@@ -146,7 +146,8 @@ class PowerSpaceConsistencyCheck(unittest.TestCase):
distribution_strategy=distribution_strategy, distribution_strategy=distribution_strategy,
logarithmic=logarithmic, nbin=nbin, logarithmic=logarithmic, nbin=nbin,
binbounds=binbounds) binbounds=binbounds)
assert_equal(p.pindex.flatten()[p.pundex], np.arange(p.dim), assert_equal(p.pindex.flatten().get_full_data()[p.pundex],
np.arange(p.dim),
err_msg='pundex is not right-inverse of pindex!') err_msg='pundex is not right-inverse of pindex!')
@expand(CONSISTENCY_CONFIGS) @expand(CONSISTENCY_CONFIGS)
...@@ -155,7 +156,6 @@ class PowerSpaceConsistencyCheck(unittest.TestCase): ...@@ -155,7 +156,6 @@ class PowerSpaceConsistencyCheck(unittest.TestCase):
logarithmic): logarithmic):
if distribution_strategy == "fftw": if distribution_strategy == "fftw":
if not hasattr(gdi.get('fftw'), 'FFTW_MPI'): if not hasattr(gdi.get('fftw'), 'FFTW_MPI'):
print (gdi.get('fftw'), "blub \n\n\n")
raise SkipTest raise SkipTest
p = PowerSpace(harmonic_partner=harmonic_partner, p = PowerSpace(harmonic_partner=harmonic_partner,
distribution_strategy=distribution_strategy, distribution_strategy=distribution_strategy,
......
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