no more rlenv

pytorch · vmoens · Dec 20, 2023 · Dec 14, 2023 · Dec 14, 2023 · Dec 15, 2023
commit e923d2d60a807c8a10ce7089f913aabee8f35757
diff --git a/.github/unittest/windows_optdepts/scripts/install.sh b/.github/unittest/windows_optdepts/scripts/install.sh
@@ -9,8 +9,8 @@ set -ex
 
 this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-eval "$(${conda_dir}/Scripts/conda.exe 'shell.bash' 'hook')"
-conda activate rlenv
+eval "$(./conda/Scripts/conda.exe 'shell.bash' 'hook')"
+conda activate ./env
 
 # TODO, refactor the below logic to make it easy to understand how to get correct cuda_version.
 if [ "${CU_VERSION:-}" == cpu ] ; then

diff --git a/.github/unittest/windows_optdepts/scripts/run_test.sh b/.github/unittest/windows_optdepts/scripts/run_test.sh
@@ -2,11 +2,10 @@
 
 set -e
 
-this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-eval "$(${conda_dir}/Scripts/conda.exe 'shell.bash' 'hook')"
-conda activate rlenv
+eval "$(./conda/Scripts/conda.exe 'shell.bash' 'hook')"
+conda activate ./env
 
+this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$this_dir/set_cuda_envs.sh"
 
 python -m torch.utils.collect_env

diff --git a/.github/unittest/windows_optdepts/scripts/setup_env.sh b/.github/unittest/windows_optdepts/scripts/setup_env.sh
@@ -29,11 +29,11 @@ eval "$(${conda_dir}/Scripts/conda.exe 'shell.bash' 'hook')"
 
 # 2. Create test environment at ./env
 printf "* Creating a test environment\n"
-conda create -n rlenv -y python="$PYTHON_VERSION"
+conda create --prefix "${env_dir}" -y python="$PYTHON_VERSION"
 
 printf "* Activating the environment"
 conda deactivate
-conda activate rlenv
+conda activate "${env_dir}"
 
 printf "Python version"
 echo $(which python)