Changeset 9116

Timestamp:

May 15, 2014, 2:16:21 PM (11 years ago)

Author:

steve

Message:

Fixed test_pypar_ext.py

Location:

trunk/anuga_core/source/anuga_parallel/pypar_extras

Files:

• pypar_ext.py (modified) (1 diff)
• test_pypar_ext.py (modified) (11 diffs)

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

@@ -230 +230 @@
 
     import types
-    from mpiext import size
+    from pypar import size
     numproc = size()         # Needed to determine buffer size
 

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

@@ -20 +20 @@
 #print "Importing pypar"
 import pypar
+import pypar_ext as par_exts
+#import pypar as par_exts
+par_exts_methods = dir(par_exts)
+assert 'allreduce' in par_exts_methods
 methods = dir(pypar)
 assert 'abort' in methods
@@ -902 +906 @@
   X = numpy.zeros(N, 'i') # Buffer for results
 
-  pypar.allreduce(testArray, pypar.SUM, buffer=X)
+  par_exts.allreduce(testArray, pypar.SUM, buffer=X)
 
   if myid == 0:
@@ -911 +915 @@
     print 'Buffered allreduce using pypar.SUM OK'
 
-  pypar.allreduce(testArray, pypar.MAX, buffer=X)
+  par_exts.allreduce(testArray, pypar.MAX, buffer=X)
   if myid == 0:
     Y = numpy.array(range(N))*numproc
@@ -917 +921 @@
     print 'Buffered allreduce using pypar.MAX OK'
 
-  pypar.allreduce(testArray, pypar.MIN, buffer=X)
+  par_exts.allreduce(testArray, pypar.MIN, buffer=X)
   if myid == 0:
     Y = numpy.array(range(N))
@@ -927 +931 @@
     X_float = X.astype('f')
 
-    pypar.allreduce(testArray_float, pypar.PROD, buffer=X_float)
+    par_exts.allreduce(testArray_float, pypar.PROD, buffer=X_float)
     if myid == 0:
       Y = numpy.ones(N).astype('f')
@@ -940 +944 @@
       print "Skipping product-allreduce - try again with numproc < 20"
 
-  pypar.allreduce(testArray, pypar.LAND, buffer=X)
+  par_exts.allreduce(testArray, pypar.LAND, buffer=X)
   if myid == 0:
     Y = numpy.ones(N).astype('i')
@@ -948 +952 @@
     print 'Buffered allreduce using pypar.LAND OK'
 
-  pypar.allreduce(testArray, pypar.BAND, buffer=X)
+  par_exts.allreduce(testArray, pypar.BAND, buffer=X)
   if myid == 0:
     Y = numpy.ones(N).astype('i')*255  #Neutral element for &
@@ -956 +960 @@
     print 'Buffered allreduce using pypar.BAND OK'
 
-  pypar.allreduce(testArray, pypar.LOR, buffer=X)
+  par_exts.allreduce(testArray, pypar.LOR, buffer=X)
   if myid == 0:
     Y = numpy.zeros(N).astype('i')
@@ -964 +968 @@
     print 'Buffered allreduce using pypar.LOR OK'
 
-  pypar.allreduce(testArray, pypar.BOR, buffer=X)
+  par_exts.allreduce(testArray, pypar.BOR, buffer=X)
   if myid == 0:
     Y = numpy.zeros(N).astype('i')   #Neutral element for |
@@ -972 +976 @@
     print 'Buffered allreduce using pypar.BOR OK'
 
-  pypar.allreduce(testArray, pypar.LXOR, buffer=X)
+  par_exts.allreduce(testArray, pypar.LXOR, buffer=X)
   if myid == 0:
     Y = numpy.zeros(N).astype('i')
@@ -980 +984 @@
     print 'Buffered allreduce using pypar.LXOR OK'
 
-  pypar.allreduce(testArray, pypar.BXOR, buffer=X)
+  par_exts.allreduce(testArray, pypar.BXOR, buffer=X)
   if myid == 0:
     Y = numpy.zeros(N).astype('i')   #Neutral element for xor ?