Fix fill segfaults and broadcasting misbehavior (#233)

* update to latest boost.histogram

* removing hot-fix

* another update

* fixed tests and added new tests for previous bug

Author: HDembinski

extern/histogram

@@ -265,10 +265,7 @@ register_histogram(py::module &m, const char *name, const char *desc) {
                              // specialization for string (HD: this is very inefficient
                              // and will be made more efficient in the future)
                              if(py::isinstance<py::str>(x))
-                                 // hot-fix, should be `v = py::cast<std::string>(x);`
-                                 // once the issue in boost::histogram is fixed
-                                 v = std::vector<std::string>(1,
-                                                              py::cast<std::string>(x));
+                                 v = py::cast<std::string>(x);
                              else if(py::isinstance<py::array>(x)) {
                                  if(py::cast<py::array>(x).ndim() != 1)
                                      throw std::invalid_argument(

include/boost/histogram/python/register_histogram.hpp

@@ -369,7 +369,6 @@ def test_out_of_range():
         h[4]
 
 
-# CLASSIC: This used to have variance
 def test_operators():
     h = bh.Histogram(bh.axis.Integer(0, 2))
     h.fill(0)
@@ -386,7 +385,6 @@ def test_operators():
         h + h2
 
 
-# CLASSIC: reduce_to -> project,
 def test_project():
     h = bh.Histogram(bh.axis.Integer(0, 2), bh.axis.Integer(1, 4))
     h.fill(0, 1)
@@ -535,11 +533,11 @@ def test_numpy_conversion_0():
 
 def test_numpy_conversion_1():
     # CLASSIC: was weight array
-    a = bh.Histogram(bh.axis.Integer(0, 3))
+    h = bh.Histogram(bh.axis.Integer(0, 3))
     for i in range(10):
-        a.fill(1, weight=3)
-    c = np.array(a)  # a copy
-    v = np.asarray(a)  # a view
+        h.fill(1, weight=3)
+    c = np.array(h)  # a copy
+    v = np.asarray(h)  # a view
     assert c.dtype == np.double  # CLASSIC: np.float64
     assert_array_equal(c, np.array((0, 30, 0)))
     assert_array_equal(v, c)
@@ -684,8 +682,8 @@ def ar(*args):
     with pytest.raises(ValueError):
         a.fill([1, 0, 2], [1, 1])
 
-    # This actually broadcasts
-    a.fill([1, 0], [1])
+    # this broadcasts
+    a.fill([1, 0], 1)
 
     with pytest.raises(IndexError):
         a[1]
@@ -742,9 +740,9 @@ def ar(*args):
     with pytest.raises(ValueError):
         a.fill((1, 2), weight=([1, 1], [2, 2]))
 
-    # CLASSIC: Used to fail
     a = bh.Histogram(bh.axis.Integer(0, 3))
-    a.fill((1, 2), weight=(1,))
+    # this broadcasts
+    a.fill((1, 2), weight=1)
     assert a[1] == 1.0
     assert a[2] == 1.0
 
@@ -793,7 +791,27 @@ def test_fill_with_sequence_2():
     assert b[1, bh.overflow] == 1
 
 
-## this segfaults
-# def test_fill_with_sequence_3():
-#     h = bh.Histogram(bh.axis.StrCategory([], growth=True), bh.axis.Integer(0, 1))
-#     h.fill(["1"], np.arange(2))
+def test_fill_with_sequence_3():
+    h = bh.Histogram(bh.axis.StrCategory([], growth=True))
+    h.fill("A")
+    # should use h.axes[...] once that is fixed
+    assert h._axis(0).size == 1
+    h.fill(["A"])
+    assert h._axis(0).size == 1
+    h.fill(["A", "B"])
+    assert h._axis(0).size == 2
+    assert_array_equal(h.view(True), [3, 1])
+
+
+def test_fill_with_sequence_4():
+    h = bh.Histogram(
+        bh.axis.StrCategory([], growth=True), bh.axis.Integer(0, 0, growth=True)
+    )
+    h.fill("1", np.arange(2))
+    # should use h.axes[...] once that is fixed
+    assert h._axis(0).size == 1
+    assert h._axis(1).size == 2
+    assert_array_equal(h.view(True), [[1, 1]])
+
+    with pytest.raises(ValueError):
+        h.fill(["1"], np.arange(2))  # lengths do not match