nabu 2024.2.5__tar.gz → 2024.2.7__tar.gz

{nabu-2024.2.5/nabu.egg-info → nabu-2024.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nabu
-Version: 2024.2.5
+Version: 2024.2.7
 Summary: Nabu - Tomography software
 Author-email: Pierre Paleo <pierre.paleo@esrf.fr>, Henri Payno <henri.payno@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>

{nabu-2024.2.5 → nabu-2024.2.7}/nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.2.5"
+__version__ = "2024.2.7"
 __nabu_modules__ = [
     "app",
     "cuda",

{nabu-2024.2.5 → nabu-2024.2.7}/nabu/pipeline/fullfield/reconstruction.py

@@ -131,8 +131,12 @@ class FullFieldReconstructor:
         self.resources["gpus"] = avail_gpus
         if len(avail_gpus) == 0:
             return
-        # pick first GPU by default. TODO: handle user's nabu_config["resources"]["gpu_id"]
-        self.resources["gpu_id"] = self._gpu_id = list(avail_gpus.keys())[0]
+        user_gpus = self.process_config.nabu_config.get("resources", {}).get("gpu_id", [])
+        if len(user_gpus) == 0:
+            user_gpus = [0]
+        # For now nabu does not support multi-GPU reconstruction. Take the first one.
+        user_gpu_idx = user_gpus[0]
+        self.resources["gpu_id"] = self._gpu_id = list(avail_gpus.keys())[user_gpu_idx]
 
     def _get_backend(self, backend, cuda_options):
         self._pipeline_cls = ChunkedPipeline
@@ -145,6 +149,7 @@ class FullFieldReconstructor:
                 backend = "numpy"
             else:
                 self.gpu_mem = self.resources["gpus"][self._gpu_id]["memory_GB"] * self.gpu_mem_fraction
+                self.cuda_options = {"device_id": self._gpu_id}
         if backend == "cuda":
             if not (__has_pycuda__):
                 raise RuntimeError("pycuda not avilable")

{nabu-2024.2.5 → nabu-2024.2.7}/nabu/resources/dataset_analyzer.py

@@ -2,8 +2,10 @@ import os
 import numpy as np
 from silx.io.url import DataUrl
 from silx.io import get_data
+from tomoscan import __version__ as __tomoscan_version__
 from tomoscan.esrf.scan.edfscan import EDFTomoScan
 from tomoscan.esrf.scan.nxtomoscan import NXtomoScan
+from packaging.version import parse as parse_version
 
 from ..utils import check_supported, indices_to_slices
 from ..io.reader import EDFStackReader, NXDarksFlats, NXTomoReader
@@ -143,7 +145,10 @@ class DatasetAnalyzer:
         Return the sample-detector distance in meters.
         """
         if self._distance is None:
-            self._distance = abs(self.dataset_scanner.distance)
+            if parse_version(__tomoscan_version__) < parse_version("2.2"):
+                self._distance = abs(self.dataset_scanner.distance)
+            else:
+                self._distance = abs(self.dataset_scanner.sample_detector_distance)
         return self._distance
 
     @distance.setter

{nabu-2024.2.5 → nabu-2024.2.7}/nabu/stitching/utils/utils.py

@@ -1,4 +1,4 @@
-from distutils.version import StrictVersion
+from packaging.version import parse as parse_version
 from typing import Optional, Union
 import logging
 import functools
@@ -523,7 +523,7 @@ def find_shift_with_itk(img1: numpy.ndarray, img2: numpy.ndarray) -> tuple:
         _logger.warning("itk is not installed. Please install it to find shift with it")
         return (0, 0)
 
-    if StrictVersion(itk.Version.GetITKVersion()) < StrictVersion("4.9.0"):
+    if parse_version(itk.Version.GetITKVersion()) < parse_version("4.9.0"):
         _logger.error("ITK 4.9.0 is required to find shift with it.")
         return (0, 0)
 

{nabu-2024.2.5 → nabu-2024.2.7/nabu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nabu
-Version: 2024.2.5
+Version: 2024.2.7
 Summary: Nabu - Tomography software
 Author-email: Pierre Paleo <pierre.paleo@esrf.fr>, Henri Payno <henri.payno@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>

{nabu-2024.2.5 → nabu-2024.2.7}/nabu.egg-info/SOURCES.txt

@@ -271,7 +271,6 @@ nabu/resources/templates/id16_holo.conf
 nabu/resources/templates/id16a_fluo.conf
 nabu/resources/templates/id19_pag.conf
 nabu/resources/tests/__init__.py
-nabu/resources/tests/test_extract.py
 nabu/resources/tests/test_nxflatfield.py
 nabu/resources/tests/test_units.py
 nabu/stitching/__init__.py

{nabu-2024.2.5 → nabu-2024.2.7}/nabu.egg-info/top_level.txt

@@ -1,4 +1,3 @@
 dist
 doc
 nabu
-scripts

nabu-2024.2.5/nabu/resources/tests/test_extract.py

@@ -1,9 +0,0 @@
-from nabu.utils import list_match_queries
-
-
-def test_list_match_queries():
-
-    # entry0000 .... entry0099
-    avail = ["entry%04d" % i for i in range(100)]
-    query = "entry0000"
-    list_match_queries()