File tree Expand file tree Collapse file tree 7 files changed +30
-13
lines changed Expand file tree Collapse file tree 7 files changed +30
-13
lines changed Original file line number Diff line number Diff line change 24
24
runs-on : ubuntu-latest
25
25
steps :
26
26
- name : Checkout
27
- uses : actions/checkout@v3
27
+ uses : actions/checkout@v4
28
28
29
29
- name : Install Dependencies
30
30
run : |
39
39
40
40
- name : Build Wheel
41
41
env :
42
- CC : clang-13
43
- CXX : clang++-13
42
+ CC : clang-15
43
+ CXX : clang++-15
44
44
run : |
45
45
cd ${GITHUB_WORKSPACE}/bindings/python
46
46
python setup.py bdist_wheel --cmake-executable="cmake" --build-type=Debug -- -- -j2
Original file line number Diff line number Diff line change @@ -21,17 +21,17 @@ jobs:
21
21
strategy :
22
22
matrix :
23
23
build_type : [Release]
24
- cxx : [g++-11, g++-12, clang++-13 ]
24
+ cxx : [g++-11, g++-12, clang++-15 ]
25
25
include :
26
26
- cxx : g++-11
27
27
cc : gcc-11
28
28
- cxx : g++-12
29
29
cc : gcc-12
30
- - cxx : clang++-13
31
- cc : clang-13
30
+ - cxx : clang++-15
31
+ cc : clang-15
32
32
33
33
steps :
34
- - uses : actions/checkout@v2
34
+ - uses : actions/checkout@v4
35
35
- name : Configure build
36
36
working-directory : ${{ runner.temp }}
37
37
env :
Original file line number Diff line number Diff line change 12
12
runs-on : ubuntu-latest
13
13
14
14
steps :
15
- - uses : actions/checkout@v2
15
+ - uses : actions/checkout@v4
16
16
17
17
- name : Install cibuildwheel
18
18
run : python -m pip install cibuildwheel
Original file line number Diff line number Diff line change 30
30
runs-on : ubuntu-latest
31
31
steps :
32
32
- name : Checkout
33
- uses : actions/checkout@v3
33
+ uses : actions/checkout@v4
34
34
35
35
- name : Install Dependencies
36
36
run : |
45
45
46
46
- name : Build Wheel
47
47
env :
48
- CC : clang-13
49
- CXX : clang++-13
48
+ CC : clang-15
49
+ CXX : clang++-15
50
50
run : |
51
51
cd ${GITHUB_WORKSPACE}/bindings/python
52
52
python setup.py bdist_wheel --cmake-executable="cmake" --build-type=Debug -- -- -j2
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ config-settings = {}
22
22
dependency-versions = " pinned"
23
23
environment.CC = " /opt/rh/devtoolset-11/root/usr/bin/cc"
24
24
environment.CXX = " /opt/rh/devtoolset-11/root/usr/bin/c++"
25
- # Compile multiple versions for difference microarchitectures
25
+ # Compile multiple versions for differenct microarchitectures
26
26
environment.PYSVS_MULTIARCH = " YES"
27
27
environment-pass = []
28
28
build-verbosity = " 3"
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ def target(arch):
20
20
if os .environ .get ("PYSVS_MULTIARCH" , None ) is not None :
21
21
pysvs_microarchs = [
22
22
"cascadelake" ,
23
- # "skylake_avx512",
23
+ "x86_64_v3" , # conservative base CPU for x86 CPUs.
24
24
]
25
25
26
26
# Add the current host to the list of micro-architecture if it doesn't already exist.
Original file line number Diff line number Diff line change @@ -33,6 +33,16 @@ def _override_backend():
33
33
"""
34
34
return os .environ .get ("PYSVS_OVERRIDE_BACKEND" , None )
35
35
36
+ def _debug_override_cpu ():
37
+ """
38
+ Set the current CPU microarchitecture.
39
+ Unlike `_override_backend()`, the loader will still perform backend-selection based
40
+ on this architecture.
41
+
42
+ If no override is set, return `None`.
43
+ """
44
+ return os .environ .get ("PYSVS_DEBUG_OVERRIDE_CPU" , None )
45
+
36
46
37
47
# The name of the manifest file.
38
48
FLAGS_MANIFEST = "flags_manifest.json" # Keep in-sync with CMakeLists.txt
@@ -122,7 +132,14 @@ def _find_library():
122
132
123
133
# Get the current CPU and the manifest of compiled libraries that ship with this
124
134
# library.
135
+ #
136
+ # For debug purposes, allow the CPU to be set externally rather than using archspec's
137
+ # CPU detection.
125
138
host = cpu .host ()
139
+ debug_override = _debug_override_cpu ()
140
+ if debug_override is not None :
141
+ host = debug_override
142
+
126
143
manifest = _load_manifest ()
127
144
128
145
# Respect override requests.
You can’t perform that action at this time.
0 commit comments