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 b5db796 commit 8b1dcda
Show file tree
Hide file tree
Showing 4 changed files with 11 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 @@ -7,7 +7,7 @@ unset PYTORCH_VERSION

set -e

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

if [ "${CU_VERSION:-}" == cpu ] ; then
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 @@ -2,5 +2,5 @@

set -e

eval "$(./conda/bin/conda shell.bash hook)"
#eval "$(./conda/bin/conda shell.bash hook)"
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 @@ -2,7 +2,7 @@

set -e

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

export PYTORCH_TEST_WITH_SLOW='1'
Expand Down
16 changes: 8 additions & 8 deletions .circleci/unittest/linux/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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}"
Expand All @@ -21,13 +21,13 @@ 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)"
## 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"
Expand Down

0 comments on commit 8b1dcda

Please sign in to comment.