Skip to content

Update MetaPhysicL, enable all compiler warnings for it #3498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roystgnr merged 4 commits into from
Mar 28, 2023
Merged

Update MetaPhysicL, enable all compiler warnings for it #3498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
347fff0
Use newer MetaPhysicL
roystgnr Mar 20, 2023
a3139f9
Use future TIMPI dir for MetaPhysicL
roystgnr Mar 28, 2023
0364714
Don't ignore any future warnings from MetaPhysicL
roystgnr Mar 20, 2023
05652b7
Re-bootstrap
roystgnr Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56938,7 +56938,6 @@ fi

my_top_srcdir="$(cd $srcdir && pwd)"


if test "x$build_metaphysicl" = "xyes"; then :

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with built-in MetaPhysicL support >>>" >&5
Expand Down Expand Up @@ -57035,7 +57034,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
as_fn_append ax_args " '--with-cxx-std=20$acsm_cxx_version'"
as_fn_append ax_args " 'CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS'"
as_fn_append ax_args " 'LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS'"
as_fn_append ax_args " 'TIMPI_DIR=$my_top_srcdir/contrib/timpi/'"
as_fn_append ax_args " '--with-future-timpi-dir=$prefix'"
as_fn_append ax_args " '--with-timpi-method=$my_method'"

# New options that may need to be merged with existing options.
Expand Down
2 changes: 1 addition & 1 deletion contrib/metaphysicl
Open in desktop
Submodule metaphysicl updated 16 files
+7 −0 Makefile.in
+5 −0 aclocal.m4
+777 −2 configure
+13 −4 configure.ac
+7 −0 doxygen/Makefile.in
+2 −0 m4/config_summary.m4
+2 −0 src/Makefile.am
+8 −0 src/Makefile.in
+0 −2 src/numerics/include/metaphysicl/dynamicsparsenumberbase.h
+2 −4 src/numerics/include/metaphysicl/parallel_dualnumber.h
+2 −0 test/Makefile.am
+8 −0 test/Makefile.in
+9 −5 test/navier_unit.h
+5 −5 test/parallel_unit.C
+2 −2 test/pde_unit.C
+2 −2 test/pde_unit.h
6 changes: 1 addition & 5 deletions m4/libmesh_metaphysicl.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,10 @@ AC_DEFUN([CONFIGURE_METAPHYSICL],
dnl here's a trick from GraphicsMagick:
my_top_srcdir="$(cd $srcdir && pwd)"

dnl FIXME: setting TIMPI_DIR, even to something invalid, is
dnl currently the best way to get MetaPhysicL to recognize
dnl that we really want TIMPI.

AS_IF([test "x$build_metaphysicl" = "xyes"],
[
AC_MSG_RESULT(<<< Configuring library with built-in MetaPhysicL support >>>)
AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[TIMPI_DIR=$my_top_srcdir/contrib/timpi/],[--with-timpi-method=$my_method]])
AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[--with-future-timpi-dir=$prefix],[--with-timpi-method=$my_method]])
],
[AC_MSG_RESULT(<<< Configuring library with external MetaPhysicL support >>>)])
],
Expand Down
6 changes: 0 additions & 6 deletions src/systems/system_projection.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@
#include "libmesh/libmesh_common.h"
#include "libmesh/compare_types.h"

// FIXME - having to do this with MetaPhysicL brings me shame - RHS
#include "libmesh/ignore_warnings.h"
// Template specialization declarations in here need to *precede* code
// using them.
#include "metaphysicl/dynamicsparsenumberarray_decl.h"
#include "libmesh/restore_warnings.h"

using MetaPhysicL::DynamicSparseNumberArray;

Expand Down Expand Up @@ -124,11 +121,8 @@ void convert_from_receive (SendT & received,


#ifdef LIBMESH_HAVE_METAPHYSICL
// FIXME - wrapping MetaPhysicL is shameful - RHS
#include "libmesh/ignore_warnings.h"
// Include MetaPhysicL definitions finally
#include "metaphysicl/dynamicsparsenumberarray.h"
#include "libmesh/restore_warnings.h"

// And make sure we instantiate the methods we'll need to use on them.
#include "libmesh/dense_matrix_impl.h"
Expand Down