From 8900fabe5705b2f55b103ab2d8c6e17ae7464637 Mon Sep 17 00:00:00 2001 From: Joel Mathew Thomas <90510078+joelmathewthomas@users.noreply.github.com> Date: Sun, 26 Jan 2025 17:10:03 +0530 Subject: [PATCH 1/3] correctly set path in site-packages.pth --- scripts/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/setup_env.sh b/scripts/setup_env.sh index 628b7ee..211e35f 100755 --- a/scripts/setup_env.sh +++ b/scripts/setup_env.sh @@ -32,5 +32,5 @@ deactivate echo "Creating site-packages.pth" touch site-packages.pth -echo "env/env/lib/python3.12/site-packages" >> site-packages.pth -echo "env/env_tensorflow/lib/python3.12/site-packages" >> site-packages.pth +echo "envs/env/lib/python3.12/site-packages" >> site-packages.pth +echo "envs/env_tensorflow/lib/python3.12/site-packages" >> site-packages.pth From e63513d336f5bf49dfc9d623791ed5f2160bb6c1 Mon Sep 17 00:00:00 2001 From: Joel Mathew Thomas <90510078+joelmathewthomas@users.noreply.github.com> Date: Sun, 26 Jan 2025 18:10:53 +0530 Subject: [PATCH 2/3] remove site-packages.pth --- scripts/setup_env.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/setup_env.sh b/scripts/setup_env.sh index 211e35f..894b055 100755 --- a/scripts/setup_env.sh +++ b/scripts/setup_env.sh @@ -27,10 +27,6 @@ pip install -r requirements/env.txt deactivate source envs/env_tensorflow/bin/activate +echo "Installing dependencies in virtual environment env_tensorflow" pip install -r requirements/env_tensorflow.txt deactivate - -echo "Creating site-packages.pth" -touch site-packages.pth -echo "envs/env/lib/python3.12/site-packages" >> site-packages.pth -echo "envs/env_tensorflow/lib/python3.12/site-packages" >> site-packages.pth From a041e7f0efcd5105296f95076ad9cc4607928575 Mon Sep 17 00:00:00 2001 From: Joel Mathew Thomas <90510078+joelmathewthomas@users.noreply.github.com> Date: Sun, 26 Jan 2025 18:11:19 +0530 Subject: [PATCH 3/3] add script which can be sourced to setup the current SHELL environment --- scripts/activate.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 scripts/activate.sh diff --git a/scripts/activate.sh b/scripts/activate.sh new file mode 100755 index 0000000..8e3fa01 --- /dev/null +++ b/scripts/activate.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Define the paths for the environments +ENV_1_PATH="envs/env" +ENV_2_PATH="envs/env_tensorflow" + +# Check if the environments exist +if [ ! -d "$ENV_1_PATH" ] || [ ! -d "$ENV_2_PATH" ]; then + echo "One or both environments do not exist in the 'envs/' directory." + exit 1 +fi + +# Activate the first environment (default) +echo "Activating environment '$ENV_1_PATH'..." +source "$ENV_1_PATH/bin/activate" + +# Export PYTHONPATH to include both environments' site-packages +export PYTHONPATH="$PWD/$ENV_1_PATH/lib/python3.12/site-packages:$PWD/$ENV_2_PATH/lib/python3.12/site-packages" + +echo "Environment set up successfully. PYTHONPATH set to include both environments." + +# Optionally, print the current PYTHONPATH to verify +echo "PYTHONPATH=${PYTHONPATH}"