cars 0.12.1__tar.gz → 0.12.3__tar.gz

{cars-0.12.1 → cars-0.12.3}/.gitlab-ci.yml

@@ -35,16 +35,14 @@ include:
     rules:
       # do not trigger this case if env has changed(see second case)
       - changes:
-        - "ci/cars-deps-env/Dockerfile"
-        - "pyproject.toml"
+          compare_to: 'refs/heads/master'
+          paths:
+            - "ci/cars-deps-env/Dockerfile"
+            - "pyproject.toml"
         when: never
       # do not trigger this case on master (see third case)
       - if: $CI_COMMIT_REF_NAME == "master"
         when: never
-      - if: $CI_COMMIT_REF_NAME == "cars_0_12_patches"
-        when: never
-      - if: $CI_COMMIT_REF_NAME == "release_0_12_1"
-        when: never
   # Second case: env should be generated on a dev branch, create a temporary
   # image
   - local: '/ci/cars-docker-build.yml'
@@ -52,13 +50,13 @@ include:
       tag: ${CI_COMMIT_REF_NAME}
     rules:
       - changes:
-        - "ci/cars-deps-env/Dockerfile"
-        - "pyproject.toml"
+          compare_to: 'refs/heads/master'
+          paths:
+            - "ci/cars-deps-env/Dockerfile"
+            - "pyproject.toml"
       # do not trigger this case on master (see third case)
       - if: $CI_COMMIT_REF_NAME == "master"
         when: never
-      - if: $CI_COMMIT_REF_NAME == "cars_0_12_patches"
-      - if: $CI_COMMIT_REF_NAME == "release_0_12_1"
   # Third case: master branch pipeline: generate a "latest" image
   - local: '/ci/cars-docker-build.yml'
     inputs:

{cars-0.12.1 → cars-0.12.3}/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.12.3  Bugfix release (October 2025)
+
+- Robustify pandora tile size computation [#1221]
+
+
+## 0.12.2  Bugfix release (October 2025)
+
+- Fix a bug where the DEM min was higher than DEM max in dem generation [#1211]
+
+
 ## 0.12.1  Bugfix release (August 2025)
 
 - Cleanup sequential orchestrator [#1123].

{cars-0.12.1 → cars-0.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cars
-Version: 0.12.1
+Version: 0.12.3
 Summary: A satellite multi view stereo pipeline
 Keywords: cars,3D,DEM,pandora,photogrammetry
 Author-Email: CNES <cars@cnes.fr>

{cars-0.12.1 → cars-0.12.3}/cars/applications/dem_generation/rasterization.py

@@ -552,6 +552,13 @@ class Rasterization(DemGeneration, short_name="bulldozer_on_raster"):
             dem_data + self.max_height_margin,
             dem_max,
         )
+        # Rectify pixels where DEM min > DEM max - margin, to ensure that
+        # DEM min < DEM max even on filled pixels
+        dem_min = np.where(
+            dem_min > dem_max - self.min_height_margin,
+            dem_max - self.min_height_margin,
+            dem_min,
+        )
 
         with rio.open(dem_min_path, "w", **dem_min_metadata) as out_dem:
             out_dem.write(dem_min)

{cars-0.12.1 → cars-0.12.3}/cars/applications/dense_matching/dense_matching_tools.py

@@ -25,6 +25,7 @@ This module is responsible for the dense matching algorithms:
 
 # Standard imports
 import logging
+import math
 from typing import Dict
 
 import numpy as np
@@ -938,7 +939,7 @@ def optimal_tile_size_pandora_plugin_libsgm(
     """
 
     memory = max_ram_per_worker
-    disp = disp_max - disp_min
+    disp = max(3, abs(disp_max - disp_min))
 
     image = 32 * 2
     disp_ref = 32
@@ -968,13 +969,17 @@ def optimal_tile_size_pandora_plugin_libsgm(
         # but sqrt(nb_pixels + (disp/2)**2) - disp/2
         tile_size = np.sqrt(row_or_col + (disp / 2) ** 2) - disp / 2
         tile_size = (1.0 - margin / 100.0) * tile_size
-        tile_size = tile_size_rounding * int(tile_size / tile_size_rounding)
+
+    if math.isinf(tile_size):
+        logging.warning("Tile size infinite")
 
     if tile_size > max_tile_size:
         tile_size = max_tile_size
     elif tile_size < min_tile_size:
         tile_size = min_tile_size
 
+    tile_size = tile_size_rounding * int(tile_size / tile_size_rounding)
+
     return tile_size
 
 

{cars-0.12.1 → cars-0.12.3}/meson.build

@@ -1,7 +1,7 @@
 project(
   'cars',
   'cpp',
-version : '0.12.1',
+version : '0.12.3',
   default_options : ['cpp_std=c++17']
 )