nabu 2024.2.12__py3-none-any.whl → 2024.2.14__py3-none-any.whl

nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.2.12"
+__version__ = "2024.2.14"
 __nabu_modules__ = [
     "app",
     "cuda",

nabu/io/cast_volume.py

@@ -206,6 +206,9 @@ def cast_volume(
         data_min = data_min if data_min is not None else found_data_min
         data_max = data_max if data_max is not None else found_data_max
 
+    if isinstance(output_volume, JP2KVolume):
+        output_volume.rescale_data = False
+
     data = []
     for input_slice, frame_dumper in zip(
         input_volume.browse_slices(),

nabu/reconstruction/fbp.py

@@ -79,6 +79,13 @@ class CudaBackprojector(BackprojectorBase):
             self.sino_mult = CudaSinoMult(self.sino_shape, self.rot_center, ctx=self._processing.ctx)
         self._prepare_textures()  # has to be done after compilation for Cuda (to bind texture to built kernel)
 
+    def _get_filter_init_extra_options(self):
+        return {
+            "cuda_options": {
+                "ctx": self._processing.ctx,
+            },
+        }
+
     def _transfer_to_texture(self, sino, do_checks=True):
         if do_checks and not (sino.flags.c_contiguous):
             raise ValueError("Expected C-Contiguous array")

nabu/reconstruction/fbp_base.py

@@ -237,14 +237,15 @@ class BackprojectorBase:
         self._axis_correction = np.zeros((1, self.n_angles), dtype=np.float32)
         self._axis_correction[0, :] = axcorr[:]  # pylint: disable=E1136
 
+    def _get_filter_init_extra_options(self):
+        return {}
+
     def _init_filter(self, filter_name):
         self.filter_name = filter_name
         if filter_name in ["None", "none"]:
             self.sino_filter = None
             return
-        sinofilter_other_kwargs = {}
-        if self.backend != "numpy":
-            sinofilter_other_kwargs["%s_options" % self.backend] = {"ctx": self._processing.ctx}
+        sinofilter_other_kwargs = self._get_filter_init_extra_options()
         self.sino_filter = self.SinoFilterClass(
             self.sino_shape,
             filter_name=self.filter_name,

nabu/reconstruction/fbp_opencl.py

@@ -74,5 +74,13 @@ class OpenCLBackprojector(BackprojectorBase):
                 return
             return cl.enqueue_copy(self._processing.queue, self._d_sino.data, sino.data)
 
+    def _get_filter_init_extra_options(self):
+        return {
+            "opencl_options": {
+                "ctx": self._processing.ctx,
+                "queue": self._processing.queue,  # !!!!
+            },
+        }
+
     def _set_kernel_slice_arg(self, d_slice):
         self.kern_proj_args[1] = d_slice

{nabu-2024.2.12.dist-info → nabu-2024.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nabu
-Version: 2024.2.12
+Version: 2024.2.14
 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.12.dist-info → nabu-2024.2.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
 doc/conf.py,sha256=3xtCarCHrXPr50GbeRDuH-o3Jzojw7mpr7vpGfZPLAE,3787
 doc/create_conf_doc.py,sha256=IVOdP70KvbW9WS_UQu3Iyd0YfS60E2fJ5IDtQ_s4cDw,1143
 doc/get_mathjax.py,sha256=VIvKRCdDuF2VoY8JD3mSey9XX13AZMmwTJBHdt1tUs4,1012
-nabu/__init__.py,sha256=YifF4GAurmjhWkdEHc0w9j48GNlcJSLObAKt0WNrcUo,271
+nabu/__init__.py,sha256=8_mbP31FX12L0QwJXpiUISTKOgsEynDKnwTQRVjBaOc,271
 nabu/tests.py,sha256=cew9OY2uTyncHI_HM32W8CP6B1GTGKaOW65XtMEqs7o,1417
 nabu/testutils.py,sha256=VkSL9tbY0XEH49Z5OjDFFhzkSxrCv4UIuvSVFgegSUY,7632
 nabu/utils.py,sha256=V1B_sD54XGNKn5pORa2yNCATyswOzybey3sv8BuIYWY,26355
@@ -77,7 +77,7 @@ nabu/estimation/tests/test_focus.py,sha256=cMxEeTLlfVHOvG_4oGMLpp6bVI6okYz0u4aNc
 nabu/estimation/tests/test_tilt.py,sha256=PN4tnV3-XU2nNA608kQShaHugWn_-wbHzWCTnLIaCTk,1658
 nabu/estimation/tests/test_translation.py,sha256=RkOnCYgk9DZGKlIka1snqTv4wbIz_nG7-EHAxnBHsJU,2999
 nabu/io/__init__.py,sha256=AbQgj4-fCCHOKynO_PyAR9ejnFSuWKgroxxhxWVpjyQ,120
-nabu/io/cast_volume.py,sha256=LQkd3I_W9mpX_vIa7iAV-rcv2ZcCJ-NZ3EQuFAPYJSI,17504
+nabu/io/cast_volume.py,sha256=9evViU9gRnZ4Bv3VpSQ74rKjJsyfMmu2h_IpPVlQCK0,17594
 nabu/io/detector_distortion.py,sha256=Or4icugi0fGRKWIG0I9hCuR1UZA5Cel25ZGY7cR2j4I,11744
 nabu/io/reader.py,sha256=McWg7w04zrI0mt2z-BBwUr7rryMWYjdg7aHqbNeZ45A,40518
 nabu/io/reader_helical.py,sha256=_6vZBH-US_VT7oOGJUtYXqPwFws7xZKcmdOthpwvlIQ,4477
@@ -221,9 +221,9 @@ nabu/processing/tests/test_transpose.py,sha256=hTG17wTaB5Wv6twbW3ZFhBv6BYfqJY7DT
 nabu/processing/tests/test_unsharp.py,sha256=R3ovbwDDp3ccy2A8t6CcUVELXRWkED5EnQdN2FQOfQM,4391
 nabu/reconstruction/__init__.py,sha256=EmKVvx_-FJvzJngG4ielIC7FhMCpI1Waaflg_lF44tk,163
 nabu/reconstruction/cone.py,sha256=RZj1JoxqskShvglgxUnsbYw7qbm6Rralt7hJ96eU-8c,19015
-nabu/reconstruction/fbp.py,sha256=uwEniGdEOn1atc9mTAHEDeF1y-ZqneifCKVr-ieHZss,5015
-nabu/reconstruction/fbp_base.py,sha256=DwZCilPXgGMRPV8_XfkWiaXUzWFM8rNBa8IyMdy5nno,17092
-nabu/reconstruction/fbp_opencl.py,sha256=coEGLq65PCuvWnhAbIyLPHACkWjMB0XOceMp9ZIDWtc,3274
+nabu/reconstruction/fbp.py,sha256=iXC9M91DWq3SauZa44iWkSBcy6YIxmmjx1PyIOLFCTk,5179
+nabu/reconstruction/fbp_base.py,sha256=Mh7brqiCsfPLMI2-OU4g0PafG7qq2mYR1TJYizemC_4,17059
+nabu/reconstruction/fbp_opencl.py,sha256=U-XP7v1m1lJ1ulvlF8tclJfEOWmZLCT1hevIw4gsNec,3497
 nabu/reconstruction/filtering.py,sha256=fg_loze-VkiFqBAqQ7AGkKwCDz-5UskSSh27klaakD0,8659
 nabu/reconstruction/filtering_cuda.py,sha256=syKp_CHzMjM4sBSK0JI5k5Ag3xzROvM15FfOO48ssDo,4041
 nabu/reconstruction/filtering_opencl.py,sha256=B9zcvSxvt3KMxEXxoirop1vfqM0kSRP-LhvGgqDGQlA,3957
@@ -262,7 +262,6 @@ nabu/resources/templates/id16_holo.conf,sha256=sDd_rEJGZjOGVAsGub5sT2arfXDnc_sxy
 nabu/resources/templates/id16a_fluo.conf,sha256=Nz1etzO2fSwksi7CThWJ5T1kZEdyBe8rMO7puNJ93Hc,542
 nabu/resources/templates/id19_pag.conf,sha256=u4fFPEBprzOW9_5_ChkIgowQcYpLhjmA8Gwm5XgC4Jc,384
 nabu/resources/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nabu/resources/tests/test_extract.py,sha256=msYWFP96LjpEntq1ucTWgKZMhUvZcLpJ-AQB3oGOh2E,206
 nabu/resources/tests/test_nxflatfield.py,sha256=XRGbYwqJv0NYAVQnAB224TwTZP_W2Bs3-yu0zQnDzEM,4179
 nabu/resources/tests/test_units.py,sha256=F2jFTck-1UwYET1MwTtX6ntzYUosfwOJkugSencGgz8,2155
 nabu/stitching/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -310,9 +309,9 @@ nabu/thirdparty/pore3d_deringer_munch.py,sha256=o4bisnFc-wMjuohWBT8wgWmfNehPQGtC
 nabu/thirdparty/tomocupy_remove_stripe.py,sha256=Khe4zFf0kRzu65Yxnvq58gt1ljOztqJGdMDhVAiM7lM,24363
 nabu/thirdparty/tomopy_phase.py,sha256=hK4oPpkogLOhv23XzzEXQY2u3r8fJvASY_bINVs6ERE,8634
 nabu/thirdparty/tomwer_load_flats_darks.py,sha256=ZNoVAinUb_wGYbfvs_4BVnWsjsQmNxSvCh1bWhR2WWg,5611
-nabu-2024.2.12.dist-info/licenses/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
-nabu-2024.2.12.dist-info/METADATA,sha256=js11kdh6t1G64wHG9VEC9Pjhxb2305HB5GrmmkkPSX0,4266
-nabu-2024.2.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nabu-2024.2.12.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
-nabu-2024.2.12.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
-nabu-2024.2.12.dist-info/RECORD,,
+nabu-2024.2.14.dist-info/licenses/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
+nabu-2024.2.14.dist-info/METADATA,sha256=jZjH6LPbNHttKwjr2bJ8j5NG6QrKruR9R3PdlTIKw9w,4266
+nabu-2024.2.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nabu-2024.2.14.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
+nabu-2024.2.14.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
+nabu-2024.2.14.dist-info/RECORD,,

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()