Fixing Windows C++ data types for conda-forge Python 3.10 builds (#155)

* adding py310 test

* using pybind dtypes

* update dtypes in c++ file too

* cibuildwheel syntax

* windows cmd on gh actions

Author: dfm

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9"]
+        python-version: ["3.8", "3.9", "3.10"]
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - name: Clone the repo
@@ -26,15 +26,10 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Set up windows compilers
-        uses: ilammy/msvc-dev-cmd@v1
       - name: Install dependencies
         run: |
           python -m pip install -U pip pytest
           python -m pip install .
-        env:
-          DISTUTILS_USE_SDK: 1
-          MSSdk: 1
       - name: Run tests
         run: python -m pytest -v tests
 
@@ -71,14 +66,10 @@ jobs:
         with:
           submodules: true
           fetch-depth: 0
-      - uses: ilammy/msvc-dev-cmd@v1
-      - uses: joerick/cibuildwheel@v1.9.0
+      - uses: pypa/cibuildwheel@2.5.0
         env:
-          CIBW_BUILD: "cp3?-*"
-          CIBW_SKIP: "cp35-* *-win32 *-manylinux_i686"
+          CIBW_SKIP: "*-win32 *-manylinux_i686"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          DISTUTILS_USE_SDK: 1
-          MSSdk: 1
       - uses: actions/upload-artifact@v2
         with:
           path: ./wheelhouse/*.whl

src/george/include/george/parser.h

@@ -111,7 +111,7 @@ kernels::Kernel* parse_kernel_spec (const py::object& kernel_spec) {
       py::function f = py::function(metric.attr("get_parameter_vector"));
       py::array_t<double> vector = py::array_t<double>(f(true));
       auto data = vector.unchecked<1>();
-      for (ssize_t i = 0; i < data.shape(0); ++i) {
+      for (py::ssize_t i = 0; i < data.shape(0); ++i) {
         kernel->set_metric_parameter(i, data(i));
       }
 
@@ -172,7 +172,7 @@ kernels::Kernel* parse_kernel_spec (const py::object& kernel_spec) {
       py::function f = py::function(metric.attr("get_parameter_vector"));
       py::array_t<double> vector = py::array_t<double>(f(true));
       auto data = vector.unchecked<1>();
-      for (ssize_t i = 0; i < data.shape(0); ++i) {
+      for (py::ssize_t i = 0; i < data.shape(0); ++i) {
         kernel->set_metric_parameter(i, data(i));
       }
 
@@ -290,7 +290,7 @@ kernels::Kernel* parse_kernel_spec (const py::object& kernel_spec) {
       py::function f = py::function(metric.attr("get_parameter_vector"));
       py::array_t<double> vector = py::array_t<double>(f(true));
       auto data = vector.unchecked<1>();
-      for (ssize_t i = 0; i < data.shape(0); ++i) {
+      for (py::ssize_t i = 0; i < data.shape(0); ++i) {
         kernel->set_metric_parameter(i, data(i));
       }
 
@@ -390,7 +390,7 @@ kernels::Kernel* parse_kernel_spec (const py::object& kernel_spec) {
       py::function f = py::function(metric.attr("get_parameter_vector"));
       py::array_t<double> vector = py::array_t<double>(f(true));
       auto data = vector.unchecked<1>();
-      for (ssize_t i = 0; i < data.shape(0); ++i) {
+      for (py::ssize_t i = 0; i < data.shape(0); ++i) {
         kernel->set_metric_parameter(i, data(i));
       }
 
@@ -451,7 +451,7 @@ kernels::Kernel* parse_kernel_spec (const py::object& kernel_spec) {
       py::function f = py::function(metric.attr("get_parameter_vector"));
       py::array_t<double> vector = py::array_t<double>(f(true));
       auto data = vector.unchecked<1>();
-      for (ssize_t i = 0; i < data.shape(0); ++i) {
+      for (py::ssize_t i = 0; i < data.shape(0); ++i) {
         kernel->set_metric_parameter(i, data(i));
       }
 

src/george/kernel_interface.cpp

@@ -48,7 +48,7 @@ Docs...
     auto x1p = x1.unchecked<2>();
     auto x2p = x2.unchecked<2>();
     size_t n1 = x1p.shape(0), n2 = x2p.shape(0);
-    if (x1p.shape(1) != ssize_t(self.ndim()) || x2p.shape(1) != ssize_t(self.ndim())) throw george::dimension_mismatch();
+    if (x1p.shape(1) != py::ssize_t(self.ndim()) || x2p.shape(1) != py::ssize_t(self.ndim())) throw george::dimension_mismatch();
     py::array_t<double> result({n1, n2});
     auto resultp = result.mutable_unchecked<2>();
     for (size_t i = 0; i < n1; ++i) {
@@ -62,7 +62,7 @@ Docs...
   interface.def("value_symmetric", [](KernelInterface& self, py::array_t<double> x) {
     auto xp = x.unchecked<2>();
     size_t n = xp.shape(0);
-    if (xp.shape(1) != ssize_t(self.ndim())) throw george::dimension_mismatch();
+    if (xp.shape(1) != py::ssize_t(self.ndim())) throw george::dimension_mismatch();
     py::array_t<double> result({n, n});
     auto resultp = result.mutable_unchecked<2>();
     for (size_t i = 0; i < n; ++i) {
@@ -80,7 +80,7 @@ Docs...
     auto x1p = x1.unchecked<2>();
     auto x2p = x2.unchecked<2>();
     size_t n = x1p.shape(0);
-    if (ssize_t(n) != x2p.shape(0) || x1p.shape(1) != ssize_t(self.ndim()) || x2p.shape(1) != ssize_t(self.ndim())) throw george::dimension_mismatch();
+    if (py::ssize_t(n) != x2p.shape(0) || x1p.shape(1) != py::ssize_t(self.ndim()) || x2p.shape(1) != py::ssize_t(self.ndim())) throw george::dimension_mismatch();
     py::array_t<double> result(n);
     auto resultp = result.mutable_unchecked<1>();
     for (size_t i = 0; i < n; ++i) {
@@ -93,7 +93,7 @@ Docs...
     auto x1p = x1.unchecked<2>();
     auto x2p = x2.unchecked<2>();
     size_t n1 = x1p.shape(0), n2 = x2p.shape(0), size = self.size();
-    if (x1p.shape(1) != ssize_t(self.ndim()) || x2p.shape(1) != ssize_t(self.ndim())) throw george::dimension_mismatch();
+    if (x1p.shape(1) != py::ssize_t(self.ndim()) || x2p.shape(1) != py::ssize_t(self.ndim())) throw george::dimension_mismatch();
     py::array_t<double> result({n1, n2, size});
     auto resultp = result.mutable_unchecked<3>();
     auto w = which.unchecked<1>();
@@ -109,7 +109,7 @@ Docs...
   interface.def("gradient_symmetric", [](KernelInterface& self, py::array_t<unsigned> which, py::array_t<double> x) {
     auto xp = x.unchecked<2>();
     size_t n = xp.shape(0), size = self.size();
-    if (xp.shape(1) != ssize_t(self.ndim())) throw george::dimension_mismatch();
+    if (xp.shape(1) != py::ssize_t(self.ndim())) throw george::dimension_mismatch();
     py::array_t<double> result({n, n, size});
     auto resultp = result.mutable_unchecked<3>();
     auto w = which.unchecked<1>();
@@ -128,7 +128,7 @@ Docs...
     auto x1p = x1.unchecked<2>();
     auto x2p = x2.unchecked<2>();
     size_t n1 = x1p.shape(0), n2 = x2p.shape(0), ndim = self.ndim();
-    if (x1p.shape(1) != ssize_t(ndim) || x2p.shape(1) != ssize_t(ndim)) throw george::dimension_mismatch();
+    if (x1p.shape(1) != py::ssize_t(ndim) || x2p.shape(1) != py::ssize_t(ndim)) throw george::dimension_mismatch();
     py::array_t<double> result({n1, n2, ndim});
     auto resultp = result.mutable_unchecked<3>();
     for (size_t i = 0; i < n1; ++i) {
@@ -144,7 +144,7 @@ Docs...
     auto x1p = x1.unchecked<2>();
     auto x2p = x2.unchecked<2>();
     size_t n1 = x1p.shape(0), n2 = x2p.shape(0), ndim = self.ndim();
-    if (x1p.shape(1) != ssize_t(ndim) || x2p.shape(1) != ssize_t(ndim)) throw george::dimension_mismatch();
+    if (x1p.shape(1) != py::ssize_t(ndim) || x2p.shape(1) != py::ssize_t(ndim)) throw george::dimension_mismatch();
     py::array_t<double> result({n1, n2, ndim});
     auto resultp = result.mutable_unchecked<3>();
     for (size_t i = 0; i < n1; ++i) {

templates/parser.h

@@ -100,7 +100,7 @@ kernels::Kernel* parse_kernel_spec (const py::object& kernel_spec) {
       py::function f = py::function(metric.attr("get_parameter_vector"));
       py::array_t<double> vector = py::array_t<double>(f(true));
       auto data = vector.unchecked<1>();
-      for (ssize_t i = 0; i < data.shape(0); ++i) {
+      for (py::ssize_t i = 0; i < data.shape(0); ++i) {
         kernel->set_metric_parameter(i, data(i));
       }