Skip to content

Commit

Permalink
ci: fix Intel OneAPI build on Windows (MODFLOW-USGS#978)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jdhughes-usgs authored and Hofer-Julian committed Jul 15, 2022
1 parent 8578fce commit 4843e63
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/common/install-python-std.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 7 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 4843e63

Please sign in to comment.