fix: wheel building exposed ssize_t issue

Author: henryiii

.github/workflows/wheels.yml

@@ -19,7 +19,7 @@ on:
 
 env:
   SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.overrideVersion }}
-  CIBW_ENVIRONMENT: "PIP_ONLY_BINARY=numpy SETUPTOOLS_SCM_PRETEND_VERSION=${{ github.event.inputs.overrideVersion }}"
+  CIBW_ENVIRONMENT: "PIP_PREFER_BINARY=1 SETUPTOOLS_SCM_PRETEND_VERSION=${{ github.event.inputs.overrideVersion }}"
 
 jobs:
   build_sdist:
@@ -81,12 +81,16 @@ jobs:
       matrix:
         os: [windows-latest, macos-latest, ubuntu-latest]
         arch: [auto64]
-        build: ["*"]
+        build: ["?p3?-* *macos* *win*"]
+        CIBW_MANYLINUX_X86_64_IMAGE: [manylinux2010]
+        CIBW_MANYLINUX_I686_IMAGE: [manylinux2010]
 
         include:
           - os: ubuntu-latest
             arch: auto32
-            build: "*"
+            build: "?p3?-*"
+            CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
+            CIBW_MANYLINUX_I686_IMAGE: manylinux2010
 
           - os: ubuntu-latest
             type: ManyLinux1
@@ -95,6 +99,13 @@ jobs:
             CIBW_MANYLINUX_X86_64_IMAGE: skhep/manylinuxgcc-x86_64
             CIBW_MANYLINUX_I686_IMAGE: skhep/manylinuxgcc-i686
 
+          - os: ubuntu-latest
+            type: ManyLinux2014
+            arch: auto
+            build: "cp310-*"
+            CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+            CIBW_MANYLINUX_I686_IMAGE: manylinux2014
+
           - os: macos-latest
             arch: universal2
             build: "*"

include/bh_python/histogram.hpp

@@ -31,11 +31,11 @@ namespace detail {
 template <class Axes, class T>
 py::buffer_info make_buffer_impl(const Axes& axes, bool flow, T* ptr) {
     // strides are in bytes
-    auto shape     = bh::detail::make_stack_buffer<ssize_t>(axes);
-    auto strides   = bh::detail::make_stack_buffer<ssize_t>(axes);
-    ssize_t stride = sizeof(T);
-    unsigned rank  = 0;
-    char* start    = reinterpret_cast<char*>(ptr);
+    auto shape         = bh::detail::make_stack_buffer<py::ssize_t>(axes);
+    auto strides       = bh::detail::make_stack_buffer<py::ssize_t>(axes);
+    py::ssize_t stride = sizeof(T);
+    unsigned rank      = 0;
+    char* start        = reinterpret_cast<char*>(ptr);
     bh::detail::for_each_axis(axes, [&](const auto& axis) {
         const bool underflow
             = bh::axis::traits::options(axis) & bh::axis::option::underflow;

include/bh_python/pybind11.hpp

@@ -45,15 +45,15 @@ std::string shift_to_string(const T& x) {
 }
 
 template <class Obj>
-void unchecked_set_impl(std::true_type, py::tuple& tup, ssize_t i, Obj&& obj) {
+void unchecked_set_impl(std::true_type, py::tuple& tup, py::ssize_t i, Obj&& obj) {
     // PyTuple_SetItem steals a reference to 'val'
     if(PyTuple_SetItem(tup.ptr(), i, obj.release().ptr()) != 0) {
         throw py::error_already_set();
     }
 }
 
 template <class T>
-void unchecked_set_impl(std::false_type, py::tuple& tup, ssize_t i, T&& t) {
+void unchecked_set_impl(std::false_type, py::tuple& tup, py::ssize_t i, T&& t) {
     unchecked_set_impl(std::true_type{}, tup, i, py::cast(std::forward<T>(t)));
 }
 
@@ -62,6 +62,6 @@ template <class T>
 void unchecked_set(py::tuple& tup, std::size_t i, T&& t) {
     unchecked_set_impl(std::is_base_of<py::object, std::decay_t<T>>{},
                        tup,
-                       static_cast<ssize_t>(i),
+                       static_cast<py::ssize_t>(i),
                        std::forward<T>(t));
 }

pyproject.toml

@@ -84,5 +84,5 @@ ignore = [
 [tool.cibuildwheel]
 test-extras = "test"
 test-command = "pytest {project}/tests"
-test-skip = ["pp*macos*", "pp*win*", "*universal2:arm64"]
+test-skip = ["pp*macos*", "pp*win*", "*universal2:arm64", "cp310*macos*"]
 skip = ["pp*-manylinux_i686"]  # not supported by NumPy