BLD Add missing OpenMP dependencies in relevant meson.build (scikit-l…

…earn#29694)
virchan · Aug 29, 2024 · 602aaaa · 602aaaa
1 parent 142d824
commit 602aaaa
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/doc/whats_new/v1.5.rst b/doc/whats_new/v1.5.rst
@@ -20,6 +20,14 @@ Version 1.5.2
 
 **release date of 1.5.2**
 
+Changes impacting many modules
+------------------------------
+
+- |Fix| Fixed performance regression in a few Cython modules in
+  `sklearn._loss`, `sklearn.manifold`, `sklearn.metrics` and `sklearn.utils`,
+  which were built without OpenMP support.
+  :pr:`29694` by :user:`Loïc Estèvce <lesteve>`.
+
 Changelog
 ---------
 

diff --git a/sklearn/_loss/meson.build b/sklearn/_loss/meson.build
@@ -17,6 +17,7 @@ _loss_pyx = custom_target(
 py.extension_module(
   '_loss',
   _loss_pyx,
+  dependencies: [openmp_dep],
   cython_args: cython_args,
   install: true,
   subdir: 'sklearn/_loss',

diff --git a/sklearn/manifold/meson.build b/sklearn/manifold/meson.build
@@ -9,7 +9,7 @@ py.extension_module(
 py.extension_module(
   '_barnes_hut_tsne',
   '_barnes_hut_tsne.pyx',
-  dependencies: [np_dep],
+  dependencies: [np_dep, openmp_dep],
   cython_args: cython_args,
   subdir: 'sklearn/manifold',
   install: true

diff --git a/sklearn/metrics/_pairwise_distances_reduction/meson.build b/sklearn/metrics/_pairwise_distances_reduction/meson.build
@@ -172,7 +172,7 @@ _argkmin_classmode_pyx = custom_target(
 _argkmin_classmode = py.extension_module(
   '_argkmin_classmode',
   _argkmin_classmode_pyx,
-  dependencies: [np_dep],
+  dependencies: [np_dep, openmp_dep],
   override_options: ['cython_language=cpp'],
   cython_args: cython_args,
   # XXX: for some reason -fno-sized-deallocation is needed otherwise there is
@@ -199,7 +199,7 @@ _radius_neighbors_classmode_pyx = custom_target(
 _radius_neighbors_classmode = py.extension_module(
   '_radius_neighbors_classmode',
   _radius_neighbors_classmode_pyx,
-  dependencies: [np_dep],
+  dependencies: [np_dep, openmp_dep],
   override_options: ['cython_language=cpp'],
   cython_args: cython_args,
   subdir: 'sklearn/metrics/_pairwise_distances_reduction',

diff --git a/sklearn/metrics/meson.build b/sklearn/metrics/meson.build
@@ -41,6 +41,7 @@ _dist_metrics = py.extension_module(
 py.extension_module(
   '_pairwise_fast',
   ['_pairwise_fast.pyx', metrics_cython_tree],
+  dependencies: [openmp_dep],
   cython_args: cython_args,
   subdir: 'sklearn/metrics',
   install: true

diff --git a/sklearn/utils/meson.build b/sklearn/utils/meson.build
@@ -18,7 +18,7 @@ utils_extension_metadata = {
   'sparsefuncs_fast':
     {'sources': ['sparsefuncs_fast.pyx']},
   '_cython_blas': {'sources': ['_cython_blas.pyx']},
-  'arrayfuncs': {'sources': ['arrayfuncs.pyx']},
+  'arrayfuncs': {'sources': ['arrayfuncs.pyx'], 'dependencies': [openmp_dep]},
   'murmurhash': {
       'sources': ['murmurhash.pyx', 'src' / 'MurmurHash3.cpp'],
   },