skip test_speed.py

Author: cadenmyers13

tests/test_speed.py

@@ -17,14 +17,23 @@
 import random
 
 import numpy
+import pytest
 
 import diffpy.srfit.equation.literals as literals
 import diffpy.srfit.equation.visitors as visitors
 
+pytestmark = pytest.mark.skip(
+    reason=(
+        "This is a performance benchmark test, "
+        "not a unit test. Comment out this line "
+        "to run performance testing."
+    )
+)
+
 x = numpy.arange(0, 20, 0.05)
 
 
-def makeLazyEquation(make_args):
+def make_lazy_equation(make_args):
     """Make a lazy equation and see how fast it is."""
 
     # Make some variables
@@ -72,7 +81,7 @@ def _f(a, b, c, d, e):
     return _f
 
 
-def makeEquation1():
+def make_equation1():
     """Make the same equation as the lazy one."""
 
     y = 50 * x
@@ -83,7 +92,7 @@ def _f(a, b, c, d, e):
     return _f
 
 
-def timeFunction(f, *args, **kw):
+def time_function(f, *args, **kw):
     """Time a function in ms."""
     import time
 
@@ -93,9 +102,9 @@ def timeFunction(f, *args, **kw):
     return (t2 - t1) * 1000
 
 
-def speedTest1():
-    f1 = makeLazyEquation()
-    f2 = makeEquation1()
+def test_speed1():
+    f1 = make_lazy_equation()
+    f2 = make_equation1()
 
     args = [3.1, 8.19973123410, 2.1, numpy.e, numpy.pi]
 
@@ -104,8 +113,8 @@ def speedTest1():
     for i in range(len(args)):
         args[i] = 10 * random.random()
         print("Changing argument %i" % (i + 1))
-        t1 = timeFunction(f1, *args)
-        t2 = timeFunction(f2, *args)
+        t1 = time_function(f1, *args)
+        t2 = time_function(f2, *args)
         total1 += t1
         total2 += t2
         print("lazy", t1)
@@ -117,7 +126,7 @@ def speedTest1():
     print("Ratio (lazy/regular)", total1 / total2)
 
 
-def speedTest2(mutate=2):
+def test_speed2(mutate=2):
 
     from diffpy.srfit.equation.builder import EquationFactory
 
@@ -176,8 +185,8 @@ def f(A0, qsig, sigma1, sigma2, b1, b2, b3, b4, b5, b6, b7, b8):
             args[idx] = random.random()
 
         # Time the different functions with these arguments
-        tnpy += timeFunction(f, *args)
-        teq += timeFunction(eq, *args)
+        tnpy += time_function(f, *args)
+        teq += time_function(eq, *args)
 
     print(
         "Average call time (%i calls, %i mutations/call):" % (numcalls, mutate)
@@ -189,7 +198,7 @@ def f(A0, qsig, sigma1, sigma2, b1, b2, b3, b4, b5, b6, b7, b8):
     return
 
 
-def speedTest3(mutate=2):
+def test_speed3(mutate=2):
     """Test wrt sympy.
 
     Results - sympy is 10 to 24 times faster without using arrays (ouch!).
@@ -265,8 +274,8 @@ def speedTest3(mutate=2):
             args[idx] = random.random()
 
         # Time the different functions with these arguments
-        teq += timeFunction(eq, *(args[:-1]))
-        tnpy += timeFunction(f, *args)
+        teq += time_function(eq, *(args[:-1]))
+        tnpy += time_function(f, *args)
 
     print(
         "Average call time (%i calls, %i mutations/call):" % (numcalls, mutate)
@@ -278,7 +287,7 @@ def speedTest3(mutate=2):
     return
 
 
-def speedTest4(mutate=2):
+def test_speed4(mutate=2):
     """Test wrt sympy.
 
     Results - sympy is 10 to 24 times faster without using arrays (ouch!).
@@ -310,7 +319,7 @@ def speedTest4(mutate=2):
     teq = 0
     # Randomly change variables
     numargs = len(eq.args)
-    choices = range(numargs)
+    choices = list(range(numargs))
     args = [1.0] * (len(eq.args))
     args.append(x)
 
@@ -329,8 +338,8 @@ def speedTest4(mutate=2):
             args[idx] = random.random()
 
         # Time the different functions with these arguments
-        teq += timeFunction(eq, *(args[:-1]))
-        tnpy += timeFunction(f, *args)
+        teq += time_function(eq, *(args[:-1]))
+        tnpy += time_function(f, *args)
 
     print(
         "Average call time (%i calls, %i mutations/call):" % (numcalls, mutate)
@@ -342,7 +351,7 @@ def speedTest4(mutate=2):
     return
 
 
-def weightedTest(mutate=2):
+def test_weighted(mutate=2):
     """Show the benefits of a properly balanced equation tree."""
 
     from diffpy.srfit.equation.builder import EquationFactory
@@ -379,7 +388,7 @@ def f(b1, b2, b3, b4, b5, b6, b7, b8):
     teq = 0
     # Randomly change variables
     numargs = len(eq.args)
-    choices = range(numargs)
+    choices = list(range(numargs))
     args = [0.1] * numargs
 
     # The call-loop
@@ -399,8 +408,8 @@ def f(b1, b2, b3, b4, b5, b6, b7, b8):
         # print(args)
 
         # Time the different functions with these arguments
-        teq += timeFunction(eq, *args)
-        tnpy += timeFunction(f, *args)
+        teq += time_function(eq, *args)
+        tnpy += time_function(f, *args)
 
     print(
         "Average call time (%i calls, %i mutations/call):" % (numcalls, mutate)
@@ -412,9 +421,9 @@ def f(b1, b2, b3, b4, b5, b6, b7, b8):
     return
 
 
-def profileTest():
+def test_profile():
 
-    from diffpy.srfit.builder import EquationFactory
+    from diffpy.srfit.equation.builder import EquationFactory
 
     factory = EquationFactory()
 
@@ -437,7 +446,7 @@ def profileTest():
 
     mutate = 8
     numargs = len(eq.args)
-    choices = range(numargs)
+    choices = list(range(numargs))
     args = [0.1] * numargs
 
     # The call-loop