fixes for move to python3 and change of python_packages location

tcaduser · tcaduser · commit fc002f8d32a7 · 2018-10-24T19:05:43.000-05:00
diff --git a/examples/diode/diode_1d.py b/examples/diode/diode_1d.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from devsim import *
-from python_packages.simple_physics import *
+from devsim.python_packages.simple_physics import *
 import diode_common
 #####
 # dio1
diff --git a/examples/diode/diode_2d.py b/examples/diode/diode_2d.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from devsim import *
-from python_packages.simple_physics import *
+from devsim.python_packages.simple_physics import *
 import diode_common
 
 # dio1
diff --git a/examples/diode/diode_common.py b/examples/diode/diode_common.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from devsim import *
-from python_packages.simple_physics import *
+from devsim.python_packages.simple_physics import *
 #####
 # dio1
 #
diff --git a/examples/diode/gmsh_diode2d.py b/examples/diode/gmsh_diode2d.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from devsim import *
-from python_packages.simple_physics import *
+from devsim.python_packages.simple_physics import *
 import diode_common
 
 device="diode2d"
diff --git a/examples/diode/gmsh_diode3d.py b/examples/diode/gmsh_diode3d.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from devsim import *
-from python_packages.simple_physics import *
+from devsim.python_packages.simple_physics import *
 import diode_common
 
 device="diode3d"
diff --git a/examples/diode/gmsh_diode3d_equil.py b/examples/diode/gmsh_diode3d_equil.py
@@ -15,7 +15,7 @@
 # this test added specifically to create a mesh for gmsh_diode3d_equil.py
 
 from devsim import *
-from python_packages.simple_physics import *
+from devsim.python_packages.simple_physics import *
 import diode_common
 
 device="diode3d"
diff --git a/examples/diode/laux2d.py b/examples/diode/laux2d.py
@@ -38,7 +38,7 @@
   import numpy
   import numpy.linalg
 except:
-  print "numpy is not available with your installation and is not being run"
+  print("numpy is not available with your installation and is not being run")
   sys.exit(-1)
 
 
diff --git a/examples/diode/laux3d.py b/examples/diode/laux3d.py
@@ -38,7 +38,7 @@
   import numpy
   import numpy.linalg
 except:
-  print "numpy is not available with your installation and is not being run"
+  print("numpy is not available with your installation and is not being run")
   sys.exit(-1)
 
 
diff --git a/examples/diode/laux_common.py b/examples/diode/laux_common.py
@@ -33,12 +33,15 @@
 # address = {Riverton, NJ, USA},
 #} 
 
+# handle the new way of integer division
+from __future__ import division
+
 import sys
 try:
   import numpy
   import numpy.linalg
 except:
-  print "numpy is not available with your installation and is not being run"
+  print("numpy is not available with your installation and is not being run")
   sys.exit(0)
 
 
@@ -295,44 +298,44 @@ def SetupOutputCompare(device, region, model, variable, output):
   for i in range(dim):
     mname = "ElectricField_" + directions[i]
     output[:,k] = numpy.array(get_element_model_values(device=device, region=region, name=mname))
-    print "%d %s" % (k, mname)
+    print("%d %s" % (k, mname))
     k += 1
   for j in range(nen):
     for i in range(dim):
       mname = "ElectricField_" + directions[i]
       dname = mname + ":Potential@en%d" % j
       output[:,k] = numpy.array(get_element_model_values(device=device, region=region, name=dname))
-      print "%d %s" % (k, dname)
+      print("%d %s" % (k, dname))
       k += 1
 
 def DoCompare(output, output_compare, number_test):
   test2 = output[0:nee*number_test] - output_compare[0:nee*number_test]
-  print numpy.linalg.norm(test2, ord=numpy.inf )
+  print(numpy.linalg.norm(test2, ord=numpy.inf ))
   for row in range(number_test):
     for col in range(5):
       sl1 = slice(nee*row,nee*(row+1))
       sl2 = slice(dim*col,dim*(col+1))
       norm = numpy.linalg.norm(output[(sl1, sl2)]-output_compare[(sl1,sl2)])
       if norm > 1e-4:
-        print "%d %d %g" % (row, col, norm)
+        print("%d %d %g" % (row, col, norm))
 
   row = 0
   if True:
   #for row in range(10):
     col = 0
     sl1 = slice(nee*row,nee*(row+1))
     sl2 = slice(dim*col,dim*(col+1))
-    print output[(sl1, sl2)]
-    print output_compare[(sl1,sl2)]
-    print output[(sl1, sl2)] - output_compare[(sl1,sl2)]
+    print(output[(sl1, sl2)])
+    print(output_compare[(sl1,sl2)])
+    print(output[(sl1, sl2)] - output_compare[(sl1,sl2)])
 
 def RunTest(device, region, number_test):
   scalar_efield = GetScalarField(device, region, "scalar_efield", "ElectricField")
   scalar_efield_derivatives = GetScalarFieldDerivatives(device, region, "scalar_efield_n", "ElectricField", "Potential")
   node_indexes = GetNodeIndexes(device, region)
   unit_vectors = GetUnitVectors(device, region)
 
-  number_elements = len(scalar_efield)/nee
+  number_elements = len(scalar_efield)//nee
 
   if number_test < 1:
     number_test = number_elements
diff --git a/examples/diode/pythonmesh3d.py b/examples/diode/pythonmesh3d.py
@@ -1,5 +1,5 @@
 from devsim import *
-import python_packages.pythonmesh
+import devsim.python_packages.pythonmesh
 
 
 def gmsh_reader(mesh, device, filename="", coordinates="", physical_names="", elements=""):
@@ -13,7 +13,7 @@ def gmsh_reader(mesh, device, filename="", coordinates="", physical_names="", el
   finalize_mesh    (mesh=mesh)
   create_device    (mesh=mesh, device=device)
 
-data = python_packages.pythonmesh.read_gmsh_file("gmsh_diode3d.msh")
+data = devsim.python_packages.pythonmesh.read_gmsh_file("gmsh_diode3d.msh")
 coordinates=data['coordinates']
 elements=data['elements']
 physical_names=data['physical_names']
diff --git a/examples/diode/ssac_diode.py b/examples/diode/ssac_diode.py
@@ -14,7 +14,7 @@
 
 #### Small Signal simulation
 from devsim import *
-from python_packages.simple_physics import *
+from devsim.python_packages.simple_physics import *
 import diode_common
 
 #This requires a circuit element to integrated current
@@ -50,11 +50,11 @@
   PrintCurrents(device, "bot")
   solve(type="ac", frequency=1.0)
   cap=get_circuit_node_value(node="V1.I", solution="ssac_imag")/ (2*3.14159)
-  print "capacitance {0} {1}".format(v, cap)
+  print("capacitance {0} {1}".format(v, cap))
   v += 0.1
 
 for x in get_circuit_node_list():
   for y in get_circuit_solution_list():
     z = get_circuit_node_value(node=x, solution=y)
-    print("{0}\t{1}\t{2}".format(x, y, z))
+    print(("{0}\t{1}\t{2}".format(x, y, z)))
 
diff --git a/examples/mobility/gmsh_mos2d.py b/examples/mobility/gmsh_mos2d.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from python_packages.simple_physics import *
-from python_packages.ramp import *
+from devsim.python_packages.simple_physics import *
+from devsim.python_packages.ramp import *
 
 import gmsh_mos2d_create
 device = "mos2d"
@@ -38,7 +38,7 @@
 for i in contacts:
   tmp = get_region_list(device=device, contact=i)
   r = tmp[0]
-  print "%s %s" % (r, i)
+  print("%s %s" % (r, i))
   CreateSiliconPotentialOnlyContact(device, r, i)
   set_parameter(device=device, name=GetContactBiasName(i), value=0.0)
 
diff --git a/examples/mobility/gmsh_mos2d_kla.py b/examples/mobility/gmsh_mos2d_kla.py
@@ -16,10 +16,10 @@
 #set_parameter -name threads_task_size -value 1024
 import gmsh_mos2d_create
 from devsim import *
-from python_packages.simple_physics import *
-from python_packages.ramp import *
-from python_packages.Klaassen import *
-from python_packages.mos_physics import *
+from devsim.python_packages.simple_physics import *
+from devsim.python_packages.ramp import *
+from devsim.python_packages.Klaassen import *
+from devsim.python_packages.mos_physics import *
 
 # TODO: write out mesh, and then read back in as separate test
 device = "mos2d"
@@ -44,7 +44,7 @@
 for i in contacts:
   tmp = get_region_list(device=device, contact=i)
   r = tmp[0]
-  print "%s %s" % (r, i)
+  print("%s %s" % (r, i))
   CreateSiliconPotentialOnlyContact(device, r, i)
   set_parameter(device=device, name=GetContactBiasName(i), value=0.0)
 
diff --git a/examples/mobility/pythonmesh2d.py b/examples/mobility/pythonmesh2d.py
@@ -1,5 +1,5 @@
 from devsim import *
-import python_packages.pythonmesh
+import devsim.python_packages.pythonmesh
 
 def gmsh_reader(mesh, device, filename="", coordinates="", physical_names="", elements=""):
   if (filename):
@@ -18,7 +18,7 @@ def gmsh_reader(mesh, device, filename="", coordinates="", physical_names="", el
   finalize_mesh(mesh=mesh)
   create_device(mesh=mesh, device=device)
 
-data = python_packages.pythonmesh.read_gmsh_file("gmsh_mos2d.msh")
+data = devsim.python_packages.pythonmesh.read_gmsh_file("gmsh_mos2d.msh")
 coordinates=data['coordinates']
 elements=data['elements']
 physical_names=data['physical_names']
diff --git a/examples/vectorpotential/twowire.py b/examples/vectorpotential/twowire.py
@@ -81,10 +81,10 @@
 write_devices(file="gmsh_{0}_out.msh".format(device))
 write_devices(file="gmsh_{0}_out.dat".format(device), type="tecplot")
 
-print "ElementNodeVolume {0:e}".format(sum(get_element_model_values(device=device, region="air", name="ElementNodeVolume")))
-print "NodeVolume {0:e}".format(sum(get_node_model_values(device=device, region="air", name="NodeVolume")))
-print "ElementNodeVolume {0:e}".format(sum(get_element_model_values(device=device, region="left", name="ElementNodeVolume")))
-print "NodeVolume {0:e}".format(sum(get_node_model_values(device=device, region="left", name="NodeVolume")))
-print "ElementNodeVolume {0:e}".format(sum(get_element_model_values(device=device, region="right", name="ElementNodeVolume")))
-print "NodeVolume {0:e}".format(sum(get_node_model_values(device=device, region="right", name="NodeVolume")))
+print("ElementNodeVolume {0:e}".format(sum(get_element_model_values(device=device, region="air", name="ElementNodeVolume"))))
+print("NodeVolume {0:e}".format(sum(get_node_model_values(device=device, region="air", name="NodeVolume"))))
+print("ElementNodeVolume {0:e}".format(sum(get_element_model_values(device=device, region="left", name="ElementNodeVolume"))))
+print("NodeVolume {0:e}".format(sum(get_node_model_values(device=device, region="left", name="NodeVolume"))))
+print("ElementNodeVolume {0:e}".format(sum(get_element_model_values(device=device, region="right", name="ElementNodeVolume"))))
+print("NodeVolume {0:e}".format(sum(get_node_model_values(device=device, region="right", name="NodeVolume"))))
 
diff --git a/python_packages/Klaassen.py b/python_packages/Klaassen.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from devsim import *
-from python_packages.model_create import *
+from devsim.python_packages.model_create import *
 
 def Set_Mobility_Parameters(device, region):
   #As
diff --git a/python_packages/model_create.py b/python_packages/model_create.py
@@ -28,7 +28,7 @@ def CreateNodeModel(device, region, model, expression):
   '''
   result=node_model(device=device, region=region, name=model, equation=expression)
   if debug:
-    print("NODEMODEL {d} {r} {m} \"{re}\"".format(d=device, r=region, m=model, re=result))
+    print(("NODEMODEL {d} {r} {m} \"{re}\"".format(d=device, r=region, m=model, re=result)))
 
 def CreateNodeModelDerivative(device, region, model, expression, *vars):
   '''
@@ -46,7 +46,7 @@ def CreateContactNodeModel(device, contact, model, expression):
   '''
   result=contact_node_model(device=device, contact=contact, name=model, equation=expression)
   if debug:
-    print("CONTACTNODEMODEL {d} {c} {m} \"{re}\"".format(d=device, c=contact, m=model, re=result))
+    print(("CONTACTNODEMODEL {d} {c} {m} \"{re}\"".format(d=device, c=contact, m=model, re=result)))
 
 
 def CreateContactNodeModelDerivative(device, contact, model, expression, variable):
@@ -63,7 +63,7 @@ def CreateEdgeModel (device, region, model, expression):
   '''
   result=edge_model(device=device, region=region, name=model, equation=expression)
   if debug:
-    print "EDGEMODEL {d} {r} {m} \"{re}\"".format(d=device, r=region, m=model, re=result);
+    print("EDGEMODEL {d} {r} {m} \"{re}\"".format(d=device, r=region, m=model, re=result));
 
 def CreateEdgeModelDerivatives(device, region, model, expression, variable):
   '''
@@ -82,7 +82,7 @@ def CreateContactEdgeModel(device, contact, model, expression):
   '''
   result=contact_edge_model(device=device, contact=contact, name=model, equation=expression)
   if debug:
-    print("CONTACTEDGEMODEL {d} {c} {m} \"{re}\"".format(d=device, c=contact, m=model, re=result))
+    print(("CONTACTEDGEMODEL {d} {c} {m} \"{re}\"".format(d=device, c=contact, m=model, re=result)))
 
 def CreateContactEdgeModelDerivative(device, contact, model, expression, variable):
   '''
@@ -96,7 +96,7 @@ def CreateInterfaceModel(device, interface, model, expression):
   '''
   result=interface_model(device=device, interface=interface, name=model, equation=expression)
   if debug:
-    print("INTERFACEMODEL {d} {i} {m} \"{re}\"".format(d=device, i=interface, m=model, re=result))
+    print(("INTERFACEMODEL {d} {i} {m} \"{re}\"".format(d=device, i=interface, m=model, re=result)))
 
 #def CreateInterfaceModelDerivative(device, interface, model, expression, variable):
 #  '''
@@ -133,19 +133,19 @@ def EnsureEdgeFromNodeModelExists(device, region, nodemodel):
     Checks if the edge models exists
   '''
   if not InNodeModelList(device, region, nodemodel):
-    raise("{} must exist" % (nodemodel))
+    raise "{} must exist"
 
   emlist = get_edge_model_list(device=device, region=region)
   emtest = ("{0}@n0".format(nodemodel) and "{0}@n1".format(nodemodel))
   if not emtest:
     if debug:
-      print "INFO: Creating ${0}@n0 and ${0}@n1".format(nodemodel)
+      print("INFO: Creating ${0}@n0 and ${0}@n1".format(nodemodel))
     edge_from_node_model(device=device, region=region, node_model=nodemodel)
 
 def CreateElementModel2d(device, region, model, expression):
   result=element_model(device=device, region=region, name=model, equation=expression)
   if debug:
-    print("ELEMENTMODEL {d} {r} {m} \"{re}\"".format(d=device, r=region, m=model, re=result))
+    print(("ELEMENTMODEL {d} {r} {m} \"{re}\"".format(d=device, r=region, m=model, re=result)))
 
 
 def CreateElementModelDerivative2d(device, region, model_name, expression, *args):
diff --git a/python_packages/mos_physics.py b/python_packages/mos_physics.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from devsim import *
-from python_packages.model_create import *
+from devsim.python_packages.model_create import *
 
 def CreateElementElectronContinuityEquation(device, region, current_model):
   '''
diff --git a/python_packages/pythonmesh.py b/python_packages/pythonmesh.py
@@ -60,8 +60,8 @@ def read_gmsh_file(filename):
   '''reads gmsh file and converts to python representation'''
   data = parse_gmsh_file(filename)
   #namemap = {}
-  print '%d dimension' % data['dimension']
-  print '%d coordinates' % len(data['coordinates'])
+  print('%d dimension' % data['dimension'])
+  print('%d coordinates' % len(data['coordinates']))
   #for i in sorted(data['physical_names'].keys()):
   #  print "%s %s %d" % (i, data['physical_names'][i], len(data['elements'][i]))
   #  namemap[data['physical_names'][i]] = i
diff --git a/python_packages/ramp.py b/python_packages/ramp.py
@@ -16,7 +16,7 @@
 sys.path.append('../../python_packages')
 from devsim import *
 import devsim
-from simple_physics import *
+from .simple_physics import *
 
 def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error, abs_error, callback):
   '''
@@ -29,7 +29,7 @@ def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error
     step_sign=-1
   last_bias=start_bias
   while(abs(last_bias - end_bias) > min_step):
-    print("last end %e %e") % (last_bias, end_bias)
+    print(("last end %e %e") % (last_bias, end_bias))
     next_bias=last_bias + step_sign * step_size
     if next_bias < end_bias:
       next_step_sign=1
@@ -38,8 +38,8 @@ def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error
 
     if next_step_sign != step_sign:
       next_bias=end_bias
-      print "setting to last bias %e" % (end_bias)
-      print "setting next bias %e" % (next_bias)
+      print("setting to last bias %e" % (end_bias))
+      print("setting next bias %e" % (next_bias))
     set_parameter(device=device, name=GetContactBiasName(contact), value=next_bias)
     try:
       solve(type="dc", absolute_error=abs_error, relative_error=rel_error, maximum_iterations=max_iter)
@@ -48,11 +48,11 @@ def rampbias(device, contact, end_bias, step_size, min_step, max_iter, rel_error
         raise
       set_parameter(device=device, name=GetContactBiasName(contact), value=last_bias)
       step_size *= 0.5
-      print "setting new step size %e" % (step_size)
+      print("setting new step size %e" % (step_size))
       if step_size < min_step:
         raise "Min step size too small"
       continue
-    print "Succeeded"
+    print("Succeeded")
     last_bias=next_bias
     callback(device)
 
diff --git a/python_packages/simple_dd.py b/python_packages/simple_dd.py
diff --git a/python_packages/simple_physics.py b/python_packages/simple_physics.py

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`from devsim import *`
`16`		`-from python_packages.simple_physics import *`
	`16`	`+from devsim.python_packages.simple_physics import *`
`17`	`17`	`#####`
`18`	`18`	`# dio1`
`19`	`19`	`#`