rslearn 0.0.13__tar.gz → 0.0.15__tar.gz

{rslearn-0.0.13/rslearn.egg-info → rslearn-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rslearn
-Version: 0.0.13
+Version: 0.0.15
 Summary: A library for developing remote sensing datasets and models
 Author: OlmoEarth Team
 License:                                  Apache License

{rslearn-0.0.13 → rslearn-0.0.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rslearn"
-version = "0.0.13"
+version = "0.0.15"
 description = "A library for developing remote sensing datasets and models"
 authors = [
     { name = "OlmoEarth Team" },

{rslearn-0.0.13 → rslearn-0.0.15}/rslearn/config/dataset.py

@@ -8,7 +8,6 @@ from typing import Any
 import numpy as np
 import numpy.typing as npt
 import pytimeparse
-import torch
 from rasterio.enums import Resampling
 
 from rslearn.utils import PixelBounds, Projection
@@ -49,15 +48,6 @@ class DType(Enum):
             return np.float32
         raise ValueError(f"unable to handle numpy dtype {self}")
 
-    def get_torch_dtype(self) -> torch.dtype:
-        """Returns pytorch dtype object corresponding to this DType."""
-        if self == DType.INT32:
-            return torch.int32
-        elif self == DType.FLOAT32:
-            return torch.float32
-        else:
-            raise ValueError(f"unable to handle torch dtype {self}")
-
 
 RESAMPLING_METHODS = {
     "nearest": Resampling.nearest,

{rslearn-0.0.13 → rslearn-0.0.15}/rslearn/dataset/manage.py

@@ -124,12 +124,24 @@ def prepare_dataset_windows(
             )
             continue
         data_source_cfg = layer_cfg.data_source
+        min_matches = data_source_cfg.query_config.min_matches
 
         # Get windows that need to be prepared for this layer.
+        # Also track which windows are skipped vs previously rejected.
         needed_windows = []
+        windows_skipped = 0
+        windows_rejected = 0
         for window in windows:
             layer_datas = window.load_layer_datas()
             if layer_name in layer_datas and not force:
+                # Window already has layer data - check if it was previously rejected
+                layer_data = layer_datas[layer_name]
+                if len(layer_data.serialized_item_groups) == 0 and min_matches > 0:
+                    # Previously rejected due to min_matches
+                    windows_rejected += 1
+                else:
+                    # Successfully prepared previously
+                    windows_skipped += 1
                 continue
             needed_windows.append(window)
         logger.info(f"Preparing {len(needed_windows)} windows for layer {layer_name}")
@@ -141,8 +153,8 @@ def prepare_dataset_windows(
                     data_source_name=data_source_cfg.name,
                     duration_seconds=time.monotonic() - layer_start_time,
                     windows_prepared=0,
-                    windows_skipped=len(windows),
-                    windows_rejected=0,
+                    windows_skipped=windows_skipped,
+                    windows_rejected=windows_rejected,
                     get_items_attempts=0,
                 )
             )
@@ -184,8 +196,6 @@ def prepare_dataset_windows(
         )
 
         windows_prepared = 0
-        windows_rejected = 0
-        min_matches = data_source_cfg.query_config.min_matches
         for window, result in zip(needed_windows, results):
             layer_datas = window.load_layer_datas()
             layer_datas[layer_name] = WindowLayerData(
@@ -202,8 +212,6 @@ def prepare_dataset_windows(
             else:
                 windows_prepared += 1
 
-        windows_skipped = len(windows) - len(needed_windows)
-
         layer_summaries.append(
             LayerPrepareSummary(
                 layer_name=layer_name,

rslearn-0.0.15/rslearn/lightning_cli.py

@@ -0,0 +1,67 @@
+"""LightningCLI for rslearn."""
+
+import sys
+
+from lightning.pytorch.cli import LightningArgumentParser, LightningCLI
+
+from rslearn.arg_parser import RslearnArgumentParser
+from rslearn.train.data_module import RslearnDataModule
+from rslearn.train.lightning_module import RslearnLightningModule
+
+
+class RslearnLightningCLI(LightningCLI):
+    """LightningCLI that links data.tasks to model.tasks and supports environment variables."""
+
+    def add_arguments_to_parser(self, parser: LightningArgumentParser) -> None:
+        """Link data.tasks to model.tasks.
+
+        Args:
+            parser: the argument parser
+        """
+        # Link data.tasks to model.tasks
+        parser.link_arguments(
+            "data.init_args.task", "model.init_args.task", apply_on="instantiate"
+        )
+
+    def before_instantiate_classes(self) -> None:
+        """Called before Lightning class initialization.
+
+        Sets the dataset path for any configured RslearnPredictionWriter callbacks.
+        """
+        subcommand = self.config.subcommand
+        c = self.config[subcommand]
+
+        # If there is a RslearnPredictionWriter, set its path.
+        prediction_writer_callback = None
+        if "callbacks" in c.trainer:
+            for existing_callback in c.trainer.callbacks:
+                if (
+                    existing_callback.class_path
+                    == "rslearn.train.prediction_writer.RslearnWriter"
+                ):
+                    prediction_writer_callback = existing_callback
+        if prediction_writer_callback:
+            prediction_writer_callback.init_args.path = c.data.init_args.path
+
+        # Disable the sampler replacement, since the rslearn data module will set the
+        # sampler as needed.
+        c.trainer.use_distributed_sampler = False
+
+        # For predict, make sure that return_predictions is False.
+        # Otherwise all the predictions would be stored in memory which can lead to
+        # high memory consumption.
+        if subcommand == "predict":
+            c.return_predictions = False
+
+
+def model_handler() -> None:
+    """Handler for any rslearn model X commands."""
+    RslearnLightningCLI(
+        model_class=RslearnLightningModule,
+        datamodule_class=RslearnDataModule,
+        args=sys.argv[2:],
+        subclass_mode_model=True,
+        subclass_mode_data=True,
+        save_config_kwargs={"overwrite": True},
+        parser_class=RslearnArgumentParser,
+    )

{rslearn-0.0.13 → rslearn-0.0.15}/rslearn/main.py

@@ -10,11 +10,9 @@ from datetime import UTC, datetime, timedelta
 from typing import Any, TypeVar
 
 import tqdm
-from lightning.pytorch.cli import LightningArgumentParser, LightningCLI
 from rasterio.crs import CRS
 from upath import UPath
 
-from rslearn.arg_parser import RslearnArgumentParser
 from rslearn.config import LayerConfig
 from rslearn.const import WGS84_EPSG
 from rslearn.data_sources import Item, data_source_from_config
@@ -38,8 +36,6 @@ from rslearn.dataset.manage import (
 )
 from rslearn.log_utils import get_logger
 from rslearn.tile_stores import get_tile_store_with_layer
-from rslearn.train.data_module import RslearnDataModule
-from rslearn.train.lightning_module import RslearnLightningModule
 from rslearn.utils import Projection, STGeometry
 
 logger = get_logger(__name__)
@@ -831,85 +827,35 @@ def dataset_build_index() -> None:
     index.save_index(ds_path)
 
 
-class RslearnLightningCLI(LightningCLI):
-    """LightningCLI that links data.tasks to model.tasks and supports environment variables."""
-
-    def add_arguments_to_parser(self, parser: LightningArgumentParser) -> None:
-        """Link data.tasks to model.tasks.
-
-        Args:
-            parser: the argument parser
-        """
-        # Link data.tasks to model.tasks
-        parser.link_arguments(
-            "data.init_args.task", "model.init_args.task", apply_on="instantiate"
-        )
-
-    def before_instantiate_classes(self) -> None:
-        """Called before Lightning class initialization.
-
-        Sets the dataset path for any configured RslearnPredictionWriter callbacks.
-        """
-        subcommand = self.config.subcommand
-        c = self.config[subcommand]
-
-        # If there is a RslearnPredictionWriter, set its path.
-        prediction_writer_callback = None
-        if "callbacks" in c.trainer:
-            for existing_callback in c.trainer.callbacks:
-                if (
-                    existing_callback.class_path
-                    == "rslearn.train.prediction_writer.RslearnWriter"
-                ):
-                    prediction_writer_callback = existing_callback
-        if prediction_writer_callback:
-            prediction_writer_callback.init_args.path = c.data.init_args.path
-
-        # Disable the sampler replacement, since the rslearn data module will set the
-        # sampler as needed.
-        c.trainer.use_distributed_sampler = False
-
-        # For predict, make sure that return_predictions is False.
-        # Otherwise all the predictions would be stored in memory which can lead to
-        # high memory consumption.
-        if subcommand == "predict":
-            c.return_predictions = False
-
-
-def model_handler() -> None:
-    """Handler for any rslearn model X commands."""
-    RslearnLightningCLI(
-        model_class=RslearnLightningModule,
-        datamodule_class=RslearnDataModule,
-        args=sys.argv[2:],
-        subclass_mode_model=True,
-        subclass_mode_data=True,
-        save_config_kwargs={"overwrite": True},
-        parser_class=RslearnArgumentParser,
-    )
-
-
 @register_handler("model", "fit")
 def model_fit() -> None:
     """Handler for rslearn model fit."""
+    from .lightning_cli import model_handler
+
     model_handler()
 
 
 @register_handler("model", "validate")
 def model_validate() -> None:
     """Handler for rslearn model validate."""
+    from .lightning_cli import model_handler
+
     model_handler()
 
 
 @register_handler("model", "test")
 def model_test() -> None:
     """Handler for rslearn model test."""
+    from .lightning_cli import model_handler
+
     model_handler()
 
 
 @register_handler("model", "predict")
 def model_predict() -> None:
     """Handler for rslearn model predict."""
+    from .lightning_cli import model_handler
+
     model_handler()
 
 

{rslearn-0.0.13 → rslearn-0.0.15}/rslearn/models/clay/clay.py

@@ -8,6 +8,7 @@ from importlib.resources import files
 from typing import Any
 
 import torch
+import torch.nn.functional as F
 import yaml
 from einops import rearrange
 from huggingface_hub import hf_hub_download
@@ -30,6 +31,7 @@ PATCH_SIZE = 8
 CLAY_MODALITIES = ["sentinel-2-l2a", "sentinel-1-rtc", "landsat-c2l1", "naip"]
 CONFIG_DIR = files("rslearn.models.clay.configs")
 CLAY_METADATA_PATH = str(CONFIG_DIR / "metadata.yaml")
+DEFAULT_IMAGE_RESOLUTION = 128  # image resolution during pretraining
 
 
 def get_clay_checkpoint_path(
@@ -49,6 +51,7 @@ class Clay(torch.nn.Module):
         modality: str = "sentinel-2-l2a",
         checkpoint_path: str | None = None,
         metadata_path: str = CLAY_METADATA_PATH,
+        do_resizing: bool = False,
     ) -> None:
         """Initialize the Clay model.
 
@@ -57,6 +60,7 @@ class Clay(torch.nn.Module):
             modality: The modality to use (subset of CLAY_MODALITIES).
             checkpoint_path: Path to clay-v1.5.ckpt, if None, fetch from HF Hub.
             metadata_path: Path to metadata.yaml.
+            do_resizing: Whether to resize the image to the input resolution.
         """
         super().__init__()
 
@@ -95,6 +99,14 @@ class Clay(torch.nn.Module):
 
         self.model_size = model_size
         self.modality = modality
+        self.do_resizing = do_resizing
+
+    def _resize_image(self, image: torch.Tensor, original_hw: int) -> torch.Tensor:
+        """Resize the image to the input resolution."""
+        new_hw = self.patch_size if original_hw == 1 else DEFAULT_IMAGE_RESOLUTION
+        return F.interpolate(
+            image, size=(new_hw, new_hw), mode="bilinear", align_corners=False
+        )
 
     def forward(self, inputs: list[dict[str, Any]]) -> list[torch.Tensor]:
         """Forward pass for the Clay model.
@@ -114,7 +126,8 @@ class Clay(torch.nn.Module):
         chips = torch.stack(
             [inp[self.modality] for inp in inputs], dim=0
         )  # (B, C, H, W)
-
+        if self.do_resizing:
+            chips = self._resize_image(chips, chips.shape[2])
         order = self.metadata[self.modality]["band_order"]
         wavelengths = []
         for band in self.metadata[self.modality]["band_order"]:

{rslearn-0.0.13 → rslearn-0.0.15}/rslearn/models/croma.py

@@ -7,6 +7,7 @@ from enum import Enum
 from typing import Any
 
 import torch
+import torch.nn.functional as F
 from einops import rearrange
 from upath import UPath
 
@@ -99,6 +100,7 @@ class Croma(torch.nn.Module):
         modality: CromaModality,
         pretrained_path: str | None = None,
         image_resolution: int = DEFAULT_IMAGE_RESOLUTION,
+        do_resizing: bool = False,
     ) -> None:
         """Instantiate a new Croma instance.
 
@@ -107,12 +109,21 @@ class Croma(torch.nn.Module):
             modality: the modalities to configure the model to accept.
             pretrained_path: the local path to the pretrained weights. Otherwise it is
                 downloaded and cached in temp directory.
-            image_resolution: the width and height of the input images.
+            image_resolution: the width and height of the input images passed to the model. if do_resizing is True, the image will be resized to this resolution.
+            do_resizing: Whether to resize the image to the input resolution.
         """
         super().__init__()
         self.size = size
         self.modality = modality
-        self.image_resolution = image_resolution
+        self.do_resizing = do_resizing
+        if not do_resizing:
+            self.image_resolution = image_resolution
+        else:
+            # With single pixel input, we always resample to the patch size.
+            if image_resolution == 1:
+                self.image_resolution = PATCH_SIZE
+            else:
+                self.image_resolution = DEFAULT_IMAGE_RESOLUTION
 
         # Cache the CROMA weights to a deterministic path in temporary directory if the
         # path is not provided by the user.
@@ -137,7 +148,16 @@ class Croma(torch.nn.Module):
             pretrained_path=pretrained_path,
             size=size.value,
             modality=modality.value,
-            image_resolution=image_resolution,
+            image_resolution=self.image_resolution,
+        )
+
+    def _resize_image(self, image: torch.Tensor) -> torch.Tensor:
+        """Resize the image to the input resolution."""
+        return F.interpolate(
+            image,
+            size=(self.image_resolution, self.image_resolution),
+            mode="bilinear",
+            align_corners=False,
         )
 
     def forward(self, inputs: list[dict[str, Any]]) -> list[torch.Tensor]:
@@ -151,8 +171,11 @@ class Croma(torch.nn.Module):
         sentinel2: torch.Tensor | None = None
         if self.modality in [CromaModality.BOTH, CromaModality.SENTINEL1]:
             sentinel1 = torch.stack([inp["sentinel1"] for inp in inputs], dim=0)
+            sentinel1 = self._resize_image(sentinel1) if self.do_resizing else sentinel1
         if self.modality in [CromaModality.BOTH, CromaModality.SENTINEL2]:
             sentinel2 = torch.stack([inp["sentinel2"] for inp in inputs], dim=0)
+            sentinel2 = self._resize_image(sentinel2) if self.do_resizing else sentinel2
+
         outputs = self.model(
             SAR_images=sentinel1,
             optical_images=sentinel2,

{rslearn-0.0.13 → rslearn-0.0.15}/rslearn/models/satlaspretrain.py

@@ -4,15 +4,14 @@ from typing import Any
 
 import satlaspretrain_models
 import torch
+import torch.nn.functional as F
 
 
 class SatlasPretrain(torch.nn.Module):
     """SatlasPretrain backbones."""
 
     def __init__(
-        self,
-        model_identifier: str,
-        fpn: bool = False,
+        self, model_identifier: str, fpn: bool = False, resize_to_pretrain: bool = False
     ) -> None:
         """Instantiate a new SatlasPretrain instance.
 
@@ -21,6 +20,8 @@ class SatlasPretrain(torch.nn.Module):
                 https://github.com/allenai/satlaspretrain_models
             fpn: whether to include the feature pyramid network, otherwise only the
                 Swin-v2-Transformer is used.
+            resize_to_pretrain: whether to resize inputs to the pretraining input
+                size (512 x 512)
         """
         super().__init__()
         weights_manager = satlaspretrain_models.Weights()
@@ -49,6 +50,19 @@ class SatlasPretrain(torch.nn.Module):
                 [16, 1024],
                 [32, 2048],
             ]
+        self.resize_to_pretrain = resize_to_pretrain
+
+    def maybe_resize(self, data: torch.Tensor) -> list[torch.Tensor]:
+        """Resize to pretraining sizes if resize_to_pretrain == True."""
+        if self.resize_to_pretrain:
+            return F.interpolate(
+                data,
+                size=(512, 512),
+                mode="bilinear",
+                align_corners=False,
+            )
+        else:
+            return data
 
     def forward(self, inputs: list[dict[str, Any]]) -> list[torch.Tensor]:
         """Compute feature maps from the SatlasPretrain backbone.
@@ -58,7 +72,7 @@ class SatlasPretrain(torch.nn.Module):
                 process.
         """
         images = torch.stack([inp["image"] for inp in inputs], dim=0)
-        return self.model(images)
+        return self.model(self.maybe_resize(images))
 
     def get_backbone_channels(self) -> list:
         """Returns the output channels of this model when used as a backbone.

{rslearn-0.0.13 → rslearn-0.0.15}/rslearn/models/terramind.py

@@ -4,6 +4,7 @@ from enum import Enum
 from typing import Any
 
 import torch
+import torch.nn.functional as F
 from einops import rearrange
 from terratorch.registry import BACKBONE_REGISTRY
 
@@ -18,6 +19,8 @@ class TerramindSize(str, Enum):
     LARGE = "large"
 
 
+# Pretraining image size for Terramind
+IMAGE_SIZE = 224
 # Default patch size for Terramind
 PATCH_SIZE = 16
 
@@ -89,12 +92,14 @@ class Terramind(torch.nn.Module):
         self,
         model_size: TerramindSize,
         modalities: list[str] = ["S2L2A"],
+        do_resizing: bool = False,
     ) -> None:
         """Initialize the Terramind model.
 
         Args:
             model_size: The size of the Terramind model.
             modalities: The modalities to use.
+            do_resizing: Whether to resize the input images to the pretraining resolution.
         """
         super().__init__()
 
@@ -116,6 +121,7 @@ class Terramind(torch.nn.Module):
 
         self.model_size = model_size
         self.modalities = modalities
+        self.do_resizing = do_resizing
 
     def forward(self, inputs: list[dict[str, Any]]) -> list[torch.Tensor]:
         """Forward pass for the Terramind model.
@@ -132,6 +138,19 @@ class Terramind(torch.nn.Module):
             if modality not in inputs[0]:
                 continue
             cur = torch.stack([inp[modality] for inp in inputs], dim=0)  # (B, C, H, W)
+            if self.do_resizing and (
+                cur.shape[2] != IMAGE_SIZE or cur.shape[3] != IMAGE_SIZE
+            ):
+                if cur.shape[2] == 1 and cur.shape[3] == 1:
+                    new_height, new_width = PATCH_SIZE, PATCH_SIZE
+                else:
+                    new_height, new_width = IMAGE_SIZE, IMAGE_SIZE
+                cur = F.interpolate(
+                    cur,
+                    size=(new_height, new_width),
+                    mode="bilinear",
+                    align_corners=False,
+                )
             model_inputs[modality] = cur
 
         # By default, the patch embeddings are averaged over all modalities to reduce output tokens