From 140917e2929253054856bc1a3b786dea494c7e9c Mon Sep 17 00:00:00 2001 From: Joseph Hughes Date: Wed, 6 Jul 2022 09:20:32 -0500 Subject: [PATCH 1/2] ci: fix Intel OneAPI build on Windows The issue is caused by the latest meson release. Exclude meson version 0.63.0. --- .github/common/install-python-std.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/common/install-python-std.sh b/.github/common/install-python-std.sh index b0175a33dbe..7cbbdb543ad 100755 --- a/.github/common/install-python-std.sh +++ b/.github/common/install-python-std.sh @@ -1,7 +1,7 @@ #!/bin/bash pip install wheel -pip install requests appdirs numpy matplotlib pytest pytest-xdist meson ninja +pip install requests appdirs numpy matplotlib pytest pytest-xdist meson!=0.63.0 ninja pip install https://github.com/modflowpy/flopy/zipball/develop pip install https://github.com/modflowpy/pymake/zipball/master pip install https://github.com/Deltares/xmipy/zipball/develop From 5208c8e1f20760e8ca9c91a68096a24e68a11e51 Mon Sep 17 00:00:00 2001 From: Joseph Hughes Date: Wed, 6 Jul 2022 11:44:57 -0500 Subject: [PATCH 2/2] ci: fix Intel OneAPI build on Windows The issue is caused by the latest meson release. Exclude meson version 0.63.0. Update meson.build with additional compiler switches to make consistent with pymake builds. --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 71def88e871..79e0a18c449 100644 --- a/meson.build +++ b/meson.build @@ -63,6 +63,8 @@ endif if fc_id == 'intel-cl' # windows compile_args += ['/fpe:0', # Activate all floating point exceptions + '/heap-arrays:0', + '/traceback', '/fpp', # Activate preprocessing '/Qdiag-disable:7416', # f2008 warning '/Qdiag-disable:7025', # f2008 warning @@ -74,9 +76,11 @@ if fc_id == 'intel-cl' elif fc_id == 'intel' # linux and macOS compile_args += ['-fpe0', # Activate all floating point exceptions - '-diag-disable:7416', # f2008 warning - '-diag-disable:7025', # f2008 warning - '-diag-disable:5268', # Line too long + '-no-heap-arrays', + '-traceback', + '-diag-disable:7416', # f2008 warning + '-diag-disable:7025', # f2008 warning + '-diag-disable:5268', # Line too long ] link_args += '-static-intel' endif