Skip to content

Commit 3054a96

Browse files
committed
Get IPP on macOS x86 working
1 parent 03434dd commit 3054a96

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

.github/workflows/build_and_test.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ env:
1717
HOMEBREW_NO_INSTALL_CLEANUP: 1
1818
SCCACHE_GHA_ENABLED: true
1919
SCCACHE_CACHE_MULTIARCH: 1
20+
SCCACHE_IDLE_TIMEOUT: 0
2021

2122
defaults:
2223
run:
2324
shell: bash
2425

25-
# jobs are run in paralell on different machines
26+
# jobs are run in parallel on different machines
2627
# all steps run in series
2728
jobs:
2829
build_and_test:
@@ -92,15 +93,6 @@ jobs:
9293
with:
9394
submodules: recursive
9495

95-
# Has to come after actions/checkout which otherwise wipes out the working directory
96-
- name: Install IPP (macOS)
97-
if: ${{ runner.os == 'macOS' }}
98-
run: |
99-
curl -L -o ipp-include.whl "https://files.pythonhosted.org/packages/f0/a0/3b0329735b28f05cbb87ce86be09567a2ecdf9bcd92c50b05fd0a30b34b9/ipp_include-2021.9.1-py2.py3-none-macosx_10_15_x86_64.macosx_11_0_x86_64.whl"
100-
curl -L -o ipp-static.whl "https://files.pythonhosted.org/packages/fa/19/8b5d54390389b5a9910a111bc033cb0045dc2e1614745c2c98dc54061370/ipp_static-2021.9.1-py2.py3-none-macosx_10_15_x86_64.macosx_11_0_x86_64.whl"
101-
unzip ipp-include.whl -d ipp-macos
102-
unzip ipp-static.whl -d ipp-macos
103-
10496
- name: Cache the build
10597
uses: mozilla-actions/[email protected]
10698

cmake

tests/PluginBasics.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ TEST_CASE ("Plugin instance", "[instance]")
2525

2626
TEST_CASE ("IPP version", "[ipp]")
2727
{
28-
CHECK_THAT (ippsGetLibVersion()->Version, Catch::Matchers::Equals ("2022.3.0 (r0x0fc08bb1)"));
28+
#if defined(__APPLE__)
29+
// macOS uses 2021.9.1 from pip wheel (only x86_64 version available)
30+
CHECK_THAT (ippsGetLibVersion()->Version, Catch::Matchers::Equals ("2021.9.1 (r0x7e208212)"));
31+
#else
32+
CHECK_THAT (ippsGetLibVersion()->Version, Catch::Matchers::Equals ("2022.3.0 (r0x0fc08bb1)"));
33+
#endif
2934
}
3035
#endif

0 commit comments

Comments
 (0)