Update N_JOBS

jolespin · Aug 30, 2024 · 494ee56 · 494ee56
1 parent e273b65
commit 494ee56
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/install/download_databases-annotate.sh b/install/download_databases-annotate.sh
@@ -10,7 +10,7 @@ REALPATH_DATABASE_DIRECTORY=$(realpath $DATABASE_DIRECTORY)
 SCRIPT_DIRECTORY=$(dirname "$0")
 
 MAXIMUM_NUMBER_OF_CPU=$(python -c "from multiprocessing import cpu_count; print(cpu_count())")
-N_JOBS=$(2:-${MAXIMUM_NUMBER_OF_CPU})
+N_JOBS=${3:-${MAXIMUM_NUMBER_OF_CPU}}
 
 # Database structure
 echo ". .. ... ..... ........ ............."

diff --git a/install/download_databases-classify.sh b/install/download_databases-classify.sh
@@ -10,7 +10,7 @@ REALPATH_DATABASE_DIRECTORY=$(realpath $DATABASE_DIRECTORY)
 SCRIPT_DIRECTORY=$(dirname "$0")
 
 MAXIMUM_NUMBER_OF_CPU=$(python -c "from multiprocessing import cpu_count; print(cpu_count())")
-N_JOBS=$(2:-${MAXIMUM_NUMBER_OF_CPU})
+N_JOBS=${3:-${MAXIMUM_NUMBER_OF_CPU}}
 
 # Database structure
 echo ". .. ... ..... ........ ............."

diff --git a/install/download_databases-contamination.sh b/install/download_databases-contamination.sh
@@ -10,7 +10,7 @@ REALPATH_DATABASE_DIRECTORY=$(realpath $DATABASE_DIRECTORY)
 SCRIPT_DIRECTORY=$(dirname "$0")
 
 MAXIMUM_NUMBER_OF_CPU=$(python -c "from multiprocessing import cpu_count; print(cpu_count())")
-N_JOBS=$(2:-${MAXIMUM_NUMBER_OF_CPU})
+N_JOBS=${3:-${MAXIMUM_NUMBER_OF_CPU}}
 
 # Database structure
 echo ". .. ... ..... ........ ............."

diff --git a/install/download_databases-markers.sh b/install/download_databases-markers.sh
@@ -10,7 +10,7 @@ REALPATH_DATABASE_DIRECTORY=$(realpath $DATABASE_DIRECTORY)
 SCRIPT_DIRECTORY=$(dirname "$0")
 
 MAXIMUM_NUMBER_OF_CPU=$(python -c "from multiprocessing import cpu_count; print(cpu_count())")
-N_JOBS=$(2:-${MAXIMUM_NUMBER_OF_CPU})
+N_JOBS=${3:-${MAXIMUM_NUMBER_OF_CPU}}
 
 # Database structure
 echo ". .. ... ..... ........ ............."

diff --git a/install/download_databases.sh b/install/download_databases.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # __version__ = "2024.8.30"
 # MICROEUKAYROTIC_DATABASE_VERSION = "MicroEuk_v3"
-# usage: bash veba/download_databases.sh /path/to/veba_database_destination/ [optional positional argument: /path/to/conda_environments/]
+# usage: bash veba/download_databases.sh /path/to/veba_database_destination/ [optional positional argument: /path/to/conda_environments/ number_of_threads]
 # Version
 VEBA_DATABASE_VERSION="VDB_v7"
 
@@ -13,7 +13,11 @@ SCRIPT_DIRECTORY=$(dirname "$0")
 CONDA_ENVS_PATH=${2:-"$(conda info --base)/envs/"}
 
 MAXIMUM_NUMBER_OF_CPU=$(python -c "from multiprocessing import cpu_count; print(cpu_count())")
-N_JOBS=$(3:-${MAXIMUM_NUMBER_OF_CPU})
+N_JOBS=${3:-${MAXIMUM_NUMBER_OF_CPU}}
+echo ". .. ... ..... ........ ............."
+echo "Detected ${MAXIMUM_NUMBER_OF_CPU} available threads"
+echo "Using ${N_JOBS} threads"
+echo ". .. ... ..... ........ ............."
 
 # Database structure
 echo ". .. ... ..... ........ ............."