amend

pytorch · Oct 9, 2023 · 8ee5f98 · 8ee5f98
1 parent d69ecda
commit 8ee5f98
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.circleci/unittest/linux/scripts/install.sh b/.circleci/unittest/linux/scripts/install.sh
@@ -6,6 +6,7 @@ unset PYTORCH_VERSION
 # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config.
 
 set -e
+set -v
 
 eval "$(./conda/bin/conda shell.bash hook)"
 conda activate ./env
@@ -27,26 +28,26 @@ git submodule sync && git submodule update --init --recursive
 printf "Installing PyTorch with %s\n" "${CU_VERSION}"
 if [[ "$TORCH_VERSION" == "nightly" ]]; then
   if [ "${CU_VERSION:-}" == cpu ] ; then
-      python3 -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu
+      python -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu
   else
-      python3 -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/$CU_VERSION
+      python -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/$CU_VERSION
   fi
 elif [[ "$TORCH_VERSION" == "stable" ]]; then
     if [ "${CU_VERSION:-}" == cpu ] ; then
-      python3 -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
+      python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
   else
-      python3 -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/$CU_VERSION
+      python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/$CU_VERSION
   fi
 else
   printf "Failed to install pytorch"
   exit 1
 fi
 
 printf "* Installing tensordict\n"
-python3 setup.py develop
+python setup.py develop
 
 # install torchsnapshot nightly
-python3 -m pip install git+https://github.com/pytorch/torchsnapshot --no-build-isolation
+python -m pip install git+https://github.com/pytorch/torchsnapshot --no-build-isolation
 
 # smoke test
 python -c "import functorch;import torchsnapshot"
diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh
@@ -24,11 +24,11 @@ case "$(uname -s)" in
 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}-${ARCH}.sh"
-bash ./miniconda.sh -b -f -p "${conda_dir}"
-#fi
+if [ ! -d "${conda_dir}" ]; then
+    printf "* Installing conda\n"
+    wget -O miniconda.sh "http://repo.continuum.io/miniconda/Miniconda3-latest-${os}-${ARCH}.sh"
+    bash ./miniconda.sh -b -f -p "${conda_dir}"
+fi
 eval "$(${conda_dir}/bin/conda shell.bash hook)"
 
 # 2. Create test environment at ./env