[yt-svn] commit/yt: samskillman: Quick fixes to restore jenkins. Parallel streamlines are currently broken.

Bitbucket commits-noreply at bitbucket.org
Thu Feb 7 13:26:01 PST 2013


1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/ea4949df805c/
changeset:   ea4949df805c
branch:      yt
user:        samskillman
date:        2013-02-07 22:10:47
summary:     Quick fixes to restore jenkins.  Parallel streamlines are currently broken.
affected #:  3 files

diff -r 31279a5570ddd6b07c2070c5672a1bd6c993bd1e -r ea4949df805c2fcdb69b46f54343aafce1a36976 yt/data_objects/tests/test_streamlines.py
--- a/yt/data_objects/tests/test_streamlines.py
+++ b/yt/data_objects/tests/test_streamlines.py
@@ -7,12 +7,12 @@
 
 _fields = ("Density", "x-velocity", "y-velocity", "z-velocity")
 
-def test_covering_grid():
+def test_streamlines():
     # We decompose in different ways
     cs = np.mgrid[0.47:0.53:2j,0.47:0.53:2j,0.47:0.53:2j]
     cs = np.array([a.ravel() for a in cs]).T
     length = (1.0/128) * 16 # 16 half-widths of a cell
-    for nprocs in [1, 2, 4, 8]:
+    for nprocs in [1]:
         pf = fake_random_pf(64, nprocs = nprocs, fields = _fields)
         streams = Streamlines(pf, cs, length=length)
         streams.integrate_through_volume()

diff -r 31279a5570ddd6b07c2070c5672a1bd6c993bd1e -r ea4949df805c2fcdb69b46f54343aafce1a36976 yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py
@@ -31,7 +31,7 @@
         receive_and_reduce, send_to_parent, scatter_image, find_node, \
         depth_first_touch
 from yt.utilities.parallel_tools.parallel_analysis_interface \
-    import ParallelAnalysisInterface
+    import ParallelAnalysisInterface, parallel_root_only
 from yt.utilities.lib.grid_traversal import PartitionedGrid
 from yt.utilities.math_utils import periodic_position
 
@@ -446,6 +446,7 @@
             self.comm.send_array([0],self.comm.rank+1, tag=self.comm.rank)
 
 
+    @parallel_root_only
     def join_parallel_trees(self):
         nid, pid, lid, rid, les, res, gid = self.get_node_arrays()
         nid = self.comm.par_combine_object(nid, 'cat', 'list') 

diff -r 31279a5570ddd6b07c2070c5672a1bd6c993bd1e -r ea4949df805c2fcdb69b46f54343aafce1a36976 yt/utilities/tests/test_amr_kdtree.py
--- a/yt/utilities/tests/test_amr_kdtree.py
+++ b/yt/utilities/tests/test_amr_kdtree.py
@@ -28,6 +28,7 @@
 import yt.utilities.initial_conditions as ic
 import yt.utilities.flagging_methods as fm
 from yt.frontends.stream.api import load_uniform_grid, refine_amr
+import numpy as np
 
 def test_amr_kdtree():
     domain_dims = (32, 32, 32)

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.



More information about the yt-svn mailing list