Skip to content

Commit f3f076b

Browse files
committed
Remove merged dispatcher testing; macos pipeline fix; test_microarch.py corrections
1 parent d520b37 commit f3f076b

File tree

4 files changed

+17
-250
lines changed

4 files changed

+17
-250
lines changed

.github/scripts/print_cpu_info.sh

-72
This file was deleted.

.github/workflows/build-macos.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,17 @@ jobs:
9393
CXX: ${{ matrix.cxx }}
9494
CC: ${{ matrix.cc }}
9595
run: |
96+
if [[ "${{ matrix.needs_prefix }}" == "true" ]]; then
97+
# For non-default packages like llvm@15, get the install prefix
98+
COMPILER_PREFIX=$(brew --prefix ${{ matrix.package }})
99+
export CC="${COMPILER_PREFIX}/bin/${{ matrix.cc_name }}"
100+
export CXX="${COMPILER_PREFIX}/bin/${{ matrix.cxx_name }}"
101+
else
102+
# For versioned GCC installs, the name is usually directly available
103+
export CC="${{ matrix.cc_name }}"
104+
export CXX="${{ matrix.cxx_name }}"
105+
fi
106+
96107
cd bindings/python
97108
python -m pip install .
98109

.github/workflows/test-dispatcher.yml

-171
This file was deleted.

bindings/python/tests/test_microarch.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
import archspec.cpu as cpu
1818
import os
1919

20+
2021
class MicroarchTester(unittest.TestCase):
2122
def test_microarch(self):
2223
supported_microarchs = svs.microarch.supported
23-
# Will be set in dispatcher pipeline
24-
archspec_host_name = os.environ.get("SDE_FLAG")
25-
if not archspec_host_name:
26-
archspec_host_name = cpu.host().name
24+
# Get emulated microarch from SDE_FLAG or use the host CPU
25+
host_microarch = os.environ.get("SDE_FLAG", cpu.host().name)
2726
mapping = {
2827
"nhm": "nehalem",
2928
"hsw": "haswell",
@@ -33,7 +32,7 @@ def test_microarch(self):
3332
"icelake": "icelake_client",
3433
"spr": "sapphirerapids",
3534
}
36-
archspec_host_name = mapping.get(archspec_host_name, archspec_host_name)
35+
host_microarch = mapping.get(host_microarch, host_microarch)
3736

38-
if archspec_host_name in supported_microarchs:
39-
self.assertTrue(archspec_host_name == svs.microarch.current)
37+
if host_microarch in supported_microarchs:
38+
self.assertTrue(host_microarch == svs.microarch.current)

0 commit comments

Comments
 (0)