switch fpdiv/test/test_fp*.py to use unittest

diff --git a/src/ieee754/fpdiv/test/test_fpdiv_pipe.py b/src/ieee754/fpdiv/test/test_fpdiv_pipe.py
index c0b521b66a5ac3904cc6a3ab7c6b66888af67939..451d979dac7bd48338f8f9ed14ee2c21ff914239 100644 (file)
--- a/src/ieee754/fpdiv/test/test_fpdiv_pipe.py
+++ b/src/ieee754/fpdiv/test/test_fpdiv_pipe.py
@@ -4,22 +4,24 @@
 from ieee754.fpdiv.pipeline import (FPDIVMuxInOut,)
 from ieee754.fpcommon.test.fpmux import runfp
 
+import unittest
 from sfpy import Float64, Float32, Float16
 from operator import truediv as div
 
-def test_pipe_div_fp16():
-    dut = FPDIVMuxInOut(16, 4)
-    runfp(dut, 16, "test_fpdiv_pipe_fp16", Float16, div)
 
-def test_pipe_div_fp32():
-    dut = FPDIVMuxInOut(32, 4)
-    runfp(dut, 32, "test_fpdiv_pipe_fp32", Float32, div)
+class TestDivPipe(unittest.TestCase):
+    def test_pipe_div_fp16(self):
+        dut = FPDIVMuxInOut(16, 4)
+        runfp(dut, 16, "test_fpdiv_pipe_fp16", Float16, div)
+
+    def test_pipe_div_fp32(self):
+        dut = FPDIVMuxInOut(32, 4)
+        runfp(dut, 32, "test_fpdiv_pipe_fp32", Float32, div)
+
+    def test_pipe_div_fp64(self):
+        dut = FPDIVMuxInOut(64, 4)
+        runfp(dut, 64, "test_fpdiv_pipe_fp64", Float64, div)
 
-def test_pipe_div_fp64():
-    dut = FPDIVMuxInOut(64, 4)
-    runfp(dut, 64, "test_fpdiv_pipe_fp64", Float64, div)
 
 if __name__ == '__main__':
-    test_pipe_div_fp16()
-    test_pipe_div_fp32()
-    test_pipe_div_fp64()
+    unittest.main()

diff --git a/src/ieee754/fpdiv/test/test_fpdiv_pipe_16.py b/src/ieee754/fpdiv/test/test_fpdiv_pipe_16.py
index b6ba0e2938bd2c7f4abae2d364dd01cf06ad0827..da617e9ea396f1ff4a690479809322ed172de024 100644 (file)
--- a/src/ieee754/fpdiv/test/test_fpdiv_pipe_16.py
+++ b/src/ieee754/fpdiv/test/test_fpdiv_pipe_16.py
@@ -6,13 +6,17 @@ from ieee754.fpcommon.test.case_gen import run_pipe_fp
 from ieee754.fpcommon.test import unit_test_half
 from ieee754.fpdiv.test.div_data16 import regressions
 
+import unittest
 from sfpy import Float16
 from operator import truediv as div
 
-def test_pipe_fp16():
-    dut = FPDIVMuxInOut(16, 4)
-    run_pipe_fp(dut, 16, "div16", unit_test_half, Float16,
-                   regressions, div, 10)
+
+class TestDivPipe(unittest.TestCase):
+    def test_pipe_fp16(self):
+        dut = FPDIVMuxInOut(16, 4)
+        run_pipe_fp(dut, 16, "div16", unit_test_half, Float16,
+                    regressions, div, 10)
+
 
 if __name__ == '__main__':
-    test_pipe_fp16()
+    unittest.main()

diff --git a/src/ieee754/fpdiv/test/test_fpdiv_pipe_32.py b/src/ieee754/fpdiv/test/test_fpdiv_pipe_32.py
index ddebfbce24b66fc724099204e320cf8e08269f9d..d79eddce880b602e04837ea4b1b7a612fd12a9f8 100644 (file)
--- a/src/ieee754/fpdiv/test/test_fpdiv_pipe_32.py
+++ b/src/ieee754/fpdiv/test/test_fpdiv_pipe_32.py
@@ -6,13 +6,17 @@ from ieee754.fpcommon.test.case_gen import run_pipe_fp
 from ieee754.fpcommon.test import unit_test_single
 from ieee754.fpdiv.test.div_data32 import regressions
 
+import unittest
 from sfpy import Float32
 from operator import truediv as div
 
-def test_pipe_fp32():
-    dut = FPDIVMuxInOut(32, 4)
-    run_pipe_fp(dut, 32, "div32", unit_test_single, Float32,
-                   regressions, div, 10)
+
+class TestDivPipe(unittest.TestCase):
+    def test_pipe_fp32(self):
+        dut = FPDIVMuxInOut(32, 4)
+        run_pipe_fp(dut, 32, "div32", unit_test_single, Float32,
+                    regressions, div, 10)
+
 
 if __name__ == '__main__':
-    test_pipe_fp32()
+    unittest.main()

diff --git a/src/ieee754/fpdiv/test/test_fprsqrt_pipe.py b/src/ieee754/fpdiv/test/test_fprsqrt_pipe.py
index 72e619b701248a914e8ddf09c2a784cb657544f7..d8e47235f3ed68c7a851173a046a4422077dccdc 100644 (file)
--- a/src/ieee754/fpdiv/test/test_fprsqrt_pipe.py
+++ b/src/ieee754/fpdiv/test/test_fprsqrt_pipe.py
@@ -4,27 +4,31 @@
 from ieee754.fpdiv.pipeline import (FPDIVMuxInOut,)
 from ieee754.fpcommon.test.fpmux import runfp
 
+import unittest
 from sfpy import Float64, Float32, Float16
 
+
 def rsqrt(x):
+    # FIXME: switch to correct implementation (rounding once)
     return x.__class__(1.0) / x.sqrt()
 
-def test_pipe_rsqrt_fp16():
-    dut = FPDIVMuxInOut(16, 4)
-    runfp(dut, 16, "test_fprsqrt_pipe_fp16", Float16, rsqrt,
-          single_op=True, opcode=2, n_vals=100)
 
-def test_pipe_rsqrt_fp32():
-    dut = FPDIVMuxInOut(32, 4)
-    runfp(dut, 32, "test_fprsqrt_pipe_fp32", Float32, rsqrt,
-          single_op=True, opcode=2, n_vals=100)
+class TestDivPipe(unittest.TestCase):
+    def test_pipe_rsqrt_fp16(self):
+        dut = FPDIVMuxInOut(16, 4)
+        runfp(dut, 16, "test_fprsqrt_pipe_fp16", Float16, rsqrt,
+              single_op=True, opcode=2, n_vals=100)
+
+    def test_pipe_rsqrt_fp32(self):
+        dut = FPDIVMuxInOut(32, 4)
+        runfp(dut, 32, "test_fprsqrt_pipe_fp32", Float32, rsqrt,
+              single_op=True, opcode=2, n_vals=100)
+
+    def test_pipe_rsqrt_fp64(self):
+        dut = FPDIVMuxInOut(64, 4)
+        runfp(dut, 64, "test_fprsqrt_pipe_fp64", Float64, rsqrt,
+              single_op=True, opcode=2, n_vals=100)
 
-def test_pipe_rsqrt_fp64():
-    dut = FPDIVMuxInOut(64, 4)
-    runfp(dut, 64, "test_fprsqrt_pipe_fp64", Float64, rsqrt,
-          single_op=True, opcode=2, n_vals=100)
 
 if __name__ == '__main__':
-    test_pipe_rsqrt_fp32()
-    test_pipe_rsqrt_fp16()
-    test_pipe_rsqrt_fp64()
+    unittest.main()

diff --git a/src/ieee754/fpdiv/test/test_fpsqrt_pipe.py b/src/ieee754/fpdiv/test/test_fpsqrt_pipe.py
index 38b1f3609a0f0715a113c9844b6eda8a011ed3ee..e474ba86d913f37452364b8971eab491bfef874e 100644 (file)
--- a/src/ieee754/fpdiv/test/test_fpsqrt_pipe.py
+++ b/src/ieee754/fpdiv/test/test_fpsqrt_pipe.py
@@ -4,27 +4,30 @@
 from ieee754.fpdiv.pipeline import (FPDIVMuxInOut,)
 from ieee754.fpcommon.test.fpmux import runfp
 
+import unittest
 from sfpy import Float64, Float32, Float16
 
+
 def sqrt(x):
     return x.sqrt()
 
-def test_pipe_sqrt_fp16():
-    dut = FPDIVMuxInOut(16, 4)
-    runfp(dut, 16, "test_fpsqrt_pipe_fp16", Float16, sqrt,
-          single_op=True, opcode=1, n_vals=100)
 
-def test_pipe_sqrt_fp32():
-    dut = FPDIVMuxInOut(32, 4)
-    runfp(dut, 32, "test_fpsqrt_pipe_fp32", Float32, sqrt,
-          single_op=True, opcode=1, n_vals=100)
+class TestDivPipe(unittest.TestCase):
+    def test_pipe_sqrt_fp16(self):
+        dut = FPDIVMuxInOut(16, 4)
+        runfp(dut, 16, "test_fpsqrt_pipe_fp16", Float16, sqrt,
+              single_op=True, opcode=1, n_vals=100)
+
+    def test_pipe_sqrt_fp32(self):
+        dut = FPDIVMuxInOut(32, 4)
+        runfp(dut, 32, "test_fpsqrt_pipe_fp32", Float32, sqrt,
+              single_op=True, opcode=1, n_vals=100)
+
+    def test_pipe_sqrt_fp64(self):
+        dut = FPDIVMuxInOut(64, 4)
+        runfp(dut, 64, "test_fpsqrt_pipe_fp64", Float64, sqrt,
+              single_op=True, opcode=1, n_vals=100)
 
-def test_pipe_sqrt_fp64():
-    dut = FPDIVMuxInOut(64, 4)
-    runfp(dut, 64, "test_fpsqrt_pipe_fp64", Float64, sqrt,
-          single_op=True, opcode=1, n_vals=100)
 
 if __name__ == '__main__':
-    test_pipe_sqrt_fp16()
-    test_pipe_sqrt_fp32()
-    test_pipe_sqrt_fp64()
+    unittest.main()