Skip to content

Comments

r.sim: fix turning off parallelization with mask on#5037

Merged
petrasovaa merged 1 commit intoOSGeo:mainfrom
petrasovaa:simwe-fix-mask
Feb 4, 2025
Merged

r.sim: fix turning off parallelization with mask on#5037
petrasovaa merged 1 commit intoOSGeo:mainfrom
petrasovaa:simwe-fix-mask

Conversation

@petrasovaa
Copy link
Contributor

The mask test was in a wrong place, so it didn't turn off parallelization when mask was active.

@petrasovaa petrasovaa added the backport to 8.4 PR needs to be backported to release branch 8.4 label Feb 3, 2025
@petrasovaa petrasovaa added this to the 8.5.0 milestone Feb 3, 2025
@petrasovaa petrasovaa requested a review from wenzeslaus February 3, 2025 20:25
@github-actions github-actions bot added raster Related to raster data processing C Related code is in C module labels Feb 3, 2025
@petrasovaa petrasovaa merged commit 276ddb1 into OSGeo:main Feb 4, 2025
27 of 28 checks passed
@neteler
Copy link
Member

neteler commented Feb 5, 2025

@petrasovaa After the backport to G8.4 there is a CI error (both in r.sim.sediment and r.sim.water):

main.c:418:24: error: call to undeclared function 'Rast_mask_is_present'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]

The reason is that also #4402 needs to be backported.

@nilason
Copy link
Contributor

nilason commented Feb 5, 2025

#4402 changes libraster API, which probably is best to avoid for a patch release. Rast_mask_is_present() can be replaced in 8.4 branch with (G_find_raster("MASK", G_mapset()) != NULL).

@petrasovaa
Copy link
Contributor Author

Sorry for the mess, see #5052.

@petrasovaa petrasovaa deleted the simwe-fix-mask branch February 5, 2025 16:35
@neteler neteler removed the backport to 8.4 PR needs to be backported to release branch 8.4 label Apr 2, 2025
@neteler neteler modified the milestones: 8.5.0, 8.4.2 Apr 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C Related code is in C module raster Related to raster data processing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants