Changeset 123 for pypar/pytiming

Timestamp:

Jul 11, 2005, 3:20:03 PM (20 years ago)

Author:

ole

Message:

Files for 64 bit machine + latest Cvs version

File:

• pypar/pytiming (modified) (4 diffs)

pypar/pytiming

@@ -14 +14 @@
 import pypar
 
+#from mpiext import send_array, receive_array  #most direct methods
+#Not available in final install - use bypass form for now
+
 #--------------------------------------------------------------
 
-raw = 1       # Use raw communication (1) or user friendly (0)
-vanilla = 0    # Force use of vanilla format (1)
-consistency_check = 1 # Check correctness
-
-#--------------------------------------------------------------  
-if raw:
-  Send = pypar.raw_send
-  Recv = pypar.raw_receive
-else:  
-  Send = pypar.send
-  Recv = pypar.receive
+method = 2     # Use
+                  # 0: automatically allocated buffers
+                  # 1: user-supplied buffers
+                  # 2: Use bypass - let pypar use direct mpi_ext call
+                  # 3: direct call to mpiext (with buffers),
+                  #    only fractionally better than bypass
+                  
+vanilla = False  # Force use of vanilla format (1)
+consistency_check = False # Check correctness
 
 
@@ -103 +104 @@
 seed(17, 53)
 A = uniform(0.0,100.0,MAXM)
-#A = uniform(0,100,MAXM).astype('l')
 elsize = A.itemsize()
 #print elsize
@@ -144 +144 @@
       #
       t1 = pypar.Wtime()
-      Send(A[:m], 1, msgid, vanilla)
-      if raw:
-        C = Recv(A[:m], numprocs-1, msgid, vanilla)
-      else:  
-        C = Recv(numprocs-1, msgid)      
+
+      if method==0:
+        pypar.send(A[:m], destination=1, tag=msgid, vanilla=vanilla)
+        C = pypar.receive(numprocs-1, tag=msgid, vanilla=vanilla)
+      elif method == 1:  
+        pypar.send(A[:m], use_buffer=True, destination=1,
+                   tag=msgid, vanilla=vanilla)
+        C = pypar.receive(numprocs-1, buffer=A[:m], tag=msgid, vanilla=vanilla)
+      elif method==2:
+        pypar.send(A[:m], use_buffer=True, destination=1,
+                   tag=msgid, vanilla=vanilla, bypass=True)
+        C = pypar.receive(numprocs-1, buffer=A[:m], tag=msgid,
+                          vanilla=vanilla, bypass=True)
+      else:
+        raise 'Unknown method'
+        #send_array(A[:m], 1, msgid)    
+        #stat = receive_array(A[:m], numprocs-1, msgid)
+        #C = A[:m]
+        
       t2 = pypar.Wtime() - t1 - cpuOH
       t2 = t2/numprocs
@@ -164 +178 @@
       # Parallel process - get msg and pass it on
       #
-      if raw:
-        C = Recv(A[0:m], myid-1, msgid, vanilla)
-      else:  
-        C = Recv(myid-1, msgid)
-      Send(C, (myid+1)%numprocs, msgid, vanilla)
+
+      if method==0:
+        C = pypar.receive(myid-1, tag=msgid, vanilla=vanilla)
+        pypar.send(A[:m], destination=(myid+1)%numprocs,
+                   tag=msgid, vanilla=vanilla)
+      elif method==1:  
+        C = pypar.receive(myid-1, buffer=A[:m], tag=msgid, vanilla=vanilla)
+        pypar.send(A[:m], use_buffer=True, destination=(myid+1)%numprocs,
+                   tag=msgid, vanilla=vanilla)                        
+      elif method==2:
+        # Use pypar bypass
+        C = pypar.receive(myid-1, buffer=A[:m], tag=msgid,
+                          vanilla=vanilla, bypass=True)
+        pypar.send(A[:m], use_buffer=True, destination=(myid+1)%numprocs,
+                   tag=msgid, vanilla=vanilla, bypass=True)
+      else:
+        raise 'Unknown method'
+        # Use direct mpiext call
+        #stat = receive_array(A[:m], myid-1, msgid)                
+        #send_array(A[:m], (myid+1)%numprocs, msgid)