Deprecation fixes for test suite (#230)

facebookresearch · Nov 8, 2023 · 4890509 · 4890509
1 parent 3dea947
commit 4890509
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/neuralcompression/functional/_dense_image_warp.py b/neuralcompression/functional/_dense_image_warp.py
@@ -25,6 +25,7 @@ def _create_dense_warp_base_grid(
     grid_y, grid_x = torch.meshgrid(
         torch.linspace(-1, 1, dim1, dtype=dtype, device=device),
         torch.linspace(-1, 1, dim2, dtype=dtype, device=device),
+        indexing="ij",
     )
 
     # for gridding we need to flip the order here

diff --git a/tests/data/test_clic_2020_image.py b/tests/data/test_clic_2020_image.py
@@ -19,7 +19,7 @@ def data(tmp_path):
 
     directory.mkdir(parents=True)
 
-    n = int(rng.integers(1, 16, (1,)))
+    n = rng.integers(1, 16)
 
     for index in range(n):
         path = directory.joinpath(f"{index}.png")

diff --git a/tests/data/test_div2k.py b/tests/data/test_div2k.py
@@ -22,7 +22,7 @@ def div2k_datafolder(tmp_path: Path):
 
     directory.mkdir(parents=True)
 
-    n = int(rng.integers(1, 16, (1,)))
+    n = rng.integers(1, 16)
 
     images = []
 

diff --git a/tests/data/test_open_images.py b/tests/data/test_open_images.py
@@ -24,7 +24,7 @@ def write_folder_and_flist(base_dir: Path, subfolder: str):
         directory = base_dir / subfolder
         directory.mkdir(parents=True)
 
-        n = int(rng.integers(1, 16, (1,)))
+        n = rng.integers(1, 16)
 
         images = []
 

diff --git a/tests/metrics/test_calc_psnr.py b/tests/metrics/test_calc_psnr.py
@@ -6,7 +6,7 @@
 import pytest
 import torch
 from torch import Tensor
-from torchmetrics.functional import peak_signal_noise_ratio
+from torchmetrics.functional.image import peak_signal_noise_ratio
 
 from neuralcompression.metrics import calc_psnr, calc_psnr_numpy