Skip to content

Commit

Permalink
amend
Browse files Browse the repository at this point in the history
  • Loading branch information
vmoens committed Oct 9, 2023
1 parent dcf6e27 commit 286c967
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .circleci/unittest/linux/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ unset PYTORCH_VERSION
set -e

#eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env
#conda activate ./env

if [ "${CU_VERSION:-}" == cpu ] ; then
echo "Using cpu build"
Expand Down
2 changes: 1 addition & 1 deletion .circleci/unittest/linux/scripts/post_process.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
set -e

#eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env
#conda activate ./env
2 changes: 1 addition & 1 deletion .circleci/unittest/linux/scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

#eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env
#conda activate ./env

export PYTORCH_TEST_WITH_SLOW='1'
python -m torch.utils.collect_env
Expand Down
17 changes: 9 additions & 8 deletions .circleci/unittest/linux/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
# Do not install PyTorch and torchvision here, otherwise they also get cached.

set -e
set -v


this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
# Avoid error: "fatal: unsafe repository"
Expand All @@ -29,14 +31,13 @@ esac
#fi
#eval "$(${conda_dir}/bin/conda shell.bash hook)"

# 2. Create test environment at ./env
printf "python: ${PYTHON_VERSION}\n"
conda init bash
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}"
## 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"
Expand Down

0 comments on commit 286c967

Please sign in to comment.