From 704cf84484c64c7414f9cd2e42459c48ed6ca31b Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Mon, 8 Aug 2016 22:25:19 -0500
Subject: [PATCH] Switch ranlux RNG for philox RNG
---
boxtree/tools.py | 4 ++--
test/test_fmm.py | 8 ++++----
test/test_traversal.py | 4 ++--
test/test_tree.py | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/boxtree/tools.py b/boxtree/tools.py
index 505fed0..ae623cb 100644
--- a/boxtree/tools.py
+++ b/boxtree/tools.py
@@ -91,8 +91,8 @@ def reverse_index_array(indices, target_size=None, result_fill_value=None,
# {{{ particle distribution generators
def make_normal_particle_array(queue, nparticles, dims, dtype, seed=15):
- from pyopencl.clrandom import RanluxGenerator
- rng = RanluxGenerator(queue, seed=seed)
+ from pyopencl.clrandom import PhiloxGenerator
+ rng = PhiloxGenerator(queue.context, seed=seed)
return make_obj_array([
rng.normal(queue, nparticles, dtype=dtype)
diff --git a/test/test_fmm.py b/test/test_fmm.py
index 22e1328..af4ce37 100644
--- a/test/test_fmm.py
+++ b/test/test_fmm.py
@@ -276,8 +276,8 @@ def test_fmm_completeness(ctx_getter, dims, nsources_req, ntargets_req,
pytest.skip("loo.py not available, but needed for particle array "
"generation")
- from pyopencl.clrandom import RanluxGenerator
- rng = RanluxGenerator(queue, seed=13)
+ from pyopencl.clrandom import PhiloxGenerator
+ rng = PhiloxGenerator(queue.context, seed=12)
if sources_have_extent:
source_radii = 2**rng.uniform(queue, nsources, dtype=dtype,
a=-10, b=0)
@@ -472,8 +472,8 @@ def test_pyfmmlib_fmm(ctx_getter):
trav = trav.get(queue=queue)
- from pyopencl.clrandom import RanluxGenerator
- rng = RanluxGenerator(queue, seed=20)
+ from pyopencl.clrandom import PhiloxGenerator
+ rng = PhiloxGenerator(queue.context, seed=20)
weights = rng.uniform(queue, nsources, dtype=np.float64).get()
#weights = np.ones(nsources)
diff --git a/test/test_traversal.py b/test/test_traversal.py
index d9613dc..f942480 100644
--- a/test/test_traversal.py
+++ b/test/test_traversal.py
@@ -237,8 +237,8 @@ def plot_traversal(ctx_getter, do_plot=False):
nparticles = 10**4
dtype = np.float64
- from pyopencl.clrandom import RanluxGenerator
- rng = RanluxGenerator(queue, seed=15)
+ from pyopencl.clrandom import PhiloxGenerator
+ rng = PhiloxGenerator(queue.context, seed=15)
from pytools.obj_array import make_obj_array
particles = make_obj_array([
diff --git a/test/test_tree.py b/test/test_tree.py
index 8e5e28b..be45d91 100644
--- a/test/test_tree.py
+++ b/test/test_tree.py
@@ -415,8 +415,8 @@ def test_extent_tree(ctx_getter, dims, do_plot=False):
targets = make_normal_particle_array(queue, ntargets, dims, dtype,
seed=19)
- from pyopencl.clrandom import RanluxGenerator
- rng = RanluxGenerator(queue, seed=13)
+ from pyopencl.clrandom import PhiloxGenerator
+ rng = PhiloxGenerator(queue.context, seed=13)
source_radii = 2**rng.uniform(queue, nsources, dtype=dtype,
a=-10, b=0)
target_radii = 2**rng.uniform(queue, ntargets, dtype=dtype,
--
GitLab