Skip to content

Commit 51e3589

Browse files
authored
Remove default arch target from setup.py (#1594)
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.
1 parent 9155ee4 commit 51e3589

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/ciwheel.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
CIBW_BUILD: "cp3?-manylinux_x86_64"
3131
CIBW_SKIP: "cp35-*"
3232
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
33-
arch: x86_64
33+
CIBW_ARCHS_LINUX: x86_64
3434
# CIBW_TEST_COMMAND: TODO
3535

3636
- name: Build wheels macos
@@ -44,7 +44,6 @@ jobs:
4444
CIBW_BUILD: "cp3?-macosx_x86_64"
4545
CIBW_SKIP: "cp35-*"
4646
CIBW_ARCHS_MACOS: x86_64 universal2
47-
arch: x86_64
4847
# CIBW_TEST_COMMAND: TODO
4948

5049
# this action runs auditwheel automatically with the following args:

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.1
1+
0.5.2

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def __init__(self):
2525
CL_opt.instance = {'mpi': False,
2626
'gpu': 'none',
2727
'vec': False,
28-
'arch': 'native',
28+
'arch': 'none',
2929
'neuroml': True,
3030
'bundled': True}
3131

@@ -91,7 +91,7 @@ def run(self):
9191
# vec : generate SIMD vectorized kernels for CPU micro-architecture (boolean).
9292
opt['vec'] = self.vec is not None
9393
# arch : target CPU micro-architecture (string).
94-
opt['arch'] = "native" if self.arch is None else self.arch
94+
opt['arch'] = 'none' if self.arch is None else self.arch
9595
# neuroml : compile with neuroml support for morphologies.
9696
opt['neuroml'] = self.neuroml is not None
9797
# bundled : use bundled/git-submoduled 3rd party libraries.
@@ -126,7 +126,7 @@ def run(self):
126126
# vec : generate SIMD vectorized kernels for CPU micro-architecture (boolean).
127127
opt['vec'] = self.vec is not None
128128
# arch : target CPU micro-architecture (string).
129-
opt['arch'] = "native" if self.arch is None else self.arch
129+
opt['arch'] = 'none' if self.arch is None else self.arch
130130
# neuroml : compile with neuroml support for morphologies.
131131
opt['neuroml'] = self.neuroml is not None
132132
# bundled : use bundled/git-submoduled 3rd party libraries.
@@ -237,4 +237,3 @@ def run(self):
237237
'Bug Reports': 'https://github.com/arbor-sim/arbor/issues',
238238
},
239239
)
240-

0 commit comments

Comments
 (0)