CPP histgram returns CPP axis now

Author: henryiii

boost_histogram/_internal/hist.py

@@ -29,11 +29,9 @@ def _arg_shortcut(item):
     elif isinstance(item, Axis):
         return item._ax
     else:
-        # TODO: This currently support raw axis object for old tests.
-        # Replace with:
-        # raise TypeError("Only axes supported in histogram constructor")
+        raise TypeError("Only axes supported in histogram constructor")
         # TODO: Currently segfaults if we pass in a non-axis to the C++ code
-        return cast(item, Axis)._ax
+        # Using the public interface above, this should never be possible.
 
 
 def _expand_ellipsis(indexes, rank):
@@ -71,7 +69,7 @@ def _compute_commonindex(hist, index, expand):
     # Allow [bh.loc(...)] to work
     for i in range(len(indexes)):
         if callable(indexes[i]):
-            indexes[i] = indexes[i](cast(hist.axis(i), Axis))
+            indexes[i] = indexes[i](cast(hist.axis(i), Axis, cpp=False))
         elif hasattr(indexes[i], "flow"):
             if indexes[i].flow == 1:
                 indexes[i] = hist.axis(i).size
@@ -203,14 +201,17 @@ def _axis(self, i):
         """
         Get N-th axis.
         """
-        return cast(self._hist.axis(i), Axis)
+        return cast(self._hist.axis(i), Axis, self._cpp_module)
 
     @property
     def _storage_type(self):
-        return cast(self._hist._storage_type, Storage, is_class=True)
+        return cast(
+            self._hist._storage_type, Storage, cpp=self._cpp_module, is_class=True
+        )
 
 
 class histogram(BaseHistogram):
+    _cpp_module = True
     axis = BaseHistogram._axis
 
     def rank(self):
@@ -260,6 +261,8 @@ def _project(self, *args):
 
 
 class Histogram(BaseHistogram):
+    _cpp_module = False
+
     @inject_signature("self, *axes, storage=Double()", locals={"Double": Double})
     def __init__(self, *args, **kwargs):
         super(Histogram, self).__init__(*args, **kwargs)

boost_histogram/_internal/utils.py

@@ -8,7 +8,7 @@ def cpp_module(cls):
     Simple decorator to declare a class to be in the cpp
     module.
     """
-    cls._cpp_mode = True
+    cls._cpp_module = True
     return cls
 
 
@@ -24,15 +24,20 @@ def register(*args):
     """
 
     def add_registration(cls):
+        if len(args) == 0:
+            cls._types = set()
+            return cls
+
         if not hasattr(cls, "_types"):
             cls._types = set()
+
         for cpp_type in args:
             if cpp_type in cls._types:
                 raise TypeError("You are trying to register {} again".format(cpp_type))
 
             cls._types.add(cpp_type)
-            if not hasattr(cls, "_cpp_mode"):
-                cls._cpp_mode = False
+            if not hasattr(cls, "_cpp_module"):
+                cls._cpp_module = False
             return cls
 
     return add_registration
@@ -59,7 +64,7 @@ def cast(cpp_object, parent_class, cpp=False, is_class=False):
         if (
             hasattr(canidate_class, "_types")
             and cpp_class in canidate_class._types
-            and canidate_class._cpp_mode == cpp
+            and canidate_class._cpp_module == cpp
         ):
             if is_class:
                 return canidate_class

boost_histogram/cpp/axis/__init__.py

@@ -4,14 +4,32 @@
 
 __all__ = ("options", "regular", "variable", "integer", "category", "transorm")
 
-from ...axis import (
-    options,
-    Regular as regular,
-    Variable as variable,
-    Integer as integer,
-    Category as category,
-)
-
-# TODO: Make these proper classes with proper names/module
+from ... import axis as _axis
+from ..._internal.utils import cpp_module as _cpp_module
 
+from ...axis import options
 from . import transform
+
+
+@_cpp_module
+class regular(_axis.Regular):
+    def __repr__(self):
+        return repr(self._ax)
+
+
+@_cpp_module
+class variable(_axis.Variable):
+    def __repr__(self):
+        return repr(self._ax)
+
+
+@_cpp_module
+class integer(_axis.Integer):
+    def __repr__(self):
+        return repr(self._ax)
+
+
+@_cpp_module
+class category(_axis.Category):
+    def __repr__(self):
+        return repr(self._ax)

tests/test_boost_histogram.py

@@ -27,3 +27,42 @@ def test_convert_bh():
 
     assert not hasattr(h, "axis")
     assert hasattr(h, "axes")
+
+
+def test_reprs():
+    # Mixing bh/bhc is fine; histogram correctly always returns matching axis,
+    # axis returns matching transform, etc.
+    h = bhc.histogram(bh.axis.Regular(4, 0, 4))
+    assert (
+        repr(h)
+        == """\
+histogram(regular(4, 0, 4, metadata="None", options=underflow | overflow))
+              +--------------------------------------------------------------+
+[-inf,   0) 0 |                                                              |
+[   0,   1) 0 |                                                              |
+[   1,   2) 0 |                                                              |
+[   2,   3) 0 |                                                              |
+[   3,   4) 0 |                                                              |
+[   4, inf) 0 |                                                              |
+              +--------------------------------------------------------------+
+"""
+    )
+
+    assert (
+        repr(h.axis(0))
+        == 'regular(4, 0, 4, metadata="None", options=underflow | overflow)'
+    )
+
+
+def test_axis_reprs():
+    ax = bhc.axis.regular(4, 0, 4)
+    assert repr(ax) == 'regular(4, 0, 4, metadata="None", options=underflow | overflow)'
+    assert repr(type(ax)) == "<class 'boost_histogram.cpp.axis.regular'>"
+
+
+def test_storage_repr():
+    pass  # TODO: Not implemented yet
+
+
+def test_transform_repr():
+    pass  # TODO: Not implemented yet