From 83ea55d9f9a172081737d1de1991548fdb473c77 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Wed, 22 Jan 2025 08:36:10 -0600 Subject: [PATCH 1/3] Update autoconf-submodule hash to get updated Intel compiler detection --- m4/autoconf-submodule | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/autoconf-submodule b/m4/autoconf-submodule index 29220cd368..91cdcdce19 160000 --- a/m4/autoconf-submodule +++ b/m4/autoconf-submodule @@ -1 +1 @@ -Subproject commit 29220cd368f43f19e524369f191d49a8669f7903 +Subproject commit 91cdcdce19c9862dc65594ad373b5c425ab3e88f From ea9a999da09fb6ff5d703f52b408dc19aff3fdbb Mon Sep 17 00:00:00 2001 From: John Peterson Date: Wed, 22 Jan 2025 08:41:17 -0600 Subject: [PATCH 2/3] Run bootstrap. --- configure | 13 +++++++++++-- .../miscellaneous_ex17/Makefile.in | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/configure b/configure index d6aa459e7c..e32b4dc2bc 100755 --- a/configure +++ b/configure @@ -26533,15 +26533,24 @@ else $as_nop ACSM_PROFILING_FLAGS="" ACSM_CXXFLAGS_DBG="$ACSM_CXXFLAGS_DBG -O0 -g" - ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O3 -w0" + ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O3" ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -O2 -g" ACSM_CFLAGS_DBG="$ACSM_CFLAGS_DBG -O0 -g" - ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3 -w0" + ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3" ACSM_CFLAGS_DEVEL="$ACSM_CFLAGS_DEVEL -O2 -g" ;; #( *) : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&5 printf "%s\n" "Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&6; } ;; +esac + case "$ACSM_GXX_VERSION" in #( + intel_icx_v21.x | intel_icx_v22.x | intel_icx_v23.x) : + ;; #( + *) : + + CXXFLAGS="$CXXFLAGS -Werror=recommended-option" + CFLAGS="$CFLAGS -Werror=recommended-option" + ;; esac ;; #( nvidia) : diff --git a/examples/miscellaneous/miscellaneous_ex17/Makefile.in b/examples/miscellaneous/miscellaneous_ex17/Makefile.in index 6b125ae448..f40944fca9 100644 --- a/examples/miscellaneous/miscellaneous_ex17/Makefile.in +++ b/examples/miscellaneous/miscellaneous_ex17/Makefile.in @@ -106,6 +106,7 @@ am__aclocal_m4_deps = \ $(top_srcdir)/m4/autoconf-submodule/acsm_enable_paranoid.m4 \ $(top_srcdir)/m4/autoconf-submodule/acsm_enable_werror.m4 \ $(top_srcdir)/m4/autoconf-submodule/acsm_mpi.m4 \ + $(top_srcdir)/m4/autoconf-submodule/acsm_precision.m4 \ $(top_srcdir)/m4/autoconf-submodule/acsm_scrape_petsc_configure.m4 \ $(top_srcdir)/m4/autoconf-submodule/acsm_summarize_env.m4 \ $(top_srcdir)/m4/autoconf-submodule/acsm_test_sanitize_flags.m4 \ @@ -147,15 +148,15 @@ am__aclocal_m4_deps = \ $(top_srcdir)/m4/nemesis.m4 $(top_srcdir)/m4/netcdf.m4 \ $(top_srcdir)/m4/netgen.m4 $(top_srcdir)/m4/nlopt.m4 \ $(top_srcdir)/m4/parmetis.m4 $(top_srcdir)/m4/petsc.m4 \ - $(top_srcdir)/m4/poly2tri.m4 $(top_srcdir)/m4/precision.m4 \ - $(top_srcdir)/m4/qhull.m4 $(top_srcdir)/m4/sfc.m4 \ - $(top_srcdir)/m4/slepc.m4 $(top_srcdir)/m4/sstream.m4 \ - $(top_srcdir)/m4/strstream.m4 $(top_srcdir)/m4/tbb.m4 \ - $(top_srcdir)/m4/tecio.m4 $(top_srcdir)/m4/tecplot.m4 \ - $(top_srcdir)/m4/tetgen.m4 $(top_srcdir)/m4/threads.m4 \ - $(top_srcdir)/m4/triangle.m4 $(top_srcdir)/m4/trilinos.m4 \ - $(top_srcdir)/m4/unordered.m4 $(top_srcdir)/m4/vtk.m4 \ - $(top_srcdir)/m4/xdr.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/poly2tri.m4 $(top_srcdir)/m4/qhull.m4 \ + $(top_srcdir)/m4/sfc.m4 $(top_srcdir)/m4/slepc.m4 \ + $(top_srcdir)/m4/sstream.m4 $(top_srcdir)/m4/strstream.m4 \ + $(top_srcdir)/m4/tbb.m4 $(top_srcdir)/m4/tecio.m4 \ + $(top_srcdir)/m4/tecplot.m4 $(top_srcdir)/m4/tetgen.m4 \ + $(top_srcdir)/m4/threads.m4 $(top_srcdir)/m4/triangle.m4 \ + $(top_srcdir)/m4/trilinos.m4 $(top_srcdir)/m4/unordered.m4 \ + $(top_srcdir)/m4/vtk.m4 $(top_srcdir)/m4/xdr.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) From ed1d7f6a69ba460222e37e9d5964d4b4fe2ab12c Mon Sep 17 00:00:00 2001 From: Roy Stogner Date: Wed, 22 Jan 2025 09:23:28 -0600 Subject: [PATCH 3/3] Update TIMPI and MetaPhysicL submodules This gets the ACSM updates there, too (as well as an assertion update in TIMPI). --- contrib/metaphysicl | 2 +- contrib/timpi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/metaphysicl b/contrib/metaphysicl index fd53332675..9fed01d147 160000 --- a/contrib/metaphysicl +++ b/contrib/metaphysicl @@ -1 +1 @@ -Subproject commit fd5333267578fa33b109756f3eb47cba4d2449a0 +Subproject commit 9fed01d1474e137bd67812bbb5b936db8b23d036 diff --git a/contrib/timpi b/contrib/timpi index e30f44b647..1693d2ec5d 160000 --- a/contrib/timpi +++ b/contrib/timpi @@ -1 +1 @@ -Subproject commit e30f44b64750652e355b02f2773fc7e82a89831f +Subproject commit 1693d2ec5d173abe1459d2f14747383586ededd2