From 373c9406744beea5b6882d31b2fbe89745e3e11f Mon Sep 17 00:00:00 2001
From: janEbert <janpublicebert@posteo.net>
Date: Wed, 9 Oct 2024 09:48:36 +0200
Subject: [PATCH] Fix awkward script exits

This way we don't quit an interactive session.
---
 pytorch-ddp-example/activate.sh  | 6 +++---
 pytorch-ddp-example/set_up.sh    | 6 +++---
 pytorch-fsdp-example/activate.sh | 6 +++---
 pytorch-fsdp-example/set_up.sh   | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pytorch-ddp-example/activate.sh b/pytorch-ddp-example/activate.sh
index b6f4c29..b5d1de7 100644
--- a/pytorch-ddp-example/activate.sh
+++ b/pytorch-ddp-example/activate.sh
@@ -12,19 +12,19 @@ venv_dir="$curr_dir"/env-"$SYSTEMNAME"
 module --force purge
 if ! [ -f "$curr_dir"/modules.sh ]; then
     echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
-    exit 1
+    return 1
 fi
 source "$curr_dir"/modules.sh
 
 if ! [ -d "$venv_dir" ]; then
     echo "Please manually execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
          "on a login node to create the \`venv\`."
-    exit 1
+    return 1
 elif ! [ -f "$venv_dir"/bin/activate ]; then
     echo "Something seems to be wrong with the \`venv\` at \`$venv_dir\`." \
          "Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
          "execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
          "on a login node to re-create the \`venv\`."
-    exit 1
+    return 1
 fi
 source "$venv_dir"/bin/activate
diff --git a/pytorch-ddp-example/set_up.sh b/pytorch-ddp-example/set_up.sh
index 0e45918..2780b72 100644
--- a/pytorch-ddp-example/set_up.sh
+++ b/pytorch-ddp-example/set_up.sh
@@ -11,7 +11,7 @@ if ! [ -d "$venv_dir" ]; then
     module --force purge
     if ! [ -f "$curr_dir"/modules.sh ]; then
         echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
-        exit 1
+        return 1
     fi
     source "$curr_dir"/modules.sh
 
@@ -22,7 +22,7 @@ if ! [ -d "$venv_dir" ]; then
              "Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
              "execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
              "on a login node to re-create the \`venv\`."
-        exit 1
+        return 1
     fi
     source "$venv_dir"/bin/activate
 
@@ -30,7 +30,7 @@ if ! [ -d "$venv_dir" ]; then
     if ! [ -f "$curr_dir"/requirements.txt ]; then
         echo "Cannot find \`$curr_dir/requirements.txt\`;" \
              "its existence is required."
-        exit 1
+        return 1
     fi
     python -m pip install -r "$curr_dir"/requirements.txt
 
diff --git a/pytorch-fsdp-example/activate.sh b/pytorch-fsdp-example/activate.sh
index b6f4c29..b5d1de7 100644
--- a/pytorch-fsdp-example/activate.sh
+++ b/pytorch-fsdp-example/activate.sh
@@ -12,19 +12,19 @@ venv_dir="$curr_dir"/env-"$SYSTEMNAME"
 module --force purge
 if ! [ -f "$curr_dir"/modules.sh ]; then
     echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
-    exit 1
+    return 1
 fi
 source "$curr_dir"/modules.sh
 
 if ! [ -d "$venv_dir" ]; then
     echo "Please manually execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
          "on a login node to create the \`venv\`."
-    exit 1
+    return 1
 elif ! [ -f "$venv_dir"/bin/activate ]; then
     echo "Something seems to be wrong with the \`venv\` at \`$venv_dir\`." \
          "Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
          "execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
          "on a login node to re-create the \`venv\`."
-    exit 1
+    return 1
 fi
 source "$venv_dir"/bin/activate
diff --git a/pytorch-fsdp-example/set_up.sh b/pytorch-fsdp-example/set_up.sh
index 0e45918..2780b72 100644
--- a/pytorch-fsdp-example/set_up.sh
+++ b/pytorch-fsdp-example/set_up.sh
@@ -11,7 +11,7 @@ if ! [ -d "$venv_dir" ]; then
     module --force purge
     if ! [ -f "$curr_dir"/modules.sh ]; then
         echo "Cannot find \`$curr_dir/modules.sh\`; its existence is required."
-        exit 1
+        return 1
     fi
     source "$curr_dir"/modules.sh
 
@@ -22,7 +22,7 @@ if ! [ -d "$venv_dir" ]; then
              "Please delete it (\`nice rm -rf ${venv_dir@Q}\`) and" \
              "execute \`nice bash ${curr_dir@Q}/set_up.sh\`" \
              "on a login node to re-create the \`venv\`."
-        exit 1
+        return 1
     fi
     source "$venv_dir"/bin/activate
 
@@ -30,7 +30,7 @@ if ! [ -d "$venv_dir" ]; then
     if ! [ -f "$curr_dir"/requirements.txt ]; then
         echo "Cannot find \`$curr_dir/requirements.txt\`;" \
              "its existence is required."
-        exit 1
+        return 1
     fi
     python -m pip install -r "$curr_dir"/requirements.txt
 
-- 
GitLab