Skip to content

Commit

Permalink
Remove default arch target from setup.py (#1594)
Browse files Browse the repository at this point in the history
Don't pass any architecture by default in setup.py to allow for building binary wheels for targets like x86_64.

Build Python package with 'none' arch by default.
Bump version to 0.5.2.
  • Loading branch information
brenthuisman authored Jun 23, 2021
1 parent 9155ee4 commit 51e3589
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ciwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
CIBW_BUILD: "cp3?-manylinux_x86_64"
CIBW_SKIP: "cp35-*"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
arch: x86_64
CIBW_ARCHS_LINUX: x86_64
# CIBW_TEST_COMMAND: TODO

- name: Build wheels macos
Expand All @@ -44,7 +44,6 @@ jobs:
CIBW_BUILD: "cp3?-macosx_x86_64"
CIBW_SKIP: "cp35-*"
CIBW_ARCHS_MACOS: x86_64 universal2
arch: x86_64
# CIBW_TEST_COMMAND: TODO

# this action runs auditwheel automatically with the following args:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.1
0.5.2
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def __init__(self):
CL_opt.instance = {'mpi': False,
'gpu': 'none',
'vec': False,
'arch': 'native',
'arch': 'none',
'neuroml': True,
'bundled': True}

Expand Down Expand Up @@ -91,7 +91,7 @@ def run(self):
# vec : generate SIMD vectorized kernels for CPU micro-architecture (boolean).
opt['vec'] = self.vec is not None
# arch : target CPU micro-architecture (string).
opt['arch'] = "native" if self.arch is None else self.arch
opt['arch'] = 'none' if self.arch is None else self.arch
# neuroml : compile with neuroml support for morphologies.
opt['neuroml'] = self.neuroml is not None
# bundled : use bundled/git-submoduled 3rd party libraries.
Expand Down Expand Up @@ -126,7 +126,7 @@ def run(self):
# vec : generate SIMD vectorized kernels for CPU micro-architecture (boolean).
opt['vec'] = self.vec is not None
# arch : target CPU micro-architecture (string).
opt['arch'] = "native" if self.arch is None else self.arch
opt['arch'] = 'none' if self.arch is None else self.arch
# neuroml : compile with neuroml support for morphologies.
opt['neuroml'] = self.neuroml is not None
# bundled : use bundled/git-submoduled 3rd party libraries.
Expand Down Expand Up @@ -237,4 +237,3 @@ def run(self):
'Bug Reports': 'https://github.com/arbor-sim/arbor/issues',
},
)

0 comments on commit 51e3589

Please sign in to comment.