From 6b11ac46c56108748ca8b986ac0e7829cc30d955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 27 Jun 2024 16:23:57 +0200 Subject: [PATCH 1/2] BUILD Use NPY_NO_DEPRECATED_API to mirror setup.py --- sklearn/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sklearn/meson.build b/sklearn/meson.build index 8736669f14cdb..33936a08cacce 100644 --- a/sklearn/meson.build +++ b/sklearn/meson.build @@ -55,7 +55,11 @@ print(incdir) endif inc_np = include_directories(incdir_numpy) -np_dep = declare_dependency(include_directories: inc_np) +# Don't use the deprecated NumPy C API. Define this to a fixed version instead of +# NPY_API_VERSION in order not to break compilation for released SciPy versions +# when NumPy introduces a new deprecation. +numpy_no_deprecated_api = ['-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION'] +np_dep = declare_dependency(include_directories: inc_np, compile_args: numpy_no_deprecated_api) openmp_dep = dependency('OpenMP', language: 'c', required: false) From 25d618b9034afd3a02e2cd1bbe68581b513b8b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Thu, 27 Jun 2024 16:44:55 +0200 Subject: [PATCH 2/2] Use NPY_1_9_API_VERSION to follow Scipy --- sklearn/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/meson.build b/sklearn/meson.build index 33936a08cacce..4552082801337 100644 --- a/sklearn/meson.build +++ b/sklearn/meson.build @@ -58,7 +58,7 @@ inc_np = include_directories(incdir_numpy) # Don't use the deprecated NumPy C API. Define this to a fixed version instead of # NPY_API_VERSION in order not to break compilation for released SciPy versions # when NumPy introduces a new deprecation. -numpy_no_deprecated_api = ['-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION'] +numpy_no_deprecated_api = ['-DNPY_NO_DEPRECATED_API=NPY_1_9_API_VERSION'] np_dep = declare_dependency(include_directories: inc_np, compile_args: numpy_no_deprecated_api) openmp_dep = dependency('OpenMP', language: 'c', required: false)