Clean up catalogmesh tests.

Author: rainwoodman

nbodykit/base/tests/test_catalogmesh.py

@@ -9,63 +9,11 @@
 setup_logging("debug")
 
 
-@MPITest([1, 4])
-def test_gslice(comm):
-    CurrentMPIComm.set(comm)
-
-    # the catalog to slice
-    d = UniformCatalog(1000, 1.0, seed=42)
-    d = d.to_mesh(Nmesh=32)
-
-    sels = [(0,10,1), (None,10,1), (0,50,4), (0,50,-1), (-10,-1,1), (-10,None,1)]
-    for (start,stop,end) in sels:
-
-        sliced = d.gslice(start,stop,end)
-
-        for col in d:
-            data1 = numpy.concatenate(comm.allgather(d[col]), axis=0)
-            data2 = numpy.concatenate(comm.allgather(sliced[col]), axis=0)
-
-            sl = slice(start,stop,end)
-            assert_array_equal(data1[sl], data2, err_msg="using slice= "+str(sl))
-
-    # empty slice
-    sliced = d.gslice(0,0)
-    assert len(sliced) == 0
-
-@MPITest([1, 4])
-def test_sort_ascending(comm):
-    CurrentMPIComm.set(comm)
-
-    # the mesh to sort
-    d = UniformCatalog(100, 1.0)
-    d['mass'] = 10**(d.rng.uniform(low=12, high=15, size=d.size))
-    mesh = d.to_mesh(Nmesh=32)
-
-    # invalid sort key
-    with pytest.raises(ValueError):
-        mesh2 = mesh.sort('BadColumn', reverse=False)
-
-    # duplicate sort keys
-    with pytest.raises(ValueError):
-        mesh2 = mesh.sort(['mass', 'mass'])
-
-    # sort in ascending order by mass
-    mesh2 = mesh.sort('mass', reverse=False)
-
-    # make sure we have all the columns
-    assert all(col in mesh2 for col in mesh)
-
-    mass = numpy.concatenate(comm.allgather(mesh['mass']))
-    sorted_mass = numpy.concatenate(comm.allgather(mesh2['mass']))
-    assert_array_equal(numpy.sort(mass), sorted_mass)
-
-
 @MPITest([4])
 def test_tsc_interlacing(comm):
 
     CurrentMPIComm.set(comm)
-    source = UniformCatalog(nbar=3e-2, BoxSize=512., seed=42)
+    source = UniformCatalog(nbar=3e-4, BoxSize=512., seed=42)
 
     # interlacing with TSC
     mesh = source.to_mesh(window='tsc', Nmesh=64, interlaced=True, compensated=True)
@@ -78,7 +26,7 @@ def test_tsc_interlacing(comm):
 def test_paint_chunksize(comm):
 
     CurrentMPIComm.set(comm)
-    source = UniformCatalog(nbar=3e-2, BoxSize=512., seed=42)
+    source = UniformCatalog(nbar=3e-4, BoxSize=512., seed=42)
 
     # interlacing with TSC
     mesh = source.to_mesh(window='tsc', Nmesh=64, interlaced=True, compensated=True)
@@ -95,7 +43,7 @@ def test_paint_chunksize(comm):
 def test_cic_interlacing(comm):
 
     CurrentMPIComm.set(comm)
-    source = UniformCatalog(nbar=3e-2, BoxSize=512., seed=42)
+    source = UniformCatalog(nbar=3e-4, BoxSize=512., seed=42)
 
     # interlacing with TSC
     mesh = source.to_mesh(window='cic', Nmesh=64, interlaced=True, compensated=True)
@@ -108,7 +56,7 @@ def test_cic_interlacing(comm):
 def test_setters(comm):
 
     CurrentMPIComm.set(comm)
-    source = UniformCatalog(nbar=3e-2, BoxSize=512., seed=42)
+    source = UniformCatalog(nbar=3e-4, BoxSize=512., seed=42)
 
     # make the mesh
     mesh = source.to_mesh(window='cic', Nmesh=64, interlaced=True, compensated=True)
@@ -129,7 +77,7 @@ def test_setters(comm):
 def test_bad_window(comm):
 
     CurrentMPIComm.set(comm)
-    source = UniformCatalog(nbar=3e-2, BoxSize=512., seed=42)
+    source = UniformCatalog(nbar=3e-4, BoxSize=512., seed=42)
 
     # make the mesh
     mesh = source.to_mesh(window='cic', Nmesh=64, interlaced=True, compensated=True)
@@ -142,7 +90,7 @@ def test_bad_window(comm):
 def test_no_compensation(comm):
 
     CurrentMPIComm.set(comm)
-    source = UniformCatalog(nbar=3e-2, BoxSize=512., seed=42)
+    source = UniformCatalog(nbar=3e-4, BoxSize=512., seed=42)
 
     # make the mesh
     mesh = source.to_mesh(window='cic', Nmesh=64, interlaced=True, compensated=True)
@@ -154,26 +102,6 @@ def test_no_compensation(comm):
     with pytest.raises(ValueError):
         actions = mesh.actions
 
-@MPITest([4])
-def test_slice(comm):
-    CurrentMPIComm.set(comm)
-
-    # the CatalogSource
-    source = UniformCatalog(nbar=0.2e-3, BoxSize=1024., seed=42)
-    source['TEST'] = 10.
-
-    # the mesh
-    source = source.to_mesh(Nmesh=32)
-
-    # slice a subset
-    subset = source[:10]
-    assert all(col in subset for col in source.columns)
-    assert isinstance(subset, source.__class__)
-    assert len(subset) == 10
-    assert_array_equal(subset['Position'], source['Position'].compute()[:10])
-
-    subset = source[[0,1,2]]
-    assert_array_equal(subset['Position'], source['Position'].compute()[[0,1,2]])
 
 @MPITest([4])
 def test_view(comm):
@@ -190,17 +118,13 @@ def test_view(comm):
     # view
     view = mesh.view()
     assert view.base is mesh
-    assert isinstance(view, mesh.__class__)
+    from nbodykit.base.mesh import MeshSource
+    assert isinstance(view, MeshSource)
 
     # check meta-data
     for k in mesh.attrs:
         assert k in view.attrs
 
-    # adding columns to the view changes original source
-    view['TEST2'] = 5.0
-    assert 'TEST2' in source
-class CodeReached(BaseException): pass
-
 @MPITest([1, 4])
 def test_apply_nocompensation(comm):
     CurrentMPIComm.set(comm)