Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

M1 conda binaries build support #3013

Merged
merged 26 commits into from
Mar 12, 2024
Merged

M1 conda binaries build support #3013

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b820df4
testing m1 with binaries
udaij12 Feb 9, 2024
1e04594
testing m1 with binaries 2
udaij12 Feb 9, 2024
2801b5c
added conda setup
udaij12 Feb 9, 2024
18c6299
added python setup
udaij12 Feb 9, 2024
f3dd61e
added python setup
udaij12 Feb 9, 2024
dc637ec
Merge branch 'master' into m1
udaij12 Mar 5, 2024
405ef2b
testing binaries
udaij12 Mar 5, 2024
8440a2e
change order
udaij12 Mar 5, 2024
37260ac
add channels
udaij12 Mar 5, 2024
0c5db88
changing conda setup
udaij12 Mar 5, 2024
cbca9a3
changing conda setup
udaij12 Mar 5, 2024
759a0e9
changing conda setup 2
udaij12 Mar 5, 2024
cf5d349
changing conda setup 3
udaij12 Mar 5, 2024
bcb503f
testing new install
udaij12 Mar 5, 2024
cc29f8f
testing full tests
udaij12 Mar 6, 2024
a7ccdec
activating env
udaij12 Mar 6, 2024
146832a
Merge branch 'master' into m1
Mar 11, 2024
7c4f45d
adding m1 binaries
Mar 11, 2024
2b979d4
adding regression test
udaij12 Mar 11, 2024
952a7dd
changing tests back
udaij12 Mar 11, 2024
7c3c706
testing nightly binary
udaij12 Mar 11, 2024
e33b1ed
code cleanup
udaij12 Mar 11, 2024
1b265a3
adding conda for m1
udaij12 Mar 11, 2024
b176282
two exludes
udaij12 Mar 11, 2024
b2e24bc
two exludes
udaij12 Mar 11, 2024
3211c61
Merge branch 'master' into m1
agunapal Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/regression_tests_cpu_binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macOS-latest]
os: [ubuntu-20.04, macOS-latest, macos-14]
python-version: ["3.8", "3.9", "3.10"]
binaries: ["pypi", "conda"]
exclude:
- os: macos-latest
python-version: 3.8
- os: macos-14
python-version: 3.8, 3.9
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please split these..Doesn't seem like this works

steps:
- uses: actions/checkout@v3
with:
Expand All @@ -47,3 +49,4 @@ jobs:
- name: Validate Torchserve CPU Regression
run: |
python test/regression_tests.py --binaries --${{ matrix.binaries }} --nightly

2 changes: 1 addition & 1 deletion binaries/conda/build_packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
PACKAGES = ["torchserve", "torch-model-archiver", "torch-workflow-archiver"]

# conda convert supported platforms https://docs.conda.io/projects/conda-build/en/stable/resources/commands/conda-convert.html
PLATFORMS = ["linux-64", "osx-64", "win-64"] # Add a new platform here
PLATFORMS = ["linux-64", "osx-64", "win-64", "osx-arm64"] # Add a new platform here

if os.name == "nt":
# Assumes miniconda is installed in windows
Expand Down
Loading