Skip to content

REV: Revert "ENH: Implement string comparison ufuncs (or almost) " #21777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2022
Merged

REV: Revert "ENH: Implement string comparison ufuncs (or almost) " #21777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions benchmarks/benchmarks/bench_strings.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion numpy/core/include/numpy/experimental_dtype_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ typedef struct {
} PyArrayMethod_Spec;


typedef int _ufunc_addloop_fromspec_func(
typedef PyObject *_ufunc_addloop_fromspec_func(
PyObject *ufunc, PyArrayMethod_Spec *spec);
/*
* The main ufunc registration function. This adds a new implementation/loop
Expand Down
1 change: 0 additions & 1 deletion numpy/core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,6 @@ 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'),
]
Expand Down
8 changes: 0 additions & 8 deletions numpy/core/src/common/numpyos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#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,
Expand Down Expand Up @@ -43,8 +39,4 @@ 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_ */
9 changes: 1 addition & 8 deletions numpy/core/src/multiarray/array_method.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#include <Python.h>
#include <numpy/ndarraytypes.h>

#ifdef __cplusplus
extern "C" {
#endif

typedef enum {
/* Flag for whether the GIL is required */
Expand Down Expand Up @@ -252,10 +249,6 @@ 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 priv);

#ifdef __cplusplus
}
#endif
PyArrayMethod_FromSpec_int(PyArrayMethod_Spec *spec, int private);

#endif /* NUMPY_CORE_SRC_MULTIARRAY_ARRAY_METHOD_H_ */
Loading