numpy · charris · Jun 10, 2022 · Feb 12, 2022 · Feb 13, 2022 · Feb 13, 2022
diff --git a/benchmarks/benchmarks/bench_strings.py b/benchmarks/benchmarks/bench_strings.py
@@ -0,0 +1,45 @@
+from __future__ import absolute_import, division, print_function
+
+from .common import Benchmark
+
+import numpy as np
+import operator
+
+
+_OPERATORS = {
+    '==': operator.eq,
+    '!=': operator.ne,
+    '<': operator.lt,
+    '<=': operator.le,
+    '>': operator.gt,
+    '>=': operator.ge,
+}
+
+
+class StringComparisons(Benchmark):
+    # Basic string comparison speed tests
+    params = [
+        [100, 10000, (1000, 20)],
+        ['U', 'S'],
+        [True, False],
+        ['==', '!=', '<', '<=', '>', '>=']]
+    param_names = ['shape', 'dtype', 'contig', 'operator']
+    int64 = np.dtype(np.int64)
+
+    def setup(self, shape, dtype, contig, operator):
+        self.arr = np.arange(np.prod(shape)).astype(dtype).reshape(shape)
+        self.arr_identical = self.arr.copy()
+        self.arr_different = self.arr[::-1].copy()
+
+        if not contig:
+            self.arr = self.arr[..., ::2]
+            self.arr_identical = self.arr_identical[..., ::2]
+            self.arr_different = self.arr_different[..., ::2]
+
+        self.operator = _OPERATORS[operator]
+
+    def time_compare_identical(self, shape, dtype, contig, operator):
+        self.operator(self.arr, self.arr_identical)
+
+    def time_compare_different(self, shape, dtype, contig, operator):
+        self.operator(self.arr, self.arr_different)
diff --git a/numpy/core/include/numpy/experimental_dtype_api.h b/numpy/core/include/numpy/experimental_dtype_api.h
@@ -214,7 +214,7 @@ typedef struct {
 } PyArrayMethod_Spec;
 
 
-typedef PyObject *_ufunc_addloop_fromspec_func(
+typedef int _ufunc_addloop_fromspec_func(
         PyObject *ufunc, PyArrayMethod_Spec *spec);
 /*
  * The main ufunc registration function.  This adds a new implementation/loop

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -1082,6 +1082,7 @@ def generate_umath_doc_header(ext, build_dir):
             join('src', 'umath', 'scalarmath.c.src'),
             join('src', 'umath', 'ufunc_type_resolution.c'),
             join('src', 'umath', 'override.c'),
+            join('src', 'umath', 'string_ufuncs.cpp'),
             # For testing. Eventually, should use public API and be separate:
             join('src', 'umath', '_scaled_float_dtype.c'),
             ]

diff --git a/numpy/core/src/common/numpyos.h b/numpy/core/src/common/numpyos.h
@@ -1,6 +1,10 @@
 #ifndef NUMPY_CORE_SRC_COMMON_NPY_NUMPYOS_H_
 #define NUMPY_CORE_SRC_COMMON_NPY_NUMPYOS_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 NPY_NO_EXPORT char*
 NumPyOS_ascii_formatd(char *buffer, size_t buf_size,
                       const char *format,
@@ -39,4 +43,8 @@ NumPyOS_strtoll(const char *str, char **endptr, int base);
 NPY_NO_EXPORT npy_ulonglong
 NumPyOS_strtoull(const char *str, char **endptr, int base);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* NUMPY_CORE_SRC_COMMON_NPY_NUMPYOS_H_ */
diff --git a/numpy/core/src/multiarray/array_method.h b/numpy/core/src/multiarray/array_method.h
@@ -7,6 +7,9 @@
 #include <Python.h>
 #include <numpy/ndarraytypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef enum {
     /* Flag for whether the GIL is required */
@@ -249,6 +252,10 @@ PyArrayMethod_FromSpec(PyArrayMethod_Spec *spec);
  *       need better tests when a public version is exposed.
  */
 NPY_NO_EXPORT PyBoundArrayMethodObject *
-PyArrayMethod_FromSpec_int(PyArrayMethod_Spec *spec, int private);
+PyArrayMethod_FromSpec_int(PyArrayMethod_Spec *spec, int priv);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif  /* NUMPY_CORE_SRC_MULTIARRAY_ARRAY_METHOD_H_ */