New file structure as recommended by pytest, python tests

tmtenbrink · Oct 14, 2021 · d1ac77d · d1ac77d
1 parent 0e870c8
commit d1ac77d
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /target
 Cargo.lock
 /.idea
-/rustfrc/__pycache__
-/rustfrc/*.so
+/python/rustfrc/__pycache__
+/rustfrc/*.so
+/tests/.pytest_cache
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,3 +15,6 @@ ndarray-rand = "~0.14"
 [dependencies.pyo3]
 version = "~0.14"
 features = ["extension-module"]
+
+[package.metadata.maturin]
+python-source = "python"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "rustfrc"
 version = "1.0.3"
-description = "Fast utility functions useful for Fourier Ring/Shell Correlation: binomial splitting of arrrays"
+description = "Fast utility functions useful for Fourier Ring/Shell Correlation: binomial splitting of arrays."
 readme = "README.md"
 requires-python = ">= 3.7"
 license = {text = "Apache-2.0"}
@@ -22,7 +22,7 @@ dependencies = [
 [tool.poetry]
 name = "rustfrc"
 version = "1.0.3"
-description = "Fast utility functions useful for Fourier Ring/Shell Correlation: binomial splitting of arrays"
+description = "Fast utility functions useful for Fourier Ring/Shell Correlation: binomial splitting of arrays."
 authors = ["Tip ten Brink <[email protected]>"]
 
 [tool.poetry.dependencies]

diff --git a/python/__init__.py b/python/__init__.py
diff --git a/python/__pycache__/__init__.cpython-39.pyc b/python/__pycache__/__init__.cpython-39.pyc
diff --git a/rustfrc/__init__.py → python/rustfrc/__init__.py b/rustfrc/__init__.py → python/rustfrc/__init__.py
diff --git a/python/rustfrc/rustfrc.cpython-39-x86_64-linux-gnu.so b/python/rustfrc/rustfrc.cpython-39-x86_64-linux-gnu.so
diff --git a/rustfrc/split.py → python/rustfrc/split.py b/rustfrc/split.py → python/rustfrc/split.py
diff --git a/test.py b/test.py
@@ -1,20 +1,20 @@
-import rustfrc as r
+from python import rustfrc as r
 import numpy as np
 import time
 
-init_x = (np.ones((900, 700, 100))*30).astype(np.int32)
+init_x = (np.ones((900, 700, 100))*24.31)
 init_y = (np.ones((900, 700, 100))*30).astype(np.int32)
 init_z = np.ones((900, 700, 50))*30
 
 
-start = time.perf_counter()
-x = r.binom_split(init_x)
-end = time.perf_counter()
-print(str(end - start) + " s")
-
-
-start2 = time.perf_counter()
-rng = np.random.default_rng()
-y = rng.binomial(init_y, 0.5)
-end2 = time.perf_counter()
-print(str(end2 - start2) + " s")
+# start = time.perf_counter()
+# x = r.binom_split(init_x)
+# end = time.perf_counter()
+# print(str(end - start) + " s")
+#
+#
+# start2 = time.perf_counter()
+# rng = np.random.default_rng()
+# y = rng.binomial(init_y, 0.5)
+# end2 = time.perf_counter()
+# print(str(end2 - start2) + " s")
diff --git a/tests/test_split.py b/tests/test_split.py
@@ -0,0 +1,21 @@
+import rustfrc
+import numpy as np
+import pytest
+
+
+def test_binom_split_negative():
+    a = np.ones((5, 5, 5))*20
+    a[3, 2, 1] = -1
+
+    with pytest.raises(ValueError):
+        rustfrc.binom_split(a)
+
+
+def test_binom_split_ok():
+    max_val = 15
+
+    a = np.ones((3, 7))*max_val
+    split_a = rustfrc.binom_split(a)
+
+    assert np.amax(split_a) <= max_val
+    assert np.amin(split_a) >= 0