Implement deterministic GeoDataset

Author: DimitrisMantas

tests/datasets/test_geo.py

@@ -76,6 +76,15 @@ class TestGeoDataset:
     def dataset(self) -> GeoDataset:
         return CustomGeoDataset()
 
+    @pytest.fixture(scope="class")
+    def files(self) -> list[str]:
+        """Example list of files in the expected output order.
+
+        Used to test the titular property.
+        """
+        files = ["file://file1.tif", "file://file2.tif", "file://file3.tif"]
+        return files
+
     def test_getitem(self, dataset: GeoDataset) -> None:
         query = BoundingBox(0, 1, 2, 3, 4, 5)
         assert dataset[query] == {"index": query}
@@ -177,6 +186,21 @@ def test_files_property_for_virtual_files(self) -> None:
         ]
         assert len(CustomGeoDataset(paths=paths).files) == len(paths)
 
+    def test_files_property_ordered(self, files: list[str]) -> None:
+        """Ensure that the list of files is ordered."""
+        paths = ["file://file3.tif", "file://file1.tif", "file://file2.tif"]
+        assert CustomGeoDataset(paths=paths).files == files
+
+    def test_files_property_deterministic(self, files: list[str]) -> None:
+        """Ensure that the list of files is consistent regardless of their original
+        order.
+        """
+        paths1 = ["file://file3.tif", "file://file1.tif", "file://file2.tif"]
+        paths2 = ["file://file2.tif", "file://file3.tif", "file://file1.tif"]
+        assert (
+            CustomGeoDataset(paths=paths1).files == CustomGeoDataset(paths=paths2).files
+        )
+
 
 class TestRasterDataset:
     @pytest.fixture(params=zip([["R", "G", "B"], None], [True, False]))

torchgeo/datasets/geo.py

@@ -287,7 +287,7 @@ def res(self, new_res: float) -> None:
         self._res = new_res
 
     @property
-    def files(self) -> set[str]:
+    def files(self) -> list[str]:
         """A list of all files in the dataset.
 
         Returns:
@@ -316,7 +316,8 @@ def files(self) -> set[str]:
                     UserWarning,
                 )
 
-        return files
+        # Sort the output to enforce deterministic behavior.
+        return sorted(files)
 
 
 class RasterDataset(GeoDataset):