From 39aab91a972a593cfc609c59526f50f6665a7f34 Mon Sep 17 00:00:00 2001 From: Antoine Weisrock Date: Thu, 29 Feb 2024 15:55:50 +0100 Subject: [PATCH 1/2] build: update project version from 2.0.4 to 2.0.5 --- docs/source/conf.py | 2 +- pyproject.toml | 2 +- src/crappy/__version__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 5e09dfe7..5b3d4d65 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -16,7 +16,7 @@ from time import gmtime, strftime from re import match -__version__ = '2.0.4' +__version__ = '2.0.5' # -- Project information ----------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 64ad7452..596d3faf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "crappy" dynamic = ["readme"] -version = "2.0.4" +version = "2.0.5" description = "Command and Real-time Acquisition in Parallelized Python" license = {file = "LICENSE"} keywords = ["control", "command", "acquisition", "multiprocessing"] diff --git a/src/crappy/__version__.py b/src/crappy/__version__.py index dcdef668..7717659c 100644 --- a/src/crappy/__version__.py +++ b/src/crappy/__version__.py @@ -1,3 +1,3 @@ # coding: utf-8 -__version__ = '2.0.4' +__version__ = '2.0.5' From 43ebba6e7ecef007b4667954888a4421ce1c878f Mon Sep 17 00:00:00 2001 From: Antoine Weisrock Date: Thu, 29 Feb 2024 16:14:22 +0100 Subject: [PATCH 2/2] docs: add warning about incompatibility with CUDA versions > 11.3 See https://github.com/inducer/pycuda/issues/123 --- docs/source/features.rst | 10 ++++++++++ src/crappy/blocks/gpu_correl.py | 5 +++++ src/crappy/blocks/gpu_ve.py | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/docs/source/features.rst b/docs/source/features.rst index 8ebd08ee..59f44775 100644 --- a/docs/source/features.rst +++ b/docs/source/features.rst @@ -158,6 +158,11 @@ Real-time image correlation that it still works as expected ! On the long-term, it should be replaced by another Block. + .. Warning:: + This Block cannot run with CUDA versions greater than 11.3 ! This is due + to a deprecation in pycuda, and is unlikely to be fixed anytime soon in + Crappy or pycuda. + Video-extensometry ++++++++++++++++++ @@ -201,6 +206,11 @@ Video-extensometry that it still works as expected ! On the long-term, it should be replaced by another Block. + .. Warning:: + This Block cannot run with CUDA versions greater than 11.3 ! This is due + to a deprecation in pycuda, and is unlikely to be fixed anytime soon in + Crappy or pycuda. + - :ref:`Video Extenso` Child of the :ref:`Camera` Block that can acquire, record and display images. diff --git a/src/crappy/blocks/gpu_correl.py b/src/crappy/blocks/gpu_correl.py index ef33b470..20a656c7 100644 --- a/src/crappy/blocks/gpu_correl.py +++ b/src/crappy/blocks/gpu_correl.py @@ -34,6 +34,11 @@ class GPUCorrel(Camera): correlation is performed on the entire image. It is however possible to set a mask, so that only part of the image is considered when running the correlation. + + Warning: + This Block cannot run with CUDA versions greater than 11.3 ! This is due to + a deprecation in pycuda, and is unlikely to be fixed anytime soon in Crappy + or pycuda. .. versionadded:: 1.4.0 """ diff --git a/src/crappy/blocks/gpu_ve.py b/src/crappy/blocks/gpu_ve.py index 0b232103..d9975e9f 100644 --- a/src/crappy/blocks/gpu_ve.py +++ b/src/crappy/blocks/gpu_ve.py @@ -29,6 +29,11 @@ class GPUVE(Camera): also performs video-extensometry, but it does so by tracking spots instead of textured patches, and it is not GPU-accelerated. + Warning: + This Block cannot run with CUDA versions greater than 11.3 ! This is due to + a deprecation in pycuda, and is unlikely to be fixed anytime soon in Crappy + or pycuda. + .. versionadded:: 1.4.0 """