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

Upgrade code #168

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade code #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65fe9fa
Update setup.py
andife Mar 14, 2025
815db28
update
andife Mar 14, 2025
e69810c
Update setup.cfg
andife Mar 14, 2025
34cab4a
update
andife Mar 14, 2025
f92c676
Merge branch 'andife-patch-5' of https://github.com/onnx/optimizer in…
andife Mar 14, 2025
b792cd1
Update build-and-test.yml
andife Mar 15, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
env:
CIBW_ARCHS_MACOS: x86_64 universal2
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
CIBW_BEFORE_ALL_LINUX: WD=`pwd` && /opt/python/cp38-cp38/bin/python -m pip install --target tmp_cmake cmake && cp tmp_cmake/bin/cmake /usr/local/bin/cmake && rm -rf tmp_cmake && /opt/python/cp38-cp38/bin/python -m pip install cmake && cmake --version && whereis cmake
CIBW_BEFORE_ALL_LINUX: WD=`pwd` && /opt/python/cp38-cp38/bin/python -m pip install --target tmp_cmake cmake && cp tmp_cmake/bin/cmake /usr/local/bin/cmake && rm -rf tmp_cmake && /opt/python/cp39-cp39/bin/python -m pip install cmake && cmake --version && whereis cmake
CIBW_BEFORE_ALL_MACOS: WD=`pwd` && pip install cmake
CIBW_TEST_REQUIRES_LINUX: pytest nbval flake8 mypy onnxruntime
CIBW_TEST_REQUIRES_MACOS: pytest nbval
Expand All @@ -26,6 +26,7 @@ jobs:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, windows-2019, macos-10.15]
steps:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ addopts = --nbval --current-env
testpaths = onnxoptimizer/test/

[metadata]
license-file = LICENSE
license_files = LICENSE

[flake8]
select = B,C,E,F,P,T4,W,B9
Expand Down
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import re
from textwrap import dedent
import multiprocessing

import shutil

TOP_DIR = os.path.realpath(os.path.dirname(__file__))
SRC_DIR = os.path.join(TOP_DIR, 'onnxoptimizer')
Expand All @@ -32,7 +32,8 @@
WINDOWS = (os.name == 'nt')
MACOS = sys.platform.startswith("darwin")

CMAKE = find_executable('cmake')
CMAKE = shutil.which('cmake')


install_requires = []
setup_requires = []
Expand Down
Loading