Skip to content

Commit

Permalink
Merge branch 'pytorch:main' into patch-44
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikekgfb
mikekgfb authored Jan 24, 2025
2 parents ed8ab55 + 9686c79 commit f44fad1
Show file tree
Hide file tree
Showing 2 changed files with 192 additions and 4 deletions.
115 changes: 111 additions & 4 deletions .github/workflows/run-readme-pr-macos.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ jobs:
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs readme
echo "using workaround for #1416 and #1315 by setting torchchat device explicitly"
TORCHCHAT_DEVICE=cpu .ci/scripts/run-docs readme
echo "::group::Completion"
echo "tests complete"
Expand Down Expand Up @@ -68,7 +69,8 @@ jobs:
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs quantization
echo "using workaround for #1416 and #1315 by setting torchchat device explicitly"
TORCHCHAT_DEVICE=cpu .ci/scripts/run-docs quantization
echo "::group::Completion"
echo "tests complete"
Expand Down Expand Up @@ -103,7 +105,8 @@ jobs:
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs gguf
echo "using workaround for #1416 and #1315 by setting torchchat device explicitly"
TORCHCHAT_DEVICE=cpu .ci/scripts/run-docs gguf
echo "::group::Completion"
echo "tests complete"
Expand Down Expand Up @@ -137,9 +140,113 @@ jobs:
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs advanced
echo "using workaround for #1416 and #1315 by setting torchchat device explicitly"
TORCHCHAT_DEVICE=cpu .ci/scripts/run-docs advanced
echo "::group::Completion"
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"
test-eval-macos:
runs-on: macos-14-xlarge
steps:
- name: Checkout code
uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '3.10.11'
- name: Setup Xcode
if: runner.os == 'macOS'
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.3'
- name: Run script
run: |
set -x
# NS: Remove previous installation of torch first
# as this script does not isntall anything into conda env but rather as system dep
pip3 uninstall -y torch || true
set -eou pipefail
echo "::group::Print machine info"
uname -a
sysctl machdep.cpu.brand_string
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs evaluation
echo "::group::Completion"
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"
test-multimodal-macos:
runs-on: macos-14-xlarge
steps:
- name: Checkout code
uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '3.10.11'
- name: Setup Xcode
if: runner.os == 'macOS'
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.3'
- name: Run script
run: |
set -x
# NS: Remove previous installation of torch first
# as this script does not isntall anything into conda env but rather as system dep
pip3 uninstall -y torch || true
set -eou pipefail
echo "::group::Print machine info"
uname -a
sysctl machdep.cpu.brand_string
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs multimodal
echo "::group::Completion"
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"
test-native-macos:
runs-on: macos-14-xlarge
steps:
- name: Checkout code
uses: actions/checkout@v2
- uses: actions/setup-python@v4
with:
python-version: '3.10.11'
- name: Setup Xcode
if: runner.os == 'macOS'
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.3'
- name: Run script
run: |
set -x
# NS: Remove previous installation of torch first
# as this script does not isntall anything into conda env but rather as system dep
pip3 uninstall -y torch || true
set -eou pipefail
echo "::group::Print machine info"
uname -a
sysctl machdep.cpu.brand_string
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs native
echo "::group::Completion"
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"
81 changes: 81 additions & 0 deletions .github/workflows/run-readme-pr-mps.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,84 @@ jobs:
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"
test-evaluation-mps-macos:
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
with:
runner: macos-m1-14 # needs MPS, was macos-m1-stable
script: |
set -x
conda create -y -n test-evaluation-mps-macos python=3.10.11
conda activate test-evaluation-mps-macos
# NS: Remove previous installation of torch first
# as this script does not isntall anything into conda env
# but rather system dep
pip3 uninstall -y torch || true
set -eou pipefail
echo "::group::Print machine info"
uname -a
sysctl machdep.cpu.brand_string
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs evaluation
echo "::group::Completion"
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"
test-multimodal-mps-macos:
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
with:
runner: macos-m1-14 # needs MPS, was macos-m1-stable
script: |
set -x
conda create -y -n test-multimodal-mps-macos python=3.10.11
conda activate test-multimodal-mps-macos
# NS: Remove previous installation of torch first
# as this script does not isntall anything into conda env
# but rather system dep
pip3 uninstall -y torch || true
set -eou pipefail
echo "::group::Print machine info"
uname -a
sysctl machdep.cpu.brand_string
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs multimodal
echo "::group::Completion"
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"
test-native-mps-macos:
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
with:
runner: macos-m1-14 # needs MPS, was macos-m1-stable
script: |
set -x
conda create -y -n test-native-mps-macos python=3.10.11
conda activate test-native-mps-macos
# NS: Remove previous installation of torch first
# as this script does not isntall anything into conda env
# but rather system dep
pip3 uninstall -y torch || true
set -eou pipefail
echo "::group::Print machine info"
uname -a
sysctl machdep.cpu.brand_string
sysctl machdep.cpu.core_count
echo "::endgroup::"
.ci/scripts/run-docs native
echo "::group::Completion"
echo "tests complete"
echo "*******************************************"
echo "::endgroup::"

0 comments on commit f44fad1

Please sign in to comment.