diff --git a/evalhyd/evald.py b/evalhyd/evald.py index ba7d1eeb337ef4bd9f6dbc34008c4c87b70ad68a..7577cab2dde5f9418c2650ca3e2ec32b2169a0b7 100644 --- a/evalhyd/evald.py +++ b/evalhyd/evald.py @@ -1,7 +1,8 @@ from typing import List, Dict from numpy import dtype from numpy.typing import NDArray -import evalhyd.core + +from ._evalhyd import _evald def evald(q_obs: NDArray[dtype('float64')], @@ -15,6 +16,7 @@ def evald(q_obs: NDArray[dtype('float64')], bootstrap: Dict[str, int] = None, dts: List[str] = None) -> List[NDArray[dtype('float64')]]: """Function to evaluate determinist streamflow predictions""" + # required arguments kwargs = { # convect 1D array into 2D array view @@ -39,4 +41,4 @@ def evald(q_obs: NDArray[dtype('float64')], if dts is not None: kwargs['dts'] = dts - return evalhyd.core._evald(**kwargs) + return _evald(**kwargs) diff --git a/evalhyd/evalp.py b/evalhyd/evalp.py index 902f663bcc47957e5eb1cb85dadf3d9971e867f8..cb95229d930e845167eec033b9bc33e89c4911ec 100644 --- a/evalhyd/evalp.py +++ b/evalhyd/evalp.py @@ -1,7 +1,8 @@ from typing import List, Dict from numpy import dtype from numpy.typing import NDArray -import evalhyd.core + +from ._evalhyd import _evalp def evalp(q_obs: NDArray[dtype('float64')], @@ -13,6 +14,7 @@ def evalp(q_obs: NDArray[dtype('float64')], bootstrap: Dict[str, int] = None, dts: List[str] = None) -> List[NDArray[dtype('float64')]]: """Function to evaluate probabilist streamflow predictions""" + # required arguments kwargs = { 'q_obs': q_obs, @@ -32,4 +34,4 @@ def evalp(q_obs: NDArray[dtype('float64')], if dts is not None: kwargs['dts'] = dts - return evalhyd.core._evalp(**kwargs) + return _evalp(**kwargs) diff --git a/evalhyd/src/core.cpp b/evalhyd/src/evalhyd.cpp similarity index 99% rename from evalhyd/src/core.cpp rename to evalhyd/src/evalhyd.cpp index f6dea535da85bd5b354d46458cf1e3eadcc68f21..868fd7f2c4e534a23ffe1c707b894da2fc3de824 100644 --- a/evalhyd/src/core.cpp +++ b/evalhyd/src/evalhyd.cpp @@ -72,7 +72,7 @@ auto evalp( } // Python Module and Docstrings -PYBIND11_MODULE(core, m) +PYBIND11_MODULE(_evalhyd, m) { xt::import_numpy(); diff --git a/setup.py b/setup.py index cbfeb8214ef836af6be47172b9ad4a7aeaa550b5..f7664c00e6808ef35b398306a9ca604da45427d0 100644 --- a/setup.py +++ b/setup.py @@ -61,8 +61,8 @@ for dep, version, url in deps: # configure Python extension ext_modules = [ Pybind11Extension( - "evalhyd.core", - ['evalhyd/src/core.cpp'], + "evalhyd._evalhyd", + ['evalhyd/src/evalhyd.cpp'], include_dirs=[ numpy.get_include(), os.path.join(sys.prefix, 'include'),