Skip to content

Commit 7c4f45d

Browse files
author
udaij12
committed
adding m1 binaries
1 parent 146832a commit 7c4f45d

File tree

2 files changed

+22
-75
lines changed

2 files changed

+22
-75
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,49 @@
11
name: Run Regression Tests for CPU nightly binaries
22

3-
# on:
4-
# # run every day at 6:15am
5-
# schedule:
6-
# - cron: '15 6 * * *'
73
on:
8-
push:
9-
branches:
10-
- m1
4+
# run every day at 6:15am
5+
schedule:
6+
- cron: '15 6 * * *'
117

128
concurrency:
139
group: ci-cpu-${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
1410
cancel-in-progress: true
1511

1612
jobs:
17-
# regression-cpu-nightly-binaries:
18-
# # creates workflows for OS: ubuntu, macOS
19-
# runs-on: ${{ matrix.os }}
20-
# strategy:
21-
# fail-fast: false
22-
# matrix:
23-
# os: [ubuntu-20.04, macOS-latest]
24-
# python-version: ["3.8", "3.9", "3.10"]
25-
# binaries: ["pypi", "conda"]
26-
# exclude:
27-
# - os: macos-latest
28-
# python-version: 3.8
29-
# steps:
30-
# - uses: actions/checkout@v3
31-
# with:
32-
# submodules: recursive
33-
# - name: Setup conda with Python ${{ matrix.python-version }}
34-
# uses: s-weigand/setup-conda@v1
35-
# with:
36-
# update-conda: true
37-
# python-version: ${{ matrix.python-version }}
38-
# conda-channels: anaconda, conda-forge
39-
# - run: conda --version
40-
# - run: python --version
41-
# - name: Setup Java 17
42-
# uses: actions/setup-java@v3
43-
# with:
44-
# distribution: 'zulu'
45-
# java-version: '17'
46-
# - name: Checkout TorchServe
47-
# uses: actions/checkout@v3
48-
# - name: Install dependencies
49-
# run: |
50-
# python ts_scripts/install_dependencies.py --environment=dev
51-
# - name: Validate Torchserve CPU Regression
52-
# run: |
53-
# python test/regression_tests.py --binaries --${{ matrix.binaries }} --nightly
54-
55-
regression-cpu-nightly-binaries-macos-14:
56-
# Job for macOS-14 with Python 3.10
57-
runs-on: macos-14
13+
regression-cpu-nightly-binaries:
14+
# creates workflows for OS: ubuntu, macOS
15+
runs-on: ${{ matrix.os }}
5816
strategy:
5917
fail-fast: false
6018
matrix:
19+
os: [ubuntu-20.04, macOS-latest]
20+
python-version: ["3.8", "3.9", "3.10"]
6121
binaries: ["pypi", "conda"]
22+
exclude:
23+
- os: macos-latest
24+
python-version: 3.8
6225
steps:
6326
- uses: actions/checkout@v3
6427
with:
6528
submodules: recursive
66-
- name: Setup Python for M1
67-
uses: actions/setup-python@v5
29+
- name: Setup conda with Python ${{ matrix.python-version }}
30+
uses: s-weigand/setup-conda@v1
6831
with:
69-
python-version: '3.10'
32+
update-conda: true
33+
python-version: ${{ matrix.python-version }}
34+
conda-channels: anaconda, conda-forge
35+
- run: conda --version
36+
- run: python --version
7037
- name: Setup Java 17
7138
uses: actions/setup-java@v3
7239
with:
7340
distribution: 'zulu'
7441
java-version: '17'
7542
- name: Checkout TorchServe
7643
uses: actions/checkout@v3
77-
78-
- name: Setup conda
44+
- name: Install dependencies
7945
run: |
80-
mkdir -p ~/miniconda3
81-
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-arm64.sh -o ~/miniconda3/miniconda.sh
82-
bash ~/miniconda3/miniconda.sh -b -u -p ~/miniconda3
83-
rm -rf ~/miniconda3/miniconda.sh
84-
~/miniconda3/bin/conda init bash
85-
~/miniconda3/bin/conda init zsh
86-
87-
- name: Conda info
88-
shell: bash -el {0}
46+
python ts_scripts/install_dependencies.py --environment=dev
47+
- name: Validate Torchserve CPU Regression
8948
run: |
90-
conda create --name myenv
91-
conda activate myenv
92-
conda info
93-
python ts_scripts/install_dependencies.py --environment=dev
9449
python test/regression_tests.py --binaries --${{ matrix.binaries }} --nightly
95-
- run: python --version
96-
97-
# - name: Install dependencies
98-
# run: |
99-
# python ts_scripts/install_dependencies.py --environment=dev
100-
# - name: Validate Torchserve CPU Regression
101-
# run: |
102-
# python test/regression_tests.py --binaries --${{ matrix.binaries }} --nightly

binaries/conda/build_packages.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
PACKAGES = ["torchserve", "torch-model-archiver", "torch-workflow-archiver"]
2323

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

2727
if os.name == "nt":
2828
# Assumes miniconda is installed in windows

0 commit comments

Comments
 (0)