upgrade torchmetrics to 1.0

.github/workflows/ci.yaml

@@ -41,22 +41,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.7", "3.8", "3.9"]
-        torchmetrics-version: ["0.11.4"]
+        python-version: ["3.8", "3.9", "3.10"]
+        torchmetrics-version: ["latest"]
         ignore-lpips: ["false"]
         include:
           - os: ubuntu-latest
-            python-version: "3.9"
-            torchmetrics-version: "0.11.4"
+            python-version: "3.10"
+            torchmetrics-version: "latest"
             ignore-lpips: "true"
-          - os: ubuntu-latest
-            python-version: "3.9"
-            torchmetrics-version: "0.6.0"
-            ignore-lpips: "false"
-          - os: ubuntu-latest
-            python-version: "3.9"
-            torchmetrics-version: "0.7.3"
-            ignore-lpips: "false"
     env:
       TORCHMETRICS: ${{ matrix.torchmetrics-version }}
       IGNORE_LPIPS: ${{ matrix.ignore-lpips }}

meddlr/metrics/image.py

@@ -57,19 +57,13 @@ def __init__(
         im_type: str = None,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="dB",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         self.im_type = im_type
@@ -105,19 +99,13 @@ def __init__(
         im_type: str = None,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         self.im_type = im_type
@@ -153,19 +141,13 @@ def __init__(
         im_type: str = None,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         self.im_type = im_type
@@ -201,19 +183,13 @@ def __init__(
         im_type: str = None,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         self.im_type = im_type
@@ -252,19 +228,13 @@ def __init__(
         im_type: str = None,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         self.im_type = im_type
@@ -301,19 +271,13 @@ def __init__(
         im_type: str = "magnitude",
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
         self.method = method
         self.im_type = im_type
@@ -522,7 +486,6 @@ def compute_vifp_mscale(
     num = 0.0
     den = 0.0
     for scale in range(1, 5):
-
         N = 2 ** (4 - scale + 1) + 1
         sd = N / 5.0
 

meddlr/metrics/lpip.py

@@ -36,10 +36,7 @@ def __init__(
         pretrained: bool = True,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         """
         Args:
@@ -72,10 +69,7 @@ def __init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         valid_net_type = ("vgg", "alex", "squeeze")
@@ -92,7 +86,6 @@ def __init__(
         self.mode = mode
 
     def func(self, preds: torch.Tensor, targets: torch.Tensor):
-
         if self.mode == "grayscale":
             loss_shape = (targets.shape[0], targets.shape[1])
         elif self.mode == "rgb":

meddlr/metrics/metric.py

@@ -46,17 +46,11 @@ def __init__(
         channel_names: Sequence[str] = None,
         units: str = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         self.units = units
         super().__init__(
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         self.reduction = reduction

meddlr/metrics/sem_seg.py

@@ -22,19 +22,13 @@ def __init__(
         self,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
     def func(self, preds, targets) -> torch.Tensor:
@@ -58,19 +52,13 @@ def __init__(
         self,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
     def func(self, preds, targets) -> torch.Tensor:
@@ -91,19 +79,13 @@ def __init__(
         self,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         super().__init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
     def func(self, preds, targets) -> torch.Tensor:
@@ -130,10 +112,7 @@ def __init__(
         connectivity: int = 1,
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         """
         Args:
@@ -145,10 +124,7 @@ def __init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
         self.connectivity = connectivity
 

meddlr/metrics/ssfd.py

@@ -37,10 +37,7 @@ def __init__(
         layer_names: Sequence[str] = ("block4_relu2",),
         channel_names: Sequence[str] = None,
         reduction="none",
-        compute_on_step: bool = False,
-        dist_sync_on_step: bool = False,
-        process_group: bool = None,
-        dist_sync_fn: bool = None,
+        **kwargs,
     ):
         """
         Args:
@@ -58,10 +55,7 @@ def __init__(
             channel_names=channel_names,
             units="",
             reduction=reduction,
-            compute_on_step=compute_on_step,
-            dist_sync_on_step=dist_sync_on_step,
-            process_group=process_group,
-            dist_sync_fn=dist_sync_fn,
+            **kwargs,
         )
 
         valid_modes = ("grayscale", "rgb")

setup.py

@@ -180,7 +180,7 @@ def get_git_branch():
 AUTHOR = "The Meddlr Team"
 EMAIL = "arjundd@stanford.edu"
 URL = "https://github.com/ad12/meddlr"
-REQUIRES_PYTHON = ">=3.6"
+REQUIRES_PYTHON = ">=3.8"
 
 REQUIRED = [
     "pyxb",  # need to install before ismrmrd
@@ -198,7 +198,7 @@ def get_git_branch():
     "silx",
     "tqdm",
     "omegaconf",
-    "torchmetrics>=0.5.1,<=0.11.4",
+    "torchmetrics>=1.0.0",
     "iopath",
     "packaging",
 ]