chore: use boost 1.80+ (#802)

* chore: use boost 1.80 Signed-off-by: Henry Schreiner <[email protected]> * chore: drop workaround for bug in boost-histogram <1.80 Signed-off-by: Henry Schreiner <[email protected]> * chore: remove numpy axis Signed-off-by: Henry Schreiner <[email protected]> * WIP: use native axis for numpy Signed-off-by: Henry Schreiner <[email protected]> * fix: restore regular_numpy, without a way to create it Signed-off-by: Henry Schreiner <[email protected]> style: pre-commit fixes --------- Signed-off-by: Henry Schreiner <[email protected]>
scikit-hep · Aug 14, 2023 · 728a1cd · 728a1cd
1 parent 5c5473f
commit 728a1cd
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 32 deletions.
diff --git a/extern/assert b/extern/assert
diff --git a/extern/config b/extern/config
diff --git a/extern/core b/extern/core
diff --git a/extern/histogram b/extern/histogram
diff --git a/extern/mp11 b/extern/mp11
diff --git a/extern/pybind11 b/extern/pybind11
diff --git a/extern/throw_exception b/extern/throw_exception
diff --git a/extern/variant2 b/extern/variant2
diff --git a/include/bh_python/axis.hpp b/include/bh_python/axis.hpp
@@ -219,7 +219,10 @@ py::array_t<double> edges(const A& ax, bool flow = false, bool numpy_upper = fal
         for(index_type i = -underflow; i <= ax.size() + overflow; ++i)
             edges.mutable_at(i + underflow) = ax.value(i);
 
-        if(numpy_upper && !std::is_same<A, axis::regular_numpy>::value) {
+        if(numpy_upper
+           && !(std::is_same<A, axis::regular_none>::value
+                || std::is_same<A, axis::regular_uflow>::value
+                || std::is_same<A, axis::regular_numpy>::value)) {
             edges.mutable_at(ax.size() + underflow) = std::nextafter(
                 edges.at(ax.size() + underflow), std::numeric_limits<double>::min());
         }

diff --git a/src/boost_histogram/_core/axis/__init__.pyi b/src/boost_histogram/_core/axis/__init__.pyi
@@ -57,7 +57,6 @@ class regular_oflow(_BaseRegular): ...
 class regular_uoflow(_BaseRegular): ...
 class regular_uoflow_growth(_BaseRegular): ...
 class regular_circular(_BaseRegular): ...
-class regular_numpy(_BaseRegular): ...
 
 class regular_pow(_BaseRegular):
     def __init__(self, bins: int, start: float, stop: float, power: float) -> None: ...

diff --git a/src/boost_histogram/_internal/axis.py b/src/boost_histogram/_internal/axis.py
@@ -259,7 +259,6 @@ def widths(self) -> np.typing.NDArray[Any]:
         ca.regular_uflow,
         ca.regular_oflow,
         ca.regular_none,
-        ca.regular_numpy,
         ca.regular_pow,
         ca.regular_trans,
         ca.regular_circular,

diff --git a/src/boost_histogram/_internal/hist.py b/src/boost_histogram/_internal/hist.py
@@ -791,9 +791,6 @@ def sum(self, flow: bool = False) -> float | Accumulator:
         """
         Compute the sum over the histogram bins (optionally including the flow bins).
         """
-        if any(x == 0 for x in (self.axes.extent if flow else self.axes.size)):
-            return self.storage_type.accumulator()
-
         return self._hist.sum(flow)  # type: ignore[no-any-return]
 
     @property

diff --git a/src/boost_histogram/numpy.py b/src/boost_histogram/numpy.py
@@ -13,12 +13,9 @@
 
 import numpy as np
 
-from boost_histogram import _core
-
 from . import axis as _axis
 from . import storage as _storage
 from ._internal import hist as _hist
-from ._internal.utils import cast as _cast
 
 __all__ = ("histogram", "histogram2d", "histogramdd")
 
@@ -69,16 +66,17 @@ def histogramdd(
     if range is None:
         range = (None,) * rank
 
-    axs = []
+    axs: list[_axis.Axis] = []
     for n, (b, r) in enumerate(zip(bins, range)):
         if np.issubdtype(type(b), np.integer):
             if r is None:
                 # Nextafter may affect bin edges slightly
                 r = (np.amin(a[n]), np.amax(a[n]))  # noqa: PLW2901
                 if r[0] == r[1]:
                     r = (r[0] - 0.5, r[1] + 0.5)  # noqa: PLW2901
-            cpp_ax = _core.axis.regular_numpy(typing.cast(int, b), r[0], r[1])
-            new_ax = _cast(None, cpp_ax, _axis.Axis)
+            new_ax = _axis.Regular(
+                typing.cast(int, b), r[0], r[1], underflow=False, overflow=False
+            )
             axs.append(new_ax)
         else:
             barr: np.typing.NDArray[Any] = np.asarray(b, dtype=np.double)

diff --git a/tests/test_pickle.py b/tests/test_pickle.py
@@ -80,10 +80,9 @@ def test_accumulators(accum, args, copy_fn):
     (bh.axis.StrCategory, (["1", "2", "3"],), {}),
     (bh.axis.StrCategory, (["1", "2", "3"],), {"growth": True}),
 ]
-raw_axes_creations = [(bh._core.axis.regular_numpy, (4, 2, 4), {})]
 
 
-@pytest.mark.parametrize(("axis", "args", "opts"), axes_creations + raw_axes_creations)
+@pytest.mark.parametrize(("axis", "args", "opts"), axes_creations)
 def test_axes(axis, args, opts, copy_fn):
     orig = axis(*args, **opts)
     new = copy_fn(orig)
@@ -188,16 +187,6 @@ def test_histogram_metadata(copy_fn, metadata):
     assert hist == new
 
 
-def test_numpy_edge(copy_fn):
-    ax1 = bh._core.axis.regular_numpy(10, 0, 1)
-    ax2 = copy_fn(ax1)
-
-    # stop defaults to 0, so this fails if the copy fails
-    assert ax1 == ax2
-    assert ax1.index(1) == ax2.index(1)
-    assert ax2.index(1) == 9
-
-
 @pytest.mark.skipif(
     platform.python_implementation() == "PyPy",
     reason="Not remotely supported on PyPY, hangs forever",