[Numpy-svn] r3861 - trunk/numpy/f2py

numpy-svn@scip... numpy-svn@scip...
Thu Jun 7 00:51:20 CDT 2007


Author: cookedm
Date: 2007-06-07 00:51:11 -0500 (Thu, 07 Jun 2007)
New Revision: 3861

Modified:
   trunk/numpy/f2py/f2py_testing.py
Log:
f2py_testing: remove jiffies, memusage definitions. Use numpy.testing.util versions instead


Modified: trunk/numpy/f2py/f2py_testing.py
===================================================================
--- trunk/numpy/f2py/f2py_testing.py	2007-06-05 18:54:28 UTC (rev 3860)
+++ trunk/numpy/f2py/f2py_testing.py	2007-06-07 05:51:11 UTC (rev 3861)
@@ -1,5 +1,7 @@
 import os,sys,re,time
 
+from numpy.testing.utils import jiffies, memusage
+
 def cmdline():
     m=re.compile(r'\A\d+\Z')
     args = []
@@ -12,38 +14,6 @@
     f2py_opts = ' '.join(args)
     return repeat,f2py_opts
 
-if sys.platform[:5]=='linux':
-    def jiffies(_proc_pid_stat = '/proc/%s/stat'%(os.getpid()),
-                _load_time=time.time()):
-        """ Return number of jiffies (1/100ths of a second) that this
-        process has been scheduled in user mode. See man 5 proc. """
-        try:
-            f=open(_proc_pid_stat,'r')
-            l = f.readline().split(' ')
-            f.close()
-            return int(l[13])
-        except:
-            return int(100*(time.time()-_load_time))
-
-    def memusage(_proc_pid_stat = '/proc/%s/stat'%(os.getpid())):
-        """ Return virtual memory size in bytes of the running python.
-        """
-        try:
-            f=open(_proc_pid_stat,'r')
-            l = f.readline().split(' ')
-            f.close()
-            return int(l[22])
-        except:
-            return
-else:
-    def jiffies(_load_time=time.time()):
-        """ Return number of jiffies (1/100ths of a second) that this
-    process has been scheduled in user mode. [Emulation with time.time]. """
-        return int(100*(time.time()-_load_time))
-
-    def memusage():
-        pass
-
 def run(runtest,test_functions,repeat=1):
     l = [(t,repr(t.__doc__.split('\n')[1].strip())) for t in test_functions]
     #l = [(t,'') for t in test_functions]



More information about the Numpy-svn mailing list