Replacing endf c functions with package (#3101)

openmc-dev · Aug 14, 2024 · 3ef54ec · 3ef54ec
1 parent 346f751
commit 3ef54ec
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 75 deletions.
diff --git a/openmc/data/_endf.pyx b/openmc/data/_endf.pyx
diff --git a/openmc/data/endf.c b/openmc/data/endf.c
diff --git a/openmc/data/endf.py b/openmc/data/endf.py
@@ -14,11 +14,7 @@
 
 from .data import gnds_name
 from .function import Tabulated1D
-try:
-    from ._endf import float_endf
-    _CYTHON = True
-except ImportError:
-    _CYTHON = False
+from endf.records import float_endf
 
 
 _LIBRARY = {0: 'ENDF/B', 1: 'ENDF/A', 2: 'JEFF', 3: 'EFF',
@@ -91,10 +87,6 @@ def py_float_endf(s):
     return float(ENDF_FLOAT_RE.sub(r'\1e\2\3', s))
 
 
-if not _CYTHON:
-    float_endf = py_float_endf
-
-
 def int_endf(s):
     """Convert string of integer number in ENDF to int.
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -34,6 +34,7 @@ dependencies = [
     "lxml",
     "uncertainties",
     "setuptools",
+    "endf",
 ]
 
 [project.optional-dependencies]

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 
 kwargs = {
-    # Cython is used to add resonance reconstruction and fast float_endf
+    # Cython is used to add resonance reconstruction
     'ext_modules': cythonize('openmc/data/*.pyx'),
     'include_dirs': [np.get_include()]
 }