Changeset 7280

Timestamp:

Jun 30, 2009, 4:27:06 PM (15 years ago)

Author:

ole

Message:

Backmerged changeset:7278 into misc using the command

svn merge -r 7277:HEAD ../branches/numpy_misc .

in anuga/misc

File:

• misc/tools/test_numpy_numeric/test_numpy_numeric.py (modified) (5 diffs)

misc/tools/test_numpy_numeric/test_numpy_numeric.py

@@ -18 +18 @@
 
 
-ARRAY_SIZE = 1000 * 1000
+#ARRAY_SIZE = 1000 * 1000
+ARRAY_SIZE = (40000, 3)
 
 
@@ -75 +76 @@
     This function is necessary as array(A) can cause memory overflow.
     """
-
-#    if isinstance(A, basestring):
-#        msg = 'Sorry, cannot handle strings in ensure_numeric()'
-#        raise Exception, msg
 
     if typecode is None:
@@ -150 +147 @@
 
 
+class Array(object):
+    def __init__(self, module, f):
+        self.array = module.ones(ARRAY_SIZE, f)
+        for i in xrange(ARRAY_SIZE[0]):
+            for j in xrange(ARRAY_SIZE[1]):
+                self.array[i, j] *= float(i)+j
+
 def test_usage(module, f, en, ls):
-    start_time = time.time()
     start_mem = mem_usage()
 
-    A = module.ones(ARRAY_SIZE, f)
-    B = module.ones(ARRAY_SIZE, f)
-    for i in xrange(ls):
-        A[i] *= float(i)
-        B[i] *= float(i)
+    A = Array(module, f)
+    B = Array(module, f)
+    C = Array(module, f)
+    D = module.ones(ARRAY_SIZE[1], f)
+
+    start_time = time.time()
 
     # do some numeric calculations
-    A = en(A)
-    B = en(B)
-    C = module.ones(ARRAY_SIZE, f)
-    C = en(C)
     for i in xrange(ls):
-        C = en(2.6*A + B + C + i)
+        for j in xrange(ARRAY_SIZE[0]):
+            for k in xrange(ARRAY_SIZE[1]):
+                D[0] = A.array[j, k]
+                D[1] = B.array[j, k]
+                D[2] = C.array[j, k]
 
     stop_mem = mem_usage()
@@ -174 +178 @@
     delta_mem = stop_mem - start_mem
 
-    del A, B, C
+    del A, B, C, D
     gc.collect()
 
     return (delta_time, delta_mem)
 
-for loop_size in (10, 100, 1000):
-    # Do numpy work
-    (t, m) = test_usage(numpy, numpy.float, numpy_ensure_numeric, loop_size)
-    print('  numpy %4d loops: %5.1f s, %d KiB' % (loop_size, t, m))
-
+#for loop_size in (10, 100, 1000):
+for loop_size in (10, 100):
     # Do Numeric work
     (t, m) = test_usage(Numeric, Numeric.Float, Numeric_ensure_numeric,
@@ -189 +190 @@
     print('Numeric %4d loops: %5.1f s, %d KiB' % (loop_size, t, m))
 
+    # Do numpy work
+    (t, m) = test_usage(numpy, numpy.float, numpy_ensure_numeric, loop_size)
+    print('  numpy %4d loops: %5.1f s, %d KiB' % (loop_size, t, m))
+