amend

pytorch · Oct 9, 2023 · a78321b · a78321b
1 parent 286c967
commit a78321b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/.circleci/unittest/linux/scripts/install.sh b/.circleci/unittest/linux/scripts/install.sh
@@ -7,8 +7,8 @@ unset PYTORCH_VERSION
 
 set -e
 
-#eval "$(./conda/bin/conda shell.bash hook)"
-#conda activate ./env
+eval "$(./conda/bin/conda shell.bash hook)"
+conda activate ./env
 
 if [ "${CU_VERSION:-}" == cpu ] ; then
     echo "Using cpu build"

diff --git a/.circleci/unittest/linux/scripts/post_process.sh b/.circleci/unittest/linux/scripts/post_process.sh
@@ -2,5 +2,5 @@
 
 set -e
 
-#eval "$(./conda/bin/conda shell.bash hook)"
-#conda activate ./env
+eval "$(./conda/bin/conda shell.bash hook)"
+conda activate ./env
diff --git a/.circleci/unittest/linux/scripts/run_test.sh b/.circleci/unittest/linux/scripts/run_test.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-#eval "$(./conda/bin/conda shell.bash hook)"
-#conda activate ./env
+eval "$(./conda/bin/conda shell.bash hook)"
+conda activate ./env
 
 export PYTORCH_TEST_WITH_SLOW='1'
 python -m torch.utils.collect_env

diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh
@@ -13,7 +13,7 @@ this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # Avoid error: "fatal: unsafe repository"
 git config --global --add safe.directory '*'
 root_dir="$(git rev-parse --show-toplevel)"
-#conda_dir="${root_dir}/conda"
+conda_dir="${root_dir}/conda"
 env_dir="${root_dir}/env"
 
 cd "${root_dir}"
@@ -23,21 +23,21 @@ case "$(uname -s)" in
     *) os=Linux
 esac
 
-## 1. Install conda at ./conda
-#if [ ! -d "${conda_dir}" ]; then
-#    printf "* Installing conda\n"
-#    wget -O miniconda.sh "http://repo.continuum.io/miniconda/Miniconda3-latest-${os}-x86_64.sh"
-#    bash ./miniconda.sh -b -f -p "${conda_dir}"
-#fi
-#eval "$(${conda_dir}/bin/conda shell.bash hook)"
-
-## 2. Create test environment at ./env
-#printf "python: ${PYTHON_VERSION}\n"
-#if [ ! -d "${env_dir}" ]; then
-#    printf "* Creating a test environment\n"
-#    conda create --prefix "${env_dir}" -y python="$PYTHON_VERSION"
-#fi
-#conda activate "${env_dir}"
+# 1. Install conda at ./conda
+if [ ! -d "${conda_dir}" ]; then
+    printf "* Installing conda\n"
+    wget -O miniconda.sh "http://repo.continuum.io/miniconda/Miniconda3-latest-${os}-x86_64.sh"
+    bash ./miniconda.sh -b -f -p "${conda_dir}"
+fi
+eval "$(${conda_dir}/bin/conda shell.bash hook)"
+
+# 2. Create test environment at ./env
+printf "python: ${PYTHON_VERSION}\n"
+if [ ! -d "${env_dir}" ]; then
+    printf "* Creating a test environment\n"
+    conda create --prefix "${env_dir}" -y python="$PYTHON_VERSION"
+fi
+conda activate "${env_dir}"
 
 # 3. Install Conda dependencies
 printf "* Installing dependencies (except PyTorch)\n"