Merge pull request #6 from dmcguire81/bugfix/python37_hangs

Update to pybind11 v2.3.0 which fixes 3.7-related GIL mismanagement
illinois · Nov 20, 2022 · 5946b38 · 5946b38
2 parents 3a02eb2 + 74b3ad4
commit 5946b38
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/deps/pybind11 b/deps/pybind11
diff --git a/include/metapy_identifiers.h b/include/metapy_identifiers.h
@@ -24,7 +24,7 @@ struct identifier_caster
     using underlying_type = typename Type::underlying_type;
     using type_conv = make_caster<underlying_type>;
 
-    PYBIND11_TYPE_CASTER(Type, _("id[") + type_conv::name() + _("]"));
+    PYBIND11_TYPE_CASTER(Type, _("id[") + type_conv::name + _("]"));
 
     bool load(handle src, bool convert)
     {

diff --git a/include/metapy_index.h b/include/metapy_index.h
@@ -56,10 +56,7 @@ struct type_caster<meta::index::search_result>
         return result.release();
     }
 
-    static PYBIND11_DESCR name()
-    {
-        return type_descr(_("SearchResult"));
-    }
+    static constexpr auto name = _("SearchResult");
 
     static handle cast(const meta::index::search_result* sr,
                        return_value_policy policy, handle parent)

diff --git a/include/metapy_probe_map.h b/include/metapy_probe_map.h
@@ -62,8 +62,8 @@ struct probe_map_caster
         return d.release();
     }
 
-    PYBIND11_TYPE_CASTER(type, _("dict<") + key_conv::name() + _(", ")
-                                   + value_conv::name() + _(">"));
+    PYBIND11_TYPE_CASTER(type, _("dict<") + key_conv::name + _(", ")
+                                   + value_conv::name + _(">"));
 };
 
 template <class Key, class Value, class ProbingStrategy, class Hash,

diff --git a/src/metapy_embeddings.cpp b/src/metapy_embeddings.cpp
@@ -41,7 +41,7 @@ void metapy_bind_embeddings(py::module& m)
                     query,
                 std::size_t k) {
                  util::array_view<const double> avquery{query.data(),
-                                                        query.size()};
+                                                        static_cast<std::size_t>(query.size())};
                  auto scores = self.top_k(avquery, k);
 
                  std::vector<py::tuple> result;