Changeset 8511

Timestamp:

Aug 13, 2012, 9:03:16 PM (13 years ago)

Author:

steve

Message:

Looks like pypar_extras is working with all_reduce

Location:

trunk/anuga_core/source/anuga_parallel

Files:

• parallel_generic_communications.py (modified) (1 diff)
• parallel_shallow_water.py (modified) (1 diff)
• pypar_extras/source/setup.py (modified) (1 diff)
• run_parallel_sw_rectangular_cross_profile.py (modified) (1 diff)

trunk/anuga_core/source/anuga_parallel/parallel_generic_communications.py

@@ -44 +44 @@
     
     if allreduce:
-        pypar.allreduce(domain.local_timestep, pypar.MIN,
+        import anuga_parallel.pypar_extras as par_extras
+        par_extras.allreduce(domain.local_timestep, pypar.MIN,
                       buffer=domain.global_timestep,
                       bypass=True)

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -63 +63 @@
             self.number_of_full_nodes_tmp = number_of_full_nodes
         else:
-            self.number_of_full_nodes_tmp = get_number_of_nodes()
+            self.number_of_full_nodes_tmp = self.get_number_of_nodes()
 
         if number_of_full_triangles is not None:
             self.number_of_full_triangles_tmp = number_of_full_triangles
         else:
-            self.number_of_full_triangles_tmp = get_number_of_triangles()
+            self.number_of_full_triangles_tmp = self.get_number_of_triangles()
 
         setup_buffers(self)

trunk/anuga_core/source/anuga_parallel/pypar_extras/source/setup.py

@@ -181 +181 @@
 
 
-    setup(name='Pypar',
+    setup(name='Pypar_extras',
           version=__version__,
           description='Extension to Pypar - Parallel Python',

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_rectangular_cross_profile.py

@@ -132 +132 @@
 
 t0 = time.time()
-finaltime = 2.0
-yieldstep = 0.5
+finaltime = 0.25
+yieldstep = 0.05
 
-s = """
 for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
     if myid == 0:
         domain.write_time()
-"""
 
 
-# Profiling
-import cProfile
-prof_file = 'evolve-prof'+ str(numprocs) + '_' + str(myid) + '.dat'
-cProfile.run(s,prof_file)
+
+## Profiling
+#import cProfile
+#prof_file = 'evolve-prof'+ str(numprocs) + '_' + str(myid) + '.dat'
+#cProfile.run(s,prof_file)
 
 
 barrier()
 
-for id in range(numprocs):
-    if myid == id:
-        import pstats
-        p = pstats.Stats(prof_file)
-        #p.sort_stats('cumulative').print_stats(25)
-        p.sort_stats('time').print_stats(25)
-        sys.stdout.flush
-
-    barrier()
-
-barrier()
+#for id in range(numprocs):
+#    if myid == id:
+#        import pstats
+#        p = pstats.Stats(prof_file)
+#        #p.sort_stats('cumulative').print_stats(25)
+#        p.sort_stats('time').print_stats(25)
+#        sys.stdout.flush
+#
+#    barrier()
+#
+#barrier()
 
 for p in range(numprocs):