From b905fcb172321aefad90639d7d114e6ab3910251 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Sun, 3 Jul 2022 06:41:32 -0700 Subject: [PATCH] Move numcodecs build environment vars into meta.yaml file (#2833) --- packages/numcodecs/meta.yaml | 3 ++- packages/numcodecs/patches/fixsetup.patch | 15 --------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 packages/numcodecs/patches/fixsetup.patch diff --git a/packages/numcodecs/meta.yaml b/packages/numcodecs/meta.yaml index e16008102..419460057 100644 --- a/packages/numcodecs/meta.yaml +++ b/packages/numcodecs/meta.yaml @@ -6,10 +6,11 @@ source: url: https://files.pythonhosted.org/packages/2c/b0/980143fa7467569fd81f0d00530c46dcf41ff790738261985dc10a26d4ec/numcodecs-0.9.1.tar.gz patches: - patches/fixblosc.patch - - patches/fixsetup.patch - patches/fixzlib.patch build: script: | + export DISABLE_NUMCODECS_SSE2=1 + export DISABLE_NUMCODECS_AVX2=1 rm numcodecs/blosc.c requirements: run: diff --git a/packages/numcodecs/patches/fixsetup.patch b/packages/numcodecs/patches/fixsetup.patch deleted file mode 100644 index fd3062c8b..000000000 --- a/packages/numcodecs/patches/fixsetup.patch +++ /dev/null @@ -1,15 +0,0 @@ -This patch disables SSE2 and AVX2 options -diff --git a/setup.py b/setup.py -index 3cf27db..74bdea5 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,9 @@ from distutils.command.build_ext import build_ext - from distutils.errors import CCompilerError, DistutilsExecError, \ - DistutilsPlatformError - -+os.environ['DISABLE_NUMCODECS_SSE2'] = "1" -+os.environ['DISABLE_NUMCODECS_AVX2'] = "1" -+ - try: - from Cython.Build import cythonize - except ImportError: