Unverified Commit 96f5467b authored by Eli Uriegas's avatar Eli Uriegas Committed by GitHub
Browse files

ci: Update macos runner to self hosted (#6290)


Co-authored-by: default avatarNicolas Hug <contact@nicolas-hug.com>
Co-authored-by: default avatarVasilis Vryniotis <datumbox@users.noreply.github.com>
parent 91176e80
...@@ -18,7 +18,7 @@ env: ...@@ -18,7 +18,7 @@ env:
jobs: jobs:
build_wheels: build_wheels:
name: "Build TorchVision M1 wheels" name: "Build TorchVision M1 wheels"
runs-on: macos-m1 runs-on: macos-m1-12
strategy: strategy:
matrix: matrix:
py_vers: [ "3.8", "3.9", "3.10" ] py_vers: [ "3.8", "3.9", "3.10" ]
...@@ -54,13 +54,12 @@ jobs: ...@@ -54,13 +54,12 @@ jobs:
setup_build_version setup_build_version
fi fi
WHL_NAME=torchvision-${BUILD_VERSION}-cp${PY_VERS/.}-cp${PY_VERS/.}-macosx_11_0_arm64.whl
conda create -yp ${ENV_NAME} python=${PY_VERS} numpy libpng jpeg wheel pkg-config conda create -yp ${ENV_NAME} python=${PY_VERS} numpy libpng jpeg wheel pkg-config
conda run -p ${ENV_NAME} python3 -mpip install torch --pre --extra-index-url=https://download.pytorch.org/whl/${CHANNEL} conda run -p ${ENV_NAME} python3 -mpip install torch --pre --extra-index-url=https://download.pytorch.org/whl/${CHANNEL}
conda run -p ${ENV_NAME} python3 -mpip install delocate conda run -p ${ENV_NAME} python3 -mpip install delocate
conda run -p ${ENV_NAME} python3 setup.py bdist_wheel conda run -p ${ENV_NAME} python3 setup.py bdist_wheel
export PYTORCH_VERSION="$(conda run -p ${ENV_NAME} python3 -mpip show torch | grep ^Version: | sed 's/Version: *//')" export PYTORCH_VERSION="$(conda run -p ${ENV_NAME} python3 -mpip show torch | grep ^Version: | sed 's/Version: *//')"
conda run -p ${ENV_NAME} DYLD_FALLBACK_LIBRARY_PATH="${ENV_NAME}/lib" delocate-wheel -v --ignore-missing-dependencies dist/${WHL_NAME} conda run -p ${ENV_NAME} DYLD_FALLBACK_LIBRARY_PATH="${ENV_NAME}/lib" delocate-wheel -v --ignore-missing-dependencies dist/*.whl
conda env remove -p ${ENV_NAME} conda env remove -p ${ENV_NAME}
- name: Test wheel - name: Test wheel
shell: arch -arch arm64 bash {0} shell: arch -arch arm64 bash {0}
...@@ -95,7 +94,7 @@ jobs: ...@@ -95,7 +94,7 @@ jobs:
done done
build_conda: build_conda:
name: "Build TorchVision M1 conda packages" name: "Build TorchVision M1 conda packages"
runs-on: macos-m1 runs-on: macos-m1-12
strategy: strategy:
matrix: matrix:
py_vers: [ "3.8", "3.9", "3.10" ] py_vers: [ "3.8", "3.9", "3.10" ]
...@@ -139,9 +138,13 @@ jobs: ...@@ -139,9 +138,13 @@ jobs:
setup_conda_pytorch_constraint setup_conda_pytorch_constraint
export SOURCE_ROOT_DIR=$(pwd) export SOURCE_ROOT_DIR=$(pwd)
conda build -c defaults $CONDA_CHANNEL_FLAGS --no-anaconda-upload --python "$PYTHON_VERSION" packaging/torchvision conda build \
mkdir -p dist -c defaults \
cp ~/miniconda3/conda-bld/osx-arm64/*.tar.bz2 dist/ $CONDA_CHANNEL_FLAGS \
--no-anaconda-upload \
--python "$PYTHON_VERSION" \
--output-folder=dist/ \
packaging/torchvision
- name: Upload package to GitHub - name: Upload package to GitHub
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
......
...@@ -14,7 +14,7 @@ env: ...@@ -14,7 +14,7 @@ env:
jobs: jobs:
tests: tests:
name: "Unit-tests on M1" name: "Unit-tests on M1"
runs-on: macos-m1 runs-on: macos-m1-12
strategy: strategy:
matrix: matrix:
py_vers: [ "3.8"] py_vers: [ "3.8"]
......
...@@ -221,8 +221,13 @@ setup_pip_pytorch_version() { ...@@ -221,8 +221,13 @@ setup_pip_pytorch_version() {
setup_conda_pytorch_constraint() { setup_conda_pytorch_constraint() {
if [[ -z "$PYTORCH_VERSION" ]]; then if [[ -z "$PYTORCH_VERSION" ]]; then
export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-nightly -c pytorch" export CONDA_CHANNEL_FLAGS="${CONDA_CHANNEL_FLAGS} -c pytorch-nightly -c pytorch"
PYTHON="python"
# Check if we have python 3 instead and prefer that
if python3 --version >/dev/null 2>/dev/null; then
PYTHON="python3"
fi
export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | \ export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | \
python -c "import os, sys, json, re; cuver = os.environ.get('CU_VERSION'); \ ${PYTHON} -c "import os, sys, json, re; cuver = os.environ.get('CU_VERSION'); \
cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \ cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
cuver_2 = (cuver[:-1] + '.' + cuver[-1]).replace('cu', 'cuda') if cuver != 'cpu' else cuver; \ cuver_2 = (cuver[:-1] + '.' + cuver[-1]).replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
print(re.sub(r'\\+.*$', '', \ print(re.sub(r'\\+.*$', '', \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment