Use conda activate instead of conda run

Author: samanklesaria

.github/scripts/unittest-windows/install.sh

@@ -14,9 +14,9 @@ this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 cd "${root_dir}"
 
-# # 0. Activate conda env
-# eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')"
-# conda activate "${env_dir}"
+# 0. Activate conda env
+eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')"
+conda activate "${env_dir}"
 
 source "$this_dir/set_cuda_envs.sh"
 
@@ -28,9 +28,9 @@ else
 fi
 
 PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/${GPU_ARCH_ID}"
-conda run -p "${env_dir}" pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}"
+pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}"
 
-torch_cuda=$(conda run -p "${env_dir}" python -c "import torch; print(torch.cuda.is_available())")
+torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())")
 echo torch.cuda.is_available is $torch_cuda
 
 if [ ! -z "${CUDA_VERSION:-}" ] ; then
@@ -42,13 +42,13 @@ fi
 
 # 2. Install torchaudio
 printf "* Installing torchaudio\n"
-conda run -p "${env_dir}" "$root_dir/packaging/vc_env_helper.bat" pip install . -v --no-build-isolation
+"$root_dir/packaging/vc_env_helper.bat" pip install . -v --no-build-isolation
 
 # 3. Install Test tools
 printf "* Installing test tools\n"
 NUMBA_DEV_CHANNEL=""
 SENTENCEPIECE_DEPENDENCY="sentencepiece"
-case "$(conda run -p "${env_dir}" python --version)" in
+case "$(python --version)" in
     *3.9*)
         # Numba isn't available for Python 3.9 except on the numba dev channel and building from source fails
         # See https://github.com/librosa/librosa/issues/1270#issuecomment-759065048
@@ -61,10 +61,10 @@ case "$(conda run -p "${env_dir}" python --version)" in
         ;;
 esac
 (
-    conda install -p "${env_dir}" -y -c conda-forge ${NUMBA_DEV_CHANNEL} parameterized 'requests>=2.20'
+    conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} parameterized 'requests>=2.20'
     # Need to disable shell check since this'll fail out if SENTENCEPIECE_DEPENDENCY is empty
     # shellcheck disable=SC2086
-    conda run -p "${env_dir}" pip install \
+    pip install \
         ${SENTENCEPIECE_DEPENDENCY} \
         coverage \
         'numpy >=1.26' \

.github/scripts/unittest-windows/run_test.sh

@@ -2,17 +2,14 @@
 
 set -euxo pipefail
 
-# eval "$(./conda/Scripts/conda.exe 'shell.bash' 'hook')"
+eval "$(./conda/Scripts/conda.exe 'shell.bash' 'hook')"
 
 this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$this_dir/set_cuda_envs.sh"
 
-root_dir="$(git rev-parse --show-toplevel)"
-env_dir="${root_dir}/env"
-
-conda run -p "${env_dir}" python -m torch.utils.collect_env
+python -m torch.utils.collect_env
 env | grep TORCHAUDIO || true
 
 cd test
-conda run -p "${env_dir}" pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest -k "not torchscript and not fairseq and not demucs and not librosa"
-conda run -p "${env_dir}" coverage html
+pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest -k "not torchscript and not fairseq and not demucs and not librosa"
+coverage html

.github/scripts/unittest-windows/setup_env.sh

@@ -19,7 +19,9 @@ if [ ! -d "${conda_dir}" ]; then
     printf "* Installing conda\n"
     export tmp_conda="$(echo $conda_dir | tr '/' '\\')"
     export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe"
-    curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -O
+    # not using miniconda because its installation will be incomplete
+    # despite using `start /wait` in the install batch file
+    curl -L --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O
     "$this_dir/install_conda.bat"
     unset tmp_conda
     unset miniconda_exe
@@ -34,5 +36,5 @@ fi
 conda init bash
 
 # 3. Install minimal build tools
-conda run -p "${env_dir}" pip --quiet install cmake ninja
-conda install -p "${env_dir}" -y 'ffmpeg>=4.1'
+pip --quiet install cmake ninja
+conda install -y 'ffmpeg>=4.1'