From 76a7334eb71dabed29f2ffb426757de872369ca3 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Sat, 2 Jul 2022 21:47:07 -0700 Subject: [PATCH] Remove scikit-learn omp patch (#2832) --- packages/scikit-learn/meta.yaml | 3 -- .../patches/0002-Disable-omp.patch | 34 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 packages/scikit-learn/patches/0002-Disable-omp.patch diff --git a/packages/scikit-learn/meta.yaml b/packages/scikit-learn/meta.yaml index 3bf699190..cf2a0084b 100644 --- a/packages/scikit-learn/meta.yaml +++ b/packages/scikit-learn/meta.yaml @@ -6,9 +6,6 @@ source: url: https://files.pythonhosted.org/packages/41/11/e931951f048908ceaf2423db48ca6ad10e0b818c2960a3bc2dacb4fa4c1d/scikit-learn-1.1.1.tar.gz sha256: 3e77b71e8e644f86c8b5be7f1c285ef597de4c384961389ee3e9ca36c445b256 - patches: - - patches/0002-Disable-omp.patch - build: cflags: -Wno-implicit-function-declaration diff --git a/packages/scikit-learn/patches/0002-Disable-omp.patch b/packages/scikit-learn/patches/0002-Disable-omp.patch deleted file mode 100644 index 196243228..000000000 --- a/packages/scikit-learn/patches/0002-Disable-omp.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1a557776fb87b000b27d5a306670bfdea07afb01 Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Tue, 17 May 2022 18:10:15 -0700 -Subject: [PATCH 2/2] Disable omp - ---- - sklearn/_build_utils/__init__.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sklearn/_build_utils/__init__.py b/sklearn/_build_utils/__init__.py -index d8206a3a7..d361da6b8 100644 ---- a/sklearn/_build_utils/__init__.py -+++ b/sklearn/_build_utils/__init__.py -@@ -44,7 +44,7 @@ def cythonize_extensions(top_path, config): - - # Fast fail before cythonization if compiler fails compiling basic test - # code even without OpenMP -- basic_check_build() -+ # basic_check_build() - - # check simple compilation with OpenMP. If it fails scikit-learn will be - # built without OpenMP and the test test_openmp_supported in the test suite -@@ -58,7 +58,7 @@ def cythonize_extensions(top_path, config): - # cython build-time variable passed to the cythonize() call. - # - Then in the build_ext subclass defined in the top-level setup.py file - # to actually build the compiled extensions with OpenMP flags if needed. -- sklearn._OPENMP_SUPPORTED = check_openmp_support() -+ sklearn._OPENMP_SUPPORTED = False # check_openmp_support() - - n_jobs = 1 - with contextlib.suppress(ImportError): --- -2.25.1 -