Merge lp:~cwilson/spud/pythonbug into lp:spud

[Cian Wilson]

This merge fixes a mangling/out of range issue (for non-square tensors) with get_option in the python libspud interface (bug lp:806331).

Additionally it adds functionality to allow set_option to work for rank>0 objects (bug lp:806332).

Test added to test_ctypes.py.

[lp:~cwilson/spud/pythonbug]

405. By Cian Wilson on 2011-07-06

Oops, removing duplicated derived exception class.

[Patrick Farrell (pefarrell)]

Looks good. It would be nice if we did numpy arrays too, but it's not essential. If you're clever about your try/exceptions, it doesn't have to have a hard dependency on numpy.

[Cian Wilson (cwilson)]

True but I'll leave that until it bugs me enough to fix (probably won't take that long).

Thanks Patrick.

[Florian Rathgeber (florian-rathgeber)]

Patrick, do you still have plans to use numpy arrays for this? Otherwise this should be approved (since it has been merged already) and the 3 related issues closed.

[Patrick Farrell (pefarrell)]

I approve. I don't need the numpy arrays, so I'm not pushed about them.

review: Approve

=== modified file 'python/libspud.py.in'
--- python/libspud.py.in	2011-07-05 13:54:45 +0000
+++ python/libspud.py.in	2011-07-06 05:48:34 +0000
@@ -173,7 +173,8 @@
     val_type = ctype_map[type]
     rank = get_option_rank(s)
     shape = get_option_shape(s)
-    for i in range(rank): val_type = val_type*shape[i]
+    # reverse the numbering so we get a rowxcolumn list of lists
+    for i in range(rank-1, -1, -1): val_type = val_type*shape[i]
     val = val_type()
 
   out = cget_option(s, byref(c_int(len(s))), byref(val))
@@ -205,19 +206,48 @@
 cset_option.restype = c_int
 
 def set_option(s, val):
+  rank = 0
+  shape_type = c_int * 2
+  shape = shape_type(1, -1)
   py_type = type(val)
+  if py_type not in typepy_map:
+    if py_type == list:
+      subval = val
+      for i in range(2):
+        if type(subval) == list:
+          shape[i] = len(subval)
+          rank += 1
+          subval = subval[0]
+        else:
+          break 
+      py_type = type(subval)
+    # elif ...
+      # could put numpy array handling in here 
+      # (they'd be easier but didn't want to
+      #  add a numpy dependency)
+    else:
+      raise spud_exceptions[SPUD_TYPE_ERROR]("Unknown value type.  Only know about floats, ints, strings and lists thereof.")
   spud_code = typepy_map[py_type]
   c_type = ctype_map[py_type]
-  c_val = c_type(val)
+  # reverse the order of the shape entries as that way we end up with a rows x columns c_type
+  for i in range(rank-1, -1, -1): c_type = c_type*shape[i]
+  if rank == 2:
+    c_val = c_type()
+    for i in range(shape[0]):
+      for j in range(shape[1]):
+        c_val[i][j] = val[i][j]
+  elif rank == 1:
+    c_val = c_type()
+    for i in range(shape[0]):
+      c_val[i] = val[i]
+  else:
+    c_val = c_type(val)
 
-  shape_type = c_int * 2
   if py_type is str:
     shape = shape_type(len(val), -1)
     rank = 1
     out = cset_option(s, byref(c_int(len(s))), (c_val), byref(c_int(spud_code)), byref(c_int(rank)), shape)
   else:
-    shape = shape_type(1, -1)
-    rank = 0
     out = cset_option(s, byref(c_int(len(s))), byref(c_val), byref(c_int(spud_code)), byref(c_int(rank)), shape)
 
   if out != SPUD_NO_ERROR:
 
=== modified file 'python/test_ctypes.py'
--- python/test_ctypes.py	2011-07-05 13:54:45 +0000
+++ python/test_ctypes.py	2011-07-06 05:48:34 +0000
@@ -30,13 +30,22 @@
 print libspud.get_option_rank(list_path)
 print libspud.get_option(list_path)
 assert(libspud.get_option(list_path)==[7,8,9,10])
+libspud.set_option(list_path, [11,12,13,14])
+print libspud.get_option_shape(list_path)
+print libspud.get_option_rank(list_path)
+print libspud.get_option(list_path)
+assert(libspud.get_option(list_path)==[11,12,13,14])
 
 tensor_path = '/material_phase::Material1/tensor_field::DummyTensor/prescribed/value::WholeMesh/anisotropic_asymmetric/constant'
 print libspud.get_option_shape(tensor_path)
 print libspud.get_option_rank(tensor_path)
 print libspud.get_option(tensor_path)
 assert(libspud.get_option(tensor_path)==[[1.0,2.0],[3.0,4.0]])
-
+libspud.set_option(tensor_path, [[5.0,6.0],[7.0,8.0]])
+print libspud.get_option_shape(tensor_path)
+print libspud.get_option_rank(tensor_path)
+print libspud.get_option(tensor_path)
+assert(libspud.get_option(tensor_path)==[[5.0,6.0],[7.0,8.0]])
 
 try:
   libspud.add_option('/foo')