From 39e488b1718ea064436f5d6165ed5fc7f0b16926 Mon Sep 17 00:00:00 2001 From: David Frantz Date: Thu, 23 May 2024 15:00:29 +0200 Subject: [PATCH] Revert "Revert "force-cube with memory limits"" This reverts commit e3f839902f19d6f0e1bc9ad4d9febc5e0809f56c. --- bash/force-cube.sh | 5 ++++- misc/force-version.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bash/force-cube.sh b/bash/force-cube.sh index f0f014f1..6b161f7d 100755 --- a/bash/force-cube.sh +++ b/bash/force-cube.sh @@ -386,10 +386,13 @@ for i in "$@"; do debug "Y_TILE_RANGE = $TYMIN $TYMAX" + # check free RAM + MEMORY=$(LANG="C"; free --mega | awk '/^Mem/ { printf("%.0fM\n", $2 * 0.05) }') + # cube the file, spawn multiple jobs for each tile export WKT ORIGX ORIGY TILESIZE CHUNKSIZE RES export FINP DOUT COUT INODATA ONODATA RESAMPLE RASTER DATATYPE ATTRIBUTE - $PARALLEL_EXE -j $NJOB cubethis {1} {2} ::: $(seq $TXMIN $TXMAX) ::: $(seq $TYMIN $TYMAX) + $PARALLEL_EXE -j $NJOB --memsuspend "$MEMORY" cubethis {1} {2} ::: $(seq $TXMIN $TXMAX) ::: $(seq $TYMIN $TYMAX) # remove the temporary file rm "$FTMP" diff --git a/misc/force-version.txt b/misc/force-version.txt index aaa44e12..a436e30c 100644 --- a/misc/force-version.txt +++ b/misc/force-version.txt @@ -1 +1 @@ -3.7.12-dev:::2024-05-23_08:51:57 +3.7.12-dev:::2024-05-23_13:00:29