From 0afbd58f33e0cb80eacac81b07e046c0229c30ce Mon Sep 17 00:00:00 2001
From: Femke Gelderblom <femke.gelderblom@sintef.no>
Date: Thu, 5 Oct 2023 13:15:49 +0200
Subject: [PATCH] FIX: added working directory to other bash scripts and fixed
 docker image naming

---
 README.md          | 6 +++---
 preprocess_data.sh | 3 ++-
 test_model.sh      | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ca35d07..6b76524 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Once the necessary files have been dowloaded, you can either pull the Docker ima
 
 ```bash
 docker pull docker pull ghcr.io/ninanor/rare_species_detections:main
-docker tag docker pull ghcr.io/ninanor/rare_species_detections:main dcase
+docker tag docker pull ghcr.io/ninanor/rare_species_detections:main beats
 ```
 
 Or create the Docker image from the Dockerfile located in our repository:
@@ -46,7 +46,7 @@ Or create the Docker image from the Dockerfile located in our repository:
 ```bash
 git clone https://github.com/NINAnor/rare_species_detections.git
 cd rare_species_detections
-docker build -t dcase -f Dockerfile .
+docker build -t beats -f Dockerfile .
 ```
 
 ## Processing the data
@@ -89,7 +89,7 @@ Once the `eval_out.csv` has been created, it is possible to get the results for
 docker run -v $CODE_DIR:/app \
             -v $DATA_DIR:/data \  
             --gpus all \
-            dcase \
+            beats \
             poetry run python evaluation/evaluation_metrics/evaluation.py \
             -pred_file /data/eval_out.csv \
             -ref_files_path /data/DCASE/Development_Set_annotations/Validation_Set \
diff --git a/preprocess_data.sh b/preprocess_data.sh
index 1fadd68..c85117d 100755
--- a/preprocess_data.sh
+++ b/preprocess_data.sh
@@ -9,8 +9,9 @@ declare -A SETS=( ["Training_Set"]="train" ["Validation_Set"]="validate" ["Evalu
 for SET in "${!SETS[@]}"; do
     STATUS=${SETS[$SET]}
     docker run -v $DATA_DIR:/data \
+            -v $PWD:/app \
             --gpus all \
-            dcase \
+            beats \
             poetry run python /app/data_utils/DCASEfewshot.py \
                 --set_type $SET \
                 --status $STATUS
diff --git a/test_model.sh b/test_model.sh
index 31fbffb..bb66d59 100755
--- a/test_model.sh
+++ b/test_model.sh
@@ -5,8 +5,9 @@ N_DETECTED_SUPPORTS=${2:-0}
 TOLERANCE=${3:-0}
 
 docker run -v $BASE_DIR:/data \
+            -v $PWD:/app \
             --gpus all \
-            dcase \
+            beats \
             poetry run python /app/evaluate/evaluateDCASE.py \
             --wav_save \
             --overwrite \