diff --git a/pyFAI/opencl/__init__.py b/pyFAI/opencl/__init__.py index 27a272bf..96b9fb82 100644 --- a/pyFAI/opencl/__init__.py +++ b/pyFAI/opencl/__init__.py @@ -36,7 +36,7 @@ __author__ = "Jerome Kieffer" __contact__ = "Jerome.Kieffer@ESRF.eu" __license__ = "MIT" __copyright__ = "2012-2017 European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "06/10/2022" +__date__ = "14/11/2022" __status__ = "stable" import os @@ -54,6 +54,7 @@ elif os.environ.get("PYFAI_OPENCL") in ["0", "False"]: logger.info("Use of OpenCL has been disables from environment variable: PYFAI_OPENCL=0") pyopencl = None ocl = None + OpenclProcessing = None else: from silx.opencl.common import * from .. import resources @@ -62,6 +63,7 @@ else: from silx.opencl import utils from silx.opencl.utils import get_opencl_code, concatenate_cl_kernel, read_cl_file from silx.opencl import processing + OpenclProcessing = processing.OpenclProcessing def get_x87_volatile_option(ctx): @@ -70,22 +72,4 @@ def get_x87_volatile_option(ctx): ctx.devices[0].platform.name == 'Portable Computing Language'): return "-DX87_VOLATILE=volatile" else: - return "" - - -# Patch needed until silx v1.1 is actually available -if "profile_multi" in dir(processing.OpenclProcessing): - OpenclProcessing = processing.OpenclProcessing -else: - - class OpenclProcessing(processing.OpenclProcessing): - - def profile_multi(self, event_lists): - """ - addapter wich does not solve the issue of memory leak - - :param event_lists: list of ("desc", pyopencl.NanyEvent). - """ - if self.profile: - self.events += event_lists - + return "" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index d062be21..0590a139 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,11 +1,11 @@ [build-system] requires = [ "wheel", - "setuptools<60.0.0", + "setuptools<60", "oldest-supported-numpy", "scipy", "sphinx", "nbsphinx", - "silx>=0.10", + "silx>=1.1", "Cython>=0.25" ] diff --git a/requirements.txt b/requirements.txt index 2ead5e33..37ef95aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ scipy matplotlib numexpr h5py -silx #>=1.1 +silx >=1.1 PyOpenGL PyQt5 hdf5plugin diff --git a/setup.py b/setup.py index 69af21a8..55369c2e 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ # ###########################################################################*/ __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "06/01/2022" +__date__ = "14/11/2022" __status__ = "stable" import io @@ -987,8 +987,8 @@ def get_project_configuration(dry_run): "scipy", "numexpr", # for the use of pkg_resources on script launcher - "setuptools< 60.0.0", - "silx>=0.15.2"] + "setuptools<60.0.0", + "silx>=1.1"] setup_requires = [ "setuptools< 60.0.0",