Migrate current callers to level-indexed refinement API
This commit is contained in:
@@ -61,7 +61,7 @@ def census(run, index, buffer):
|
||||
layout, b = level.layout, level.boundary
|
||||
g = download(buffer, layout.blocked_shape)
|
||||
dense = layout.to_dense(g)
|
||||
leaf = run._leaf[index]
|
||||
leaf = run.leaf[index]
|
||||
ny, nx = leaf.shape
|
||||
solid = (b.host.flags.reshape(ny, nx) & SOLID) != 0
|
||||
y, x = np.nonzero(leaf)
|
||||
@@ -119,7 +119,7 @@ class RawExchangeGPU(unittest.TestCase):
|
||||
measured._stream.synchronize()
|
||||
after = measured._levels[1].layout.to_dense(
|
||||
download(dst, measured._levels[1].layout.blocked_shape))
|
||||
change = totals(after, measured._leaf[1])-before
|
||||
change = totals(after, measured.leaf[1])-before
|
||||
expected = external + np.array([-raw[:, 0].astype(float).sum(),
|
||||
-raw[:, 1].astype(float).sum(),
|
||||
raw[:, 3].astype(float).sum()])
|
||||
@@ -127,8 +127,8 @@ class RawExchangeGPU(unittest.TestCase):
|
||||
samples.append(raw.copy())
|
||||
measured._levels[1].kernel = audited_step
|
||||
for speed in (0., .002, -.001, 0.):
|
||||
measured.set_jet_amplitude(0, speed)
|
||||
plain.set_jet_amplitude(0, speed)
|
||||
measured.set_jet_amplitude(0, speed, level=1)
|
||||
plain.set_jet_amplitude(0, speed, level=1)
|
||||
samples.clear()
|
||||
measured.step()
|
||||
plain.step()
|
||||
@@ -139,11 +139,11 @@ class RawExchangeGPU(unittest.TestCase):
|
||||
np.testing.assert_array_equal(integral, expected)
|
||||
last = download(b.last_raw, (count, 4))
|
||||
np.testing.assert_array_equal(last, samples[-1])
|
||||
obs = measured.read_raw_exchange(0)
|
||||
obs = measured.read_raw_exchange(0, level=1)
|
||||
assert obs['sample_count'] == 2
|
||||
assert b.tables['aperture'].any()
|
||||
measured.step(0)
|
||||
np.testing.assert_array_equal(measured.read_raw_exchange(0)['total']['impulse'],
|
||||
np.testing.assert_array_equal(measured.read_raw_exchange(0, level=1)['total']['impulse'],
|
||||
obs['total']['impulse'])
|
||||
|
||||
def test_depth_four_interval_storage_and_sampling(self):
|
||||
@@ -171,7 +171,7 @@ class RawExchangeGPU(unittest.TestCase):
|
||||
run._stream.synchronize()
|
||||
after = run._levels[3].layout.to_dense(
|
||||
download(dst, run._levels[3].layout.blocked_shape))
|
||||
change = totals(after, run._leaf[3])-before
|
||||
change = totals(after, run.leaf[3])-before
|
||||
expected = external + np.array([-independent[:, 0].sum(),
|
||||
-independent[:, 1].sum(), independent[:, 3].sum()])
|
||||
np.testing.assert_allclose(change, expected, rtol=2e-4, atol=8e-5)
|
||||
@@ -234,7 +234,7 @@ class RawExchangeGPU(unittest.TestCase):
|
||||
samples.append(download(raw, (count, 4)))
|
||||
root.kernel = measured_boundary
|
||||
for speed in (0., .002, -.001, 0.):
|
||||
amr.set_jet_amplitude(0, speed)
|
||||
amr.set_jet_amplitude(0, speed, level=1)
|
||||
cuda.memcpy_htod(velocity, b.tables['surface_velocity'])
|
||||
samples.clear()
|
||||
amr.step(); uniform.step(2)
|
||||
|
||||
Reference in New Issue
Block a user