Make isce3 work with numpy 2.x

python/packages/nisar/cal/faraday_rotation_angle_slc.py

@@ -387,14 +387,14 @@ def _get_block_info(self, azt_lim, sr_lim, azt_blk_size, sr_blk_size):
 
         # get range bins per block and the number of blocks of sr
         n_rgb_blk = round(sr_blk_size / self._rdr_grid.range_pixel_spacing)
-        n_blks_sr = int(np.ceil(np.diff(rgb_limit) / n_rgb_blk))
+        n_blks_sr = int(np.ceil(np.diff(rgb_limit).item() / n_rgb_blk))
 
         self.logger.info(f'Full block size in slant range -> {n_rgb_blk}')
         self.logger.info(f'Total number of range blocks -> {n_blks_sr}')
 
         # get azimuth bins per block and the number of blocks of azt
         n_azb_blk = round(azt_blk_size * self._rdr_grid.prf)
-        n_blks_azt = int(np.ceil(np.diff(azb_limit) / n_azb_blk))
+        n_blks_azt = int(np.ceil(np.diff(azb_limit).item() / n_azb_blk))
 
         self.logger.info(f'Full block size in AZ time -> {n_azb_blk}')
         self.logger.info(f'Total number of AZ blocks -> {n_blks_azt}')

python/packages/nisar/cal/pol_channel_imbalance_slc.py

@@ -414,14 +414,14 @@ def _get_block_info(self, azt_lim, sr_lim, azt_blk_size, sr_blk_size):
 
         # get range bins per block and the number of blocks of sr
         n_rgb_blk = round(sr_blk_size / self._rdr_grid.range_pixel_spacing)
-        n_blks_sr = int(np.ceil(np.diff(rgb_limit) / n_rgb_blk))
+        n_blks_sr = int(np.ceil(np.diff(rgb_limit).item() / n_rgb_blk))
 
         self.logger.info(f'Full block size in slant range -> {n_rgb_blk}')
         self.logger.info(f'Total number of range blocks -> {n_blks_sr}')
 
         # get azimuth bins per block and the number of blocks of azt
         n_azb_blk = round(azt_blk_size * self._rdr_grid.prf)
-        n_blks_azt = int(np.ceil(np.diff(azb_limit) / n_azb_blk))
+        n_blks_azt = int(np.ceil(np.diff(azb_limit).item() / n_azb_blk))
 
         self.logger.info(f'Full block size in AZ time -> {n_azb_blk}')
         self.logger.info(f'Total number of AZ blocks -> {n_blks_azt}')

python/packages/nisar/h5/h5utils.py

@@ -23,7 +23,7 @@ def handle_message(err: str):
 
     try:
         val = h5grp[key][()]
-        val = destType(val)
+        val = destType(val.item() if hasattr(val, "item") else val)
     except KeyError as e:
         raise KeyError(handle_message(f'{key} not found at {h5grp.name}')) from e
     except Exception as e:

tests/python/extensions/pybind/signal/filter2D.py

@@ -33,7 +33,7 @@ def test_run_filter2D():
     block = 20
 
     # Create filter kernels
-    kernel1d = np.ones([kernel_length, 1], dtype=np.float64) / kernel_length
+    kernel1d = np.ones(kernel_length, dtype=np.float64) / kernel_length
 
     # Create real data to filter
     data_real = np.zeros([length, width], dtype=np.float64)

tests/python/packages/isce3/io/gdal/gdal_raster.py

@@ -142,35 +142,6 @@ def test_create_dataset_file_dtype_character_codes():
         assert raster.dtype == np.float32
 
 
-def test_create_dataset_file_dtype_classes():
-    """
-    Test the GDALRaster.create_dataset_file for acceptance of class instances that have
-    a .dtype attribute as a dtype parameter
-    """
-    @dataclass
-    class a:
-        dtype = np.complex64
-
-    with TemporaryDirectory() as tempdir:
-        raster = GDALRaster.create_dataset_file(
-            filepath=Path(tempdir) / "dtype_test_a.gdal",
-            dtype=a(),
-            shape=(100, 100),
-            num_bands=1,
-        )
-
-        assert raster.dtype == np.complex64
-
-        raster_2 = GDALRaster.create_dataset_file(
-            filepath=Path(tempdir) / "dtype_test_raster.gdal",
-            dtype=raster,
-            shape=(100, 100),
-            num_bands=1,
-        )
-
-        assert raster_2.dtype == np.complex64
-
-
 def test_create_dataset_file_dtype_character_codes():
     """
     Test the GDALRaster.create_dataset_file for acceptance of np.dtype objects as a