Skip to content

Commit

Permalink
Merge pull request #112 from LaboratoireMecaniqueLille/release/2.0.5
Browse files Browse the repository at this point in the history
Release/2.0.5
  • Loading branch information
WeisLeDocto authored Feb 29, 2024
2 parents fa04b09 + 43ebba6 commit b3999eb
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from time import gmtime, strftime
from re import match

__version__ = '2.0.4'
__version__ = '2.0.5'

# -- Project information -----------------------------------------------------

Expand Down
10 changes: 10 additions & 0 deletions docs/source/features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
++++++++++++++++++

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion src/crappy/__version__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# coding: utf-8

__version__ = '2.0.4'
__version__ = '2.0.5'
5 changes: 5 additions & 0 deletions src/crappy/blocks/gpu_correl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""
Expand Down
5 changes: 5 additions & 0 deletions src/crappy/blocks/gpu_ve.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""

Expand Down

0 comments on commit b3999eb

Please sign in to comment.