From bb96d10347b110ffd4cb54d9563893ffe9a29b93 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 27 Jan 2025 12:55:34 +0100 Subject: [PATCH 1/2] MDAS: silence matplotlib deprecation warning --- torchgeo/datasets/mdas.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torchgeo/datasets/mdas.py b/torchgeo/datasets/mdas.py index 25a61a72396..ff1bf672046 100644 --- a/torchgeo/datasets/mdas.py +++ b/torchgeo/datasets/mdas.py @@ -7,11 +7,11 @@ from collections.abc import Callable from typing import Any, ClassVar -import matplotlib.cm as cm import matplotlib.pyplot as plt import numpy as np import rasterio as rio import torch +from matplotlib.colormaps import get_cmap from matplotlib.colors import ListedColormap from matplotlib.figure import Figure from torch import Tensor @@ -356,7 +356,7 @@ def plot( axs[idx].imshow(img) case 'osm_landuse_mask': img = data.numpy().squeeze(0) - cmap = ListedColormap([cm.get_cmap('tab20')(i) for i in range(20)]) + cmap = ListedColormap([get_cmap('tab20')(i) for i in range(20)]) im = axs[idx].imshow(img, cmap=cmap) cbar = plt.colorbar(im, ax=axs[idx], ticks=range(19)) cbar.ax.set_yticklabels( From 42abbe4b89a9ec44a72039d1bfa35f4c23ec6e64 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 28 Jan 2025 11:38:40 +0100 Subject: [PATCH 2/2] Try again --- torchgeo/datasets/mdas.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/torchgeo/datasets/mdas.py b/torchgeo/datasets/mdas.py index ff1bf672046..ea0bb30e292 100644 --- a/torchgeo/datasets/mdas.py +++ b/torchgeo/datasets/mdas.py @@ -11,7 +11,6 @@ import numpy as np import rasterio as rio import torch -from matplotlib.colormaps import get_cmap from matplotlib.colors import ListedColormap from matplotlib.figure import Figure from torch import Tensor @@ -356,7 +355,7 @@ def plot( axs[idx].imshow(img) case 'osm_landuse_mask': img = data.numpy().squeeze(0) - cmap = ListedColormap([get_cmap('tab20')(i) for i in range(20)]) + cmap = ListedColormap([plt.get_cmap('tab20')(i) for i in range(20)]) im = axs[idx].imshow(img, cmap=cmap) cbar = plt.colorbar(im, ax=axs[idx], ticks=range(19)) cbar.ax.set_yticklabels(