made numpy an optional install

Aspidites/math.py

@@ -6,10 +6,13 @@
 from math import inf, isinf, nan, isnan
 from math import factorial
 import numbers
-import numpy as np
-from .api import Warn
+try:
+    import numpy as np
+    Numeric = Union[int, float, complex, np.number]
+except ModuleNotFoundError:
+    Numeric = Union[int, float, complex]
 
-Numeric = Union[int, float, complex, np.number]
+from .api import Warn
 
 
 class Undefined:

Aspidites/templates.py

@@ -108,7 +108,11 @@
 from setuptools import setup, Extension
 from Cython.Build import cythonize, BuildExecutable
 from Cython.Compiler import Options
-import numpy
+try:
+    from numpy import get_include
+except:
+    def get_include():
+        return sysconfig.get_config_vars()['CONFINCLUDEPY']
 Options.annotate=$annotate
 Options.annotate_coverage_xml=$annotate_coverage_xml
 Options.buffer_max_dims=$buffer_max_dims
@@ -128,7 +132,7 @@
 Options.lookup_module_cpdef=$lookup_module_cpdef
 Options.embed=$embed
 exts=[Extension('$app_name',['$src_file'],include_dirs=$inc_dirs,libraries=$libs,extra_compile_args=['-Wall','-O2'],library_dirs=$lib_dirs),]
-setup(name='$app_name',ext_modules=cythonize(exts,include_path=[numpy.get_include()]))
+setup(name='$app_name',ext_modules=cythonize(exts,include_path=[get_include()]))
 if Options.embed: BuildExecutable.build('$src_file')
 
 """)

Aspidites/tests/test_math.py

@@ -93,9 +93,13 @@ def test_undefined_sanity():
     with pytest.raises(TypeError):
         from math import isnan
         assert isnan(complex(Undefined())) == isnan(complex(nan))
-    from numpy import isnan
-    assert isnan(complex(Undefined())) == isnan(complex(nan))
-    del isnan
+    try:
+        from numpy import isnan
+    except:
+        pass
+    else:
+        assert isnan(complex(Undefined())) == isnan(complex(nan))
+        del isnan
     from math import isnan
     assert isnan(float(Undefined())) == isnan(float(nan))
     assert Surely() == Surely()

Aspidites/woma/library.wom

@@ -18,3 +18,6 @@
 
 (mul(x = 0 -> number; y = 0 -> number)) number
 	<*> x * y
+
+(neg(x = 0 -> number)) number
+    <*> -x

dev/scripts/cprofile_to_csv.py

@@ -0,0 +1,19 @@
+import cProfile
+import pstats
+import io
+import csv
+
+
+def prof_to_csv(prof):
+    out_stream = io.StringIO()
+    pstats.Stats(prof, stream=out_stream).print_stats()
+    result = out_stream.getvalue()
+    # chop off header lines
+    result = 'ncalls' + result.split('ncalls')[-1]
+    lines = [','.join(line.rstrip().split(None, 5)) for line in result.split('\n')]
+    return '\n'.join(lines)
+
+
+if __name__ == '__main__':
+    with open('combined.csv', 'w') as out:
+        print(prof_to_csv('combined.prof'), file=out)

pyproject.toml

@@ -1,2 +1,2 @@
 [build-system]
-requires = ["setuptools", "wheel", "Cython", "numpy", "pytest", "future"]
+requires = ["setuptools", "wheel", "Cython", "pytest", "future"]