From c3650b14aa910e6fd109284237fe98d9a2d63802 Mon Sep 17 00:00:00 2001 From: Abdallah Mohamed Abdallah Abdelnaby Date: Wed, 4 Sep 2024 13:44:44 +0200 Subject: [PATCH] ram and cpu default change --- goobi_operandi.sh | 7 ++++--- kitodo_operandi.sh | 4 ++-- script_docker.sh | 6 +++--- script_native.sh | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/goobi_operandi.sh b/goobi_operandi.sh index 29feb4b..419ca2e 100644 --- a/goobi_operandi.sh +++ b/goobi_operandi.sh @@ -349,7 +349,7 @@ submit_job() { process_with_local_ocrd() { WORKSPACE_DIR_LOCAL="$WORKSPACE_DIR"_local/data - WS_LOCAL_OCRD_PATH="/data/$(PROCESS_TITLE)_local/data" + WS_LOCAL_OCRD_PATH="/data/"$PROCESS_TITLE"_local/data" METS_SERVER_LOG="${WS_LOCAL_OCRD_PATH}/mets_server.log" SOCKET_PATH="${WS_LOCAL_OCRD_PATH}/mets_server.sock" unzip -o "$WORKSPACE_DIR".ocrd.zip -d "$WORKSPACE_DIR"_local @@ -421,9 +421,10 @@ upload_to_ola_hd() { } # Function to handle results for kitodo handle_results() { + echo "Process title is $PROCESS_TITLE" unzip -o "$OCRD_RESULTS" -d "$WORKSPACE_DIR"_results - mkdir -p $PARENT_WORKSPACE/ocr/$(PROCESS_TITLE)_alto - mv -f "$WORKSPACE_DIR"_results/data/*ALTO*/* $PARENT_WORKSPACE/ocr/$(PROCESS_TITLE)_alto/ + mkdir -p $PARENT_WORKSPACE/ocr/"$PROCESS_TITLE"_alto + mv -f "$WORKSPACE_DIR"_results/data/*ALTO*/* $PARENT_WORKSPACE/ocr/"$PROCESS_TITLE"_alto/ echo "$OCRD_RESULTS" > "$PARENT_WORKSPACE/.ocrd_results_path" } diff --git a/kitodo_operandi.sh b/kitodo_operandi.sh index 2f71a0c..afab4d3 100644 --- a/kitodo_operandi.sh +++ b/kitodo_operandi.sh @@ -25,8 +25,8 @@ WORKFLOW="default_workflow.nf" METS_URL="" IMAGE_DIR=$(pwd)/images EXT="jpg" -CPUs=4 -RAM=8 +CPUs=8 +RAM=64 ZIP="" workflow_id="default_workflow" LOCAL_OCRD=false diff --git a/script_docker.sh b/script_docker.sh index 9bad081..194f601 100644 --- a/script_docker.sh +++ b/script_docker.sh @@ -25,8 +25,8 @@ WORKFLOW="default_workflow.nf" METS_URL="" IMAGE_DIR=$(pwd)/images EXT="jpg" -CPUs=4 -RAM=8 +CPUs=8 +RAM=64 ZIP="" workflow_id="default_workflow" LOCAL_OCRD=false @@ -349,7 +349,7 @@ submit_job() { process_with_local_ocrd() { WORKSPACE_DIR_LOCAL="$WORKSPACE_DIR"_local/data - WS_LOCAL_OCRD_PATH="/data/$(PROCESS_TITLE)_local/data" + WS_LOCAL_OCRD_PATH="/data/"$PROCESS_TITLE"_local/data" METS_SERVER_LOG="${WS_LOCAL_OCRD_PATH}/mets_server.log" SOCKET_PATH="${WS_LOCAL_OCRD_PATH}/mets_server.sock" unzip -o "$WORKSPACE_DIR".ocrd.zip -d "$WORKSPACE_DIR"_local diff --git a/script_native.sh b/script_native.sh index efc0164..5849194 100644 --- a/script_native.sh +++ b/script_native.sh @@ -26,8 +26,8 @@ WORKFLOW="" METS_URL="" IMAGE_DIR=$(pwd)/images EXT="jpg" -CPUs=4 -RAM=8 +CPUs=8 +RAM=64 ZIP="" workflow_id="default_workflow" LOCAL_OCRD=false