Add new test demonstrating numpy.i typemaps.

Author: Ilmar Wilbers

AUTHORS

@@ -1,16 +1,11 @@
-
 Main authors: 
 Martin Alnæs (martinal@simula.no)
 Kent-Andre Mardal (kent-and@simula.no) 
 Magne Westlie (magnew@simula.no)
+Ilmar Wilbers (ilmarw@simula.no)
 
 Suggestions, bugfixes etc: 
-Anders Logg
-Ola Skavhaug
-Ilmar Wilbers
 Johan Hake
-
-
-
-
-
+Anders Logg
+Johannes Ring
+Ola Skavhaug

ChangeLog

@@ -1,4 +1,9 @@
 
+Release 0.9.7
+Use typemaps from the NumPy SWIG interface file (numpy.i),
+enabling the use of many new data types.
+Removed support for Numeric and numarray.
+	
 Release 0.9.6
 Minor update with some new utility functions required by FFC. 
 

TODO

@@ -23,57 +23,3 @@ TODO:
 - Add tests for all variants of cache mechanisms available now
 
 - Clean up imports, don't use import *
-
-Explain this in manual:
-
-    Use cases: (M - modulename, S - signature, C - enable_cache == True)
-    - 'MS'  - Invalid
-    
-    - 'M'   - Use given M and no cache, simply compile in current directory.
-              import_module(M) will work in the current directory, but always
-              using the version compiled first in this python process, because
-              of limitations in the Python extension module system.
-              The user can't change flags during the current python process lifetime!
-
-                use_cache = False
-                moduleids = []
-                
-                module_path = cwd
-                modulename = modulename
-                 
-                module = None # Depend on code checking checksum-file to avoid recompilation
-    
-    - 'S'   - Construct modulename from S, lookup in cache, place in cache after building.
-              Three options for this implementation:
-              Compiler args must be part of S for import_module(S) to work consistently.
-    
-                use_cache = True
-                moduleids = [signature, signature.signature(), compute_checksum(signature.signature())]
-                
-                module_path = temp_dir (copied after building)
-                modulename = modulename_from_checksum(compute_checksum(S)) # Or just S if valid filename?
-                
-                module = None # Depend on code checking checksum-file to avoid recompilation
-    
-    - ''    - Construct S from user file contents and compiler args, see 'S'.
-
-                signature = compute_signature_from_user_files(...)
-
-                use_cache = True
-                moduleids = [signature, signature.signature(), compute_checksum(signature.signature())]
-                
-                module_path = temp_dir (copied after building)
-                modulename = modulename_from_checksum(compute_checksum(S)) # Or just S if valid filename?
-                
-                module = None # Depend on code checking checksum-file to avoid recompilation
-    
-    I want to do:
-        b = jit(a, options)
-        b = jit(a, options)
-        -> signature = repr(a) + repr(options)
-        -> m = import_module(signature)
-        -> if not m: m = build_module(..., signature)
-        -> return m.myform()
-    and:
-        b = build_module(modulename, ...)
-        b = build_module(modulename, ...)

tests/test10.py

@@ -0,0 +1,110 @@
+#!/usr/bin/env python
+
+import numpy 
+import time
+from instant import inline_with_numpy
+
+# Example 1: two arrays, one in, one inout
+c_code = """
+double sum (int x1, int y1, int z1, double* array1, int x2, double* array2){
+  double tmp = 0.0; 
+  for (int i=0; i<x1; i++)
+    for (int j=0; j<y1; j++)
+      for (int k=0; k<z1; k++){
+        tmp += array1[i*y1*z1 + j*z1 + k];
+        array2[1] = 2;
+    }
+  return tmp; 
+}
+"""
+
+sum_func = inline_with_numpy(c_code, arrays = [['x1', 'y1', 'z1', 'array1'],
+                                               ['x2', 'array2', 'in']],
+                             cache_dir="test_ex1_cache")
+
+a = numpy.arange(27000); a = numpy.sin(a)
+c = a.copy()
+a.shape = (30, 30, 30)
+
+print 'b = (1,1)'
+b = (1., 1.)
+sum1 = sum_func(a, b)
+print b, 'b not changed when list'
+
+b = numpy.ones(2)
+sum1 = sum_func(a, b)
+print b, 'b not changed when numpy array'
+
+# Example 2: two array, both inout and of same size
+# Cannot avoid specifying all dimensions for both arrays
+c_code = """
+double sum (int x1, int y1, double* array1, int x2, int y2, double* array2){
+  double tmp = 0.0; 
+  for (int i=0; i<x1; i++)
+    for (int j=0; j<y1; j++){
+      tmp = array1[i*y1 + j];
+      array1[i*y1 + j] = array2[i*y1 + j];
+      array2[i*y1 + j] = tmp;
+    }
+  return tmp; 
+}
+"""
+
+sum_func = inline_with_numpy(c_code, arrays = [['x1', 'y1', 'array1'],
+                                               ['x2', 'y2', 'array2']],
+                             cache_dir="test_ex2_cache")
+
+a = numpy.ones(4)
+a.shape = (2, 2)
+b = a.copy()
+a *= 2
+
+sum1 = sum_func(a, b)
+print 'a and b changed'
+print a
+print b
+
+# Example 3: two arrays, one in, one out
+c_code = """
+void sum (int x1, int y1, double* array1, int xy2, double* array2){
+  for (int i=0; i<x1; i++)
+    for (int j=0; j<y1; j++)
+      array2[i*y1 + j] = array1[i*y1 + j]*2;
+}
+"""
+
+sum_func = inline_with_numpy(c_code, arrays = [['x1', 'y1', 'array1', 'in'],
+                                               ['xy2', 'array2', 'out']],
+                             cache_dir="test_ex3_cache")
+
+a = numpy.ones(4)
+a.shape = (2, 2)
+a *= 2
+
+c = sum_func(a, a.size)
+c.shape = a.shape
+print c
+
+# Example 4: three arrays, one in, one inout, and one out
+c_code = """
+void sum (int x1, int y1, long* array1, int x2, int* array2, int x3, double* array3){
+  for (int i=0; i<x1; i++){
+    array3[i] = 0;
+    for (int j=0; j<y1; j++)
+      array3[i] += array1[i*y1 + j]*array2[j];
+  }
+}
+"""
+
+sum_func = inline_with_numpy(c_code, arrays = [['x1', 'y1', 'array1', 'in', 'long'],
+                                               ['x2', 'array2', 'int'],
+                                               ['x3', 'array3', 'out', 'double']],
+                             cache_dir="test_ex4_cache")
+
+a = numpy.arange(9)#, dtype='int32')
+a.shape = (3, 3)
+b = numpy.arange(3)#, dtype='int32')
+
+c = sum_func(a, b, b.size)
+print c
+print numpy.dot(a, b)