amend

pytorch · Oct 9, 2023 · e57ee16 · e57ee16
1 parent 58a60ea
commit e57ee16
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh
@@ -26,11 +26,7 @@ esac
 # 1. Install conda at ./conda
 if [ ! -d "${conda_dir}" ]; then
     printf "* Installing conda\n"
-    if [[ "$ARCH" == "silicon" ]]; then
-      wget -O miniconda.sh "http://repo.continuum.io/miniconda/Miniconda3-latest-${os}-arm64.sh"
-    else
-      wget -O miniconda.sh "http://repo.continuum.io/miniconda/Miniconda3-latest-${os}-x86_64.sh"
-    fi
+    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)"

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -40,6 +40,7 @@ jobs:
         export TORCH_VERSION=nightly
         # Remove the following line when the GPU tests are working inside docker, and uncomment the above lines
         #export CU_VERSION="cpu"
+        export ARCH=x86_64
 
         echo "PYTHON_VERSION: $PYTHON_VERSION"
         echo "CU_VERSION: $CU_VERSION"
@@ -65,6 +66,7 @@ jobs:
         export PYTHON_VERSION=${{ matrix.python_version }}
         export CU_VERSION="cpu"
         export TORCH_VERSION=nightly
+        export ARCH=x86_64
 
         echo "PYTHON_VERSION: $PYTHON_VERSION"
         echo "CU_VERSION: $CU_VERSION"
@@ -97,6 +99,7 @@ jobs:
         export TORCH_VERSION=stable
         # Remove the following line when the GPU tests are working inside docker, and uncomment the above lines
         #export CU_VERSION="cpu"
+        export ARCH=x86_64
 
         echo "PYTHON_VERSION: $PYTHON_VERSION"
         echo "CU_VERSION: $CU_VERSION"
@@ -122,6 +125,7 @@ jobs:
         export PYTHON_VERSION=${{ matrix.python_version }}
         export CU_VERSION="cpu"
         export TORCH_VERSION=stable
+        export ARCH=x86_64
 
         echo "PYTHON_VERSION: $PYTHON_VERSION"
         echo "CU_VERSION: $CU_VERSION"

diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -36,6 +36,7 @@ jobs:
         export CU_VERSION="cpu"
         export SYSTEM_VERSION_COMPAT=0
         export TORCH_VERSION=nightly
+        export ARCH=x86_64
 
         echo "PYTHON_VERSION: $PYTHON_VERSION"
         echo "CU_VERSION: $CU_VERSION"
@@ -64,7 +65,7 @@ jobs:
         export CU_VERSION="cpu"
         export SYSTEM_VERSION_COMPAT=0
         export TORCH_VERSION=nightly
-        export ARCH=silicon
+        export ARCH=arm64
 
         echo "PYTHON_VERSION: $PYTHON_VERSION"
         echo "CU_VERSION: $CU_VERSION"