Updating python interface

elemental · Nov 28, 2016 · 2eec647 · 2eec647
1 parent acbf1e7
commit 2eec647
Show file tree

Hide file tree

Showing 67 changed files with 547 additions and 630 deletions.
diff --git a/cmake/configure_files/environment.py.in b/cmake/configure_files/environment.py.in
@@ -234,10 +234,6 @@ def Initialize():
   pythonapi.Py_GetArgcArgv(ctypes.byref(argc),ctypes.byref(argv))
   lib.ElInitialize(pointer(argc),pointer(argv))
 
-lib.ElFinalize.argtypes = []
-def Finalize():
-  lib.ElFinalize()
-
 lib.ElInitialized.argtypes = [POINTER(bType)]
 def Initialized():
   active = bType()

diff --git a/examples/interface/AlgebraicRelationSearch.py b/examples/interface/AlgebraicRelationSearch.py
@@ -14,7 +14,7 @@
 outputAll=False
 outputCoeff=False
 
-print "alpha=", alpha
+print('alpha = {}'.format(alpha))
 
 ctrl=El.LLLCtrl_d()
 ctrl.progress = progress
@@ -31,8 +31,8 @@
   for deltaLower in 0.5, 0.75, 0.95, 0.98, 0.99:
     for variant in El.LLL_NORMAL, El.LLL_DEEP, El.LLL_DEEP_REDUCE:
 
-      print "variant=%d, presort=%r, smallestFirst=%r, deltaLower=%f" % \
-        (variant,presort,smallestFirst,deltaLower)
+      print('variant={}, presort={}, smallestFirst={}, deltaLower={}'.format( \
+        variant,presort,smallestFirst,deltaLower))
 
       ctrl.delta = deltaLower
       ctrl.variant = variant
@@ -43,12 +43,14 @@
       startTime = El.mpi.Time()
       numExact, B, U = El.AlgebraicRelationSearch(alpha,n,NSqrt,ctrl)
       runTime = El.mpi.Time() - startTime
-      print "  runtime: %f seconds" % runTime
-      print "  num \"exact\": ", numExact
+      print('  runtime: {} seconds'.format(runTime))
+      print('  num \"exact\": {}'.format(numExact))
       if outputAll:
         El.Print( B, "B" )
         El.Print( U, "U" )
       elif outputCoeff:
         El.Print( U[:,0], "u0" )
-      print "approximate zero: %e+%ei" % \
-        (B.GetRealPart(n,0)/NSqrt,B.GetImagPart(n,0)/NSqrt)
+      print('approximate zero: {}+{}i'.format( \
+        B.GetRealPart(n,0)/NSqrt,B.GetImagPart(n,0)/NSqrt))
+
+El.Finalize()
diff --git a/examples/interface/BP.py b/examples/interface/BP.py
@@ -72,7 +72,7 @@ def ConcatFD2D(N0,N1):
 x = El.BP( A, b, ctrl )
 endBP = El.mpi.Time()
 if worldRank == 0:
-  print "BP time:", endBP-startBP, "seconds"
+  print('BP time: {} seconds'.format(endBP-startBP))
 if display:
   El.Display( x, "x" )
 
@@ -84,10 +84,7 @@ def ConcatFD2D(N0,N1):
   El.Display( e, "e" )
 eTwoNorm = El.Nrm2( e )
 if worldRank == 0:
-  print "|| x ||_1       =", xOneNorm
-  print "|| A x - b ||_2 =", eTwoNorm
+  print('|| x ||_1       = {}'.format(xOneNorm))
+  print('|| A x - b ||_2 = {}'.format(eTwoNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/BPComplex.py b/examples/interface/BPComplex.py
@@ -63,7 +63,7 @@ def ConcatFD2D(N0,N1):
 x = El.BP( A, b, ctrl )
 endBP = El.mpi.Time()
 if worldRank == 0:
-  print "BP time:", endBP-startBP, "seconds"
+  print('BP time: {} seconds'.format(endBP-startBP))
 if display:
   El.Display( x, "x" )
 if output:
@@ -76,10 +76,7 @@ def ConcatFD2D(N0,N1):
 ( El.NORMAL, El.ComplexDouble(-1), A, x, El.ComplexDouble(1), e )
 eTwoNorm = El.Nrm2( e )
 if worldRank == 0:
-  print "|| x ||_1       =", xOneNorm
-  print "|| A x - b ||_2 =", eTwoNorm
+  print('|| x ||_1       = {}'.format(xOneNorm))
+  print('|| A x - b ||_2 = {}'.format(eTwoNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/BPComplexDense.py b/examples/interface/BPComplexDense.py
@@ -71,7 +71,7 @@ def ConcatFD2D(N0,N1):
 x = El.BP( A, b, ctrl )
 endBP = El.mpi.Time()
 if worldRank == 0:
-  print "BP time:", endBP-startBP, "seconds"
+  print('BP time: {} seconds'.format(endBP-startBP))
 if display:
   El.Display( x, "x" )
 if output:
@@ -87,10 +87,7 @@ def ConcatFD2D(N0,N1):
   El.Print( e, "e" )
 eTwoNorm = El.Nrm2( e )
 if worldRank == 0:
-  print "|| x ||_1       =", xOneNorm
-  print "|| A x - b ||_2 =", eTwoNorm
+  print('|| x ||_1       = {}'.format(xOneNorm))
+  print('|| A x - b ||_2 = {}'.format(eTwoNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/BPDN.py b/examples/interface/BPDN.py
@@ -70,13 +70,13 @@ def ConcatFD2D(N0,N1):
 for j in xrange(0,numLambdas):
   lambd = startLambda + j*(endLambda-startLambda)/(numLambdas-1.)
   if worldRank == 0:
-    print "lambda =", lambd
+    print('lambda = {}'.format(lambd))
 
   startBPDN = El.mpi.Time()
   x = El.BPDN( A, b, lambd, ctrl )
   endBPDN = El.mpi.Time()
   if worldRank == 0:
-    print "BPDN time:", endBPDN-startBPDN, "seconds"
+    print('BPDN time: {} seconds'.format(endBPDN-startBPDN))
   if display:
     El.Display( x, "x" )
 
@@ -88,10 +88,7 @@ def ConcatFD2D(N0,N1):
     El.Display( e, "e" )
   eTwoNorm = El.Nrm2( e )
   if worldRank == 0:
-    print "|| x ||_1       =", xOneNorm
-    print "|| A x - b ||_2 =", eTwoNorm
+    print('|| x ||_1       = {}'.format(xOneNorm))
+    print('|| A x - b ||_2 = {}'.format(eTwoNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/BPDNDense.py b/examples/interface/BPDNDense.py
@@ -35,13 +35,13 @@ def Rectang(height,width):
 for j in xrange(0,numLambdas):
   lambd = startLambda + j*(endLambda-startLambda)/(numLambdas-1.)
   if worldRank == 0:
-    print "lambda =", lambd
+    print('lambda = {}'.format(lambd))
 
   startBPDN = El.mpi.Time()
   x = El.BPDN( A, b, lambd, ctrl )
   endBPDN = El.mpi.Time()
   if worldRank == 0:
-    print "BPDN time:", endBPDN-startBPDN, "seconds"
+    print('BPDN time: {} seconds'.format(endBPDN-startBPDN))
   if display:
     El.Display( x, "x" )
 
@@ -53,10 +53,7 @@ def Rectang(height,width):
     El.Display( e, "e" )
   eTwoNorm = El.Nrm2( e )
   if worldRank == 0:
-    print "|| x ||_1       =", xOneNorm
-    print "|| A x - b ||_2 =", eTwoNorm
+    print('|| x ||_1       = {}'.format(xOneNorm))
+    print('|| A x - b ||_2 = {}'.format(eTwoNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/BPDense.py b/examples/interface/BPDense.py
@@ -32,7 +32,7 @@ def Rectang(height,width):
 x = El.BP( A, b, ctrl )
 endBP = El.mpi.Time()
 if worldRank == 0:
-  print "BP time:", endBP-startBP, "seconds"
+  print('BP time: {} seconds'.format(endBP-startBP))
 if display:
   El.Display( x, "x" )
 
@@ -44,10 +44,7 @@ def Rectang(height,width):
   El.Display( e, "e" )
 eTwoNorm = El.Nrm2( e )
 if worldRank == 0:
-  print "|| x ||_1       =", xOneNorm
-  print "|| A x - b ||_2 =", eTwoNorm
+  print('|| x ||_1       = {}'.format(xOneNorm))
+  print('|| A x - b ||_2 = {}'.format(eTwoNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/CP.py b/examples/interface/CP.py
@@ -71,7 +71,7 @@ def StackedFD2D(N0,N1):
 x = El.CP( A, b, ctrl )
 endCP = El.mpi.Time()
 if worldRank == 0:
-  print "CP time:", endCP-startCP, "seconds"
+  print('CP time: {} seconds'.format(endCP-startCP))
 if display:
   El.Display( x, "x" )
 
@@ -85,16 +85,16 @@ def StackedFD2D(N0,N1):
 rTwoNorm = El.Nrm2( r )
 rInfNorm = El.MaxNorm( r )
 if worldRank == 0:
-  print "|| b ||_2        =", bTwoNorm
-  print "|| b ||_oo       =", bInfNorm
-  print "|| A x - b ||_2  =", rTwoNorm
-  print "|| A x - b ||_oo =", rInfNorm
+  print('|| b ||_2        = {}'.format(bTwoNorm))
+  print('|| b ||_oo       = {}'.format(bInfNorm))
+  print('|| A x - b ||_2  = {}'.format(rTwoNorm))
+  print('|| A x - b ||_oo = {}'.format(rInfNorm))
 
 startLS = El.mpi.Time()
 xLS = El.LeastSquares(A,b)
 endLS = El.mpi.Time()
 if worldRank == 0:
-  print "LS time:", endLS-startLS, "seconds"
+  print('LS time: {} seconds'.format(endLS-startLS))
 if display:
   El.Display( xLS, "x_{LS}" )
 rLS = El.DistMultiVec()
@@ -105,10 +105,7 @@ def StackedFD2D(N0,N1):
 rLSTwoNorm = El.Nrm2(rLS)
 rLSInfNorm = El.MaxNorm(rLS)
 if worldRank == 0:
-  print "|| A x_{LS} - b ||_2  =", rLSTwoNorm
-  print "|| A x_{LS} - b ||_oo =", rLSInfNorm
+  print('|| A x_{{LS}} - b ||_2  = {}'.format(rLSTwoNorm))
+  print('|| A x_{{LS}} - b ||_oo = {}'.format(rLSInfNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/CPDense.py b/examples/interface/CPDense.py
@@ -32,7 +32,7 @@ def Rectang(height,width):
 x = El.CP( A, b, ctrl )
 endCP = El.mpi.Time()
 if worldRank == 0:
-  print "CP time:", endCP-startCP, "seconds"
+  print('CP time: {} seconds'.format(endCP-startCP))
 if display:
   El.Display( x, "x" )
 
@@ -46,16 +46,16 @@ def Rectang(height,width):
 rTwoNorm = El.Nrm2( r )
 rInfNorm = El.MaxNorm( r )
 if worldRank == 0:
-  print "|| b ||_2        =", bTwoNorm
-  print "|| b ||_oo       =", bInfNorm
-  print "|| A x - b ||_2  =", rTwoNorm
-  print "|| A x - b ||_oo =", rInfNorm
+  print('|| b ||_2        = {}'.format(bTwoNorm))
+  print('|| b ||_oo       = {}'.format(bInfNorm))
+  print('|| A x - b ||_2  = {}'.format(rTwoNorm))
+  print('|| A x - b ||_oo = {}'.format(rInfNorm))
 
 startLS = El.mpi.Time()
 xLS = El.LeastSquares(A,b)
 endLS = El.mpi.Time()
 if worldRank == 0:
-  print "LS time:", endLS-startLS, "seconds"
+  print('LS time: {} seconds'.format(endLS-startLS))
 if display:
   El.Display( xLS, "x_{LS}" )
 rLS = El.DistMatrix()
@@ -66,10 +66,7 @@ def Rectang(height,width):
 rLSTwoNorm = El.Nrm2(rLS)
 rLSInfNorm = El.MaxNorm(rLS)
 if worldRank == 0:
-  print "|| A x_{LS} - b ||_2  =", rLSTwoNorm
-  print "|| A x_{LS} - b ||_oo =", rLSInfNorm
+  print('|| A x_{{LS}} - b ||_2  = {}'.format(rLSTwoNorm))
+  print('|| A x_{{LS}} - b ||_oo = {}'.format(rLSInfNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/DS.py b/examples/interface/DS.py
@@ -66,13 +66,13 @@ def ConcatFD2D(N0,N1):
 for j in xrange(0,numLambdas):
   lambd = startLambda + j*(endLambda-startLambda)/(numLambdas-1.)
   if worldRank == 0:
-    print "lambda =", lambd
+    print('lambda = {}'.format(lambd))
 
   startDS = El.mpi.Time()
   x = El.DS( A, b, lambd, ctrl )
   endDS = El.mpi.Time()
   if worldRank == 0:
-    print "DS time:", endDS-startDS, "seconds"
+    print('DS time: {} seconds'.format(endDS-startDS))
   if display:
     El.Display( x, "x" )
 
@@ -90,12 +90,9 @@ def ConcatFD2D(N0,N1):
     El.Display( r, "r" )
     El.Display( t, "t" )
   if worldRank == 0:
-    print "|| x ||_1       =", xOneNorm
-    print "|| b - A x ||_2 =", rTwoNorm
-    print "|| A^T (b - A x) ||_2 =", tTwoNorm
-    print "|| A^T (b - A x) ||_oo =", tInfNorm
+    print('|| x ||_1       = {}'.format(xOneNorm))
+    print('|| b - A x ||_2 = {}'.format(rTwoNorm))
+    print('|| A^T (b - A x) ||_2 = {}'.format(tTwoNorm))
+    print('|| A^T (b - A x) ||_oo = {}'.format(tInfNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/DSDense.py b/examples/interface/DSDense.py
@@ -35,13 +35,13 @@ def Rectang(height,width):
 for j in xrange(0,numLambdas):
   lambd = startLambda + j*(endLambda-startLambda)/(numLambdas-1.)
   if worldRank == 0:
-    print "lambda =", lambd
+    print('lambda = {}'.format(lambd))
 
   startDS = El.mpi.Time()
   x = El.DS( A, b, lambd, ctrl )
   endDS = El.mpi.Time()
   if worldRank == 0:
-    print "DS time:", endDS-startDS, "seconds"
+    print('DS time: {} seconds'.format(endDS-startDS))
   if display:
     El.Display( x, "x" )
 
@@ -59,12 +59,9 @@ def Rectang(height,width):
     El.Display( r, "r" )
     El.Display( t, "t" )
   if worldRank == 0:
-    print "|| x ||_1       =", xOneNorm
-    print "|| b - A x ||_2 =", rTwoNorm
-    print "|| A^T (b - A x) ||_2 =", tTwoNorm
-    print "|| A^T (b - A x) ||_oo =", tInfNorm
+    print('|| x ||_1       = {}'.format(xOneNorm))
+    print('|| b - A x ||_2 = {}'.format(rTwoNorm))
+    print('|| A^T (b - A x) ||_2 = {}'.format(tTwoNorm))
+    print('|| A^T (b - A x) ||_oo = {}'.format(tInfNorm))
 
-# Require the user to press a button before the figures are closed
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/DruinskyToledo.py b/examples/interface/DruinskyToledo.py
@@ -39,8 +39,4 @@
 El.EntrywiseMap(A_LU,lambda x:math.log10(max(abs(x),1)))
 El.Display(A_LU,"Logarithmically-scaled LU factors")
 
-# Require the user to press a button before the figures are closed
-worldSize = El.mpi.WorldSize()
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')
diff --git a/examples/interface/DynamicRegCounter.py b/examples/interface/DynamicRegCounter.py
@@ -14,8 +14,4 @@
 El.DynamicRegCounter( A, n )
 El.Display( A, "A" )
 
-# Require the user to press a button before the figures are closed
-worldSize = El.mpi.WorldSize()
 El.Finalize()
-if worldSize == 1:
-  raw_input('Press Enter to exit')