Merge branch 'branch-24.10' into my_new_branch

3rdparty/LICENSE.pytest-lazy-fixture → 3rdparty/LICENSE.pytest-lazy-fixtures

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2016 Marsel Zaripov
+Copyright (c) 2023 Anton Petrov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE-3rdparty.md

@@ -243,10 +243,11 @@ libcuckoo
 - Copyright: Carnegie Mellon University and Intel Corporation
 - Usage: Using concurrent hash table implementation for cache mechanism.
 
-pytest-lazy-fixture
+pytest-lazy-fixtures
 - License: MIT License
-  - https://github.com/TvoroG/pytest-lazy-fixture/blob/master/LICENSE
-- Copyright: Marsel Zaripov
+- https://github.com/dev-petrov/pytest-lazy-fixtures
+  - https://github.com/dev-petrov/pytest-lazy-fixtures/blob/master/LICENSE
+- Copyright: Anton Petrov
 - Usage: Using lazy fixture feature in PyTest.
 
 psutil

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -37,7 +37,7 @@ dependencies:
 - psutil>=5.8.0
 - pydata-sphinx-theme
 - pytest-cov>=2.12.1
-- pytest-lazy-fixture>=0.6.3
+- pytest-lazy-fixtures>=1.0.0
 - pytest-xdist
 - pytest>=6.2.4,<8.0.0a0
 - python>=3.8,<3.12

conda/environments/all_cuda-125_arch-x86_64.yaml

@@ -36,7 +36,7 @@ dependencies:
 - psutil>=5.8.0
 - pydata-sphinx-theme
 - pytest-cov>=2.12.1
-- pytest-lazy-fixture>=0.6.3
+- pytest-lazy-fixtures>=1.0.0
 - pytest-xdist
 - pytest>=6.2.4,<8.0.0a0
 - python>=3.8,<3.12

dependencies.yaml

@@ -303,7 +303,7 @@ dependencies:
           - psutil>=5.8.0
           - pytest>=6.2.4,<8.0.0a0
           - pytest-cov>=2.12.1
-          - pytest-lazy-fixture>=0.6.3
+          - pytest-lazy-fixtures>=1.0.0
           - pytest-xdist
           - tifffile>=2022.7.28
           - pooch>=1.6.0  # needed to download scikit-image sample data

python/cucim/pyproject.toml

@@ -1,4 +1,4 @@
-# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved.
 # See file LICENSE for terms.
 
 [build-system]
@@ -66,7 +66,7 @@ test = [
     "pooch>=1.6.0",
     "psutil>=5.8.0",
     "pytest-cov>=2.12.1",
-    "pytest-lazy-fixture>=0.6.3",
+    "pytest-lazy-fixtures>=1.0.0",
     "pytest-xdist",
     "pytest>=6.2.4,<8.0.0a0",
     "pywavelets>=1.0",

python/cucim/src/cucim/skimage/segmentation/_chan_vese.py

@@ -65,7 +65,9 @@ def _fused_variance_kernel2(
     difference_term += term2
 
     new_phi = phi + (dt * delta_phi) * (mu * K + difference_term)
-    out = new_phi / (1 + mu * dt * delta_phi * Csum)
+    out_denom = mu * dt * delta_phi * Csum
+    out_denom += out_denom.dtype.type(1)
+    out = new_phi / out_denom
     return out
 
 
@@ -430,6 +432,9 @@ def chan_vese(
     phivar = tol + 1
 
     dt = cp.asarray(dt, dtype=float_dtype)
+    mu = cp.asarray(mu, dtype=float_dtype)
+    lambda1 = cp.asarray(lambda1, dtype=float_dtype)
+    lambda2 = cp.asarray(lambda2, dtype=float_dtype)
     while phivar > tol and i < max_num_iter:
         # Save old level set values
         oldphi = phi

python/cucim/tests/fixtures/testimage.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, NVIDIA CORPORATION.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,7 +16,7 @@
 import shutil
 
 import pytest
-from pytest_lazyfixture import lazy_fixture
+from pytest_lazy_fixtures import lf as lazy_fixture
 
 from ..util.gen_image import ImageGenerator