Skip to content

Commit ff20abc

Browse files
roystgnrroystgnr
authored
Merge pull request #4033 from roystgnr/submodule_updates
Submodule updates
2 parents 9b8e371 + 7bb64d4 commit ff20abc

113 files changed

Lines changed: 50 additions & 119 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7428,7 +7428,6 @@ ac_ct_CXX = @ac_ct_CXX@
74287428
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
74297429
ac_ct_F77 = @ac_ct_F77@
74307430
ac_ct_FC = @ac_ct_FC@
7431-
acsm_precision_LIBS = @acsm_precision_LIBS@
74327431
am__include = @am__include@
74337432
am__leading_dot = @am__leading_dot@
74347433
am__quote = @am__quote@

‎configure‎

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,6 @@ CFLAGS_DVL
913913
CXXFLAGS_DVL
914914
GXX_VERSION
915915
libmesh_precision_LIBS
916-
acsm_precision_LIBS
917916
PKG_CONFIG
918917
LIBMESH_LIBRARY_SUFFIX
919918
libmesh_LDFLAGS
@@ -8147,7 +8146,7 @@ fi
81478146
if test "x$compiler_brand_detected" = "xno"
81488147
then :
81498148

8150-
is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R)' | grep 'Compiler'`"
8149+
is_intel_icc="`($CXX -V 2>&1) | grep 'Intel(R)' | grep 'Compiler' | grep -v 'oneAPI'`"
81518150
if test "x$is_intel_icc" != "x"
81528151
then :
81538152

@@ -8194,6 +8193,39 @@ printf "%s\n" "<<< C++ compiler is Intel(R) icc 13 >>>" >&6; }
81948193
esac
81958194
compiler_brand_detected=yes
81968195

8196+
fi
8197+
8198+
is_intel_icx="`($CXX -V 2>&1) | grep 'Intel(R)' | grep 'Compiler' | grep 'oneAPI'`"
8199+
if test "x$is_intel_icx" != "x"
8200+
then :
8201+
8202+
ACSM_GXX_VERSION_STRING="`($CXX -V 2>&1) | grep 'Version '`"
8203+
case "$ACSM_GXX_VERSION_STRING" in #(
8204+
*25.*) :
8205+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 25 >>>" >&5
8206+
printf "%s\n" "<<< C++ compiler is Intel(R) icx 25 >>>" >&6; }
8207+
ACSM_GXX_VERSION=intel_icx_v25.x ;; #(
8208+
*24.*) :
8209+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 24 >>>" >&5
8210+
printf "%s\n" "<<< C++ compiler is Intel(R) icx 24 >>>" >&6; }
8211+
ACSM_GXX_VERSION=intel_icx_v24.x ;; #(
8212+
*23.*) :
8213+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 23 >>>" >&5
8214+
printf "%s\n" "<<< C++ compiler is Intel(R) icx 23 >>>" >&6; }
8215+
ACSM_GXX_VERSION=intel_icx_v23.x ;; #(
8216+
*22.*) :
8217+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 22 >>>" >&5
8218+
printf "%s\n" "<<< C++ compiler is Intel(R) icx 22 >>>" >&6; }
8219+
ACSM_GXX_VERSION=intel_icx_v22.x ;; #(
8220+
*21.*) :
8221+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <<< C++ compiler is Intel(R) icx 21 >>>" >&5
8222+
printf "%s\n" "<<< C++ compiler is Intel(R) icx 21 >>>" >&6; }
8223+
ACSM_GXX_VERSION=intel_icx_v21.x ;; #(
8224+
*) :
8225+
as_fn_error $? "Unsupported Intel compiler detected" "$LINENO" 5 ;;
8226+
esac
8227+
compiler_brand_detected=yes
8228+
81978229
fi
81988230

81998231
fi
@@ -26490,7 +26522,7 @@ else $as_nop
2649026522
ACSM_PARANOID_FLAGS="$ACSM_PARANOID_FLAGS -Wwrite-strings"
2649126523

2649226524
case "$ACSM_GXX_VERSION" in #(
26493-
intel_icc_v13.x | intel_icc_v14.x | intel_icc_v15.x | intel_icc_v16.x | intel_icc_v17.x | intel_icc_v18.x | intel_icc_v19.x | intel_icc_v20.x) :
26525+
intel_icc_*) :
2649426526

2649526527
ACSM_PROFILING_FLAGS="-p"
2649626528
ACSM_CXXFLAGS_DBG="$ACSM_CXXFLAGS_DBG -w1 -g -wd175 -wd1476 -wd1505 -wd1572 -wd488 -wd161"
@@ -26500,9 +26532,19 @@ else $as_nop
2650026532
ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3 -unroll -w0 -ftz"
2650126533
ACSM_CFLAGS_DEVEL="$ACSM_CFLAGS_DBG"
2650226534
;; #(
26535+
intel_icx_*) :
26536+
26537+
ACSM_PROFILING_FLAGS=""
26538+
ACSM_CXXFLAGS_DBG="$ACSM_CXXFLAGS_DBG -O0 -g"
26539+
ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O3 -w0"
26540+
ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -O2 -g"
26541+
ACSM_CFLAGS_DBG="$ACSM_CFLAGS_DBG -O0 -g"
26542+
ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3 -w0"
26543+
ACSM_CFLAGS_DEVEL="$ACSM_CFLAGS_DEVEL -O2 -g"
26544+
;; #(
2650326545
*) :
26504-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unknown Intel compiler" >&5
26505-
printf "%s\n" "Unknown Intel compiler" >&6; } ;;
26546+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&5
26547+
printf "%s\n" "Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&6; } ;;
2650626548
esac
2650726549
;; #(
2650826550
nvidia) :
@@ -46485,8 +46527,6 @@ printf "%s\n" "<<< Default floating point is double precision (double) >>>" >&6;
4648546527

4648646528
fi
4648746529

46488-
46489-
4649046530
libmesh_precision_LIBS="$acsm_precision_LIBS"
4649146531

4649246532

‎contrib/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,6 @@ ac_ct_CXX = @ac_ct_CXX@
734734
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
735735
ac_ct_F77 = @ac_ct_F77@
736736
ac_ct_FC = @ac_ct_FC@
737-
acsm_precision_LIBS = @acsm_precision_LIBS@
738737
am__include = @am__include@
739738
am__leading_dot = @am__leading_dot@
740739
am__quote = @am__quote@

‎contrib/boost/include/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2116,7 +2116,6 @@ ac_ct_CXX = @ac_ct_CXX@
21162116
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
21172117
ac_ct_F77 = @ac_ct_F77@
21182118
ac_ct_FC = @ac_ct_FC@
2119-
acsm_precision_LIBS = @acsm_precision_LIBS@
21202119
am__include = @am__include@
21212120
am__leading_dot = @am__leading_dot@
21222121
am__quote = @am__quote@

‎contrib/capnproto/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@ ac_ct_CXX = @ac_ct_CXX@
583583
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
584584
ac_ct_F77 = @ac_ct_F77@
585585
ac_ct_FC = @ac_ct_FC@
586-
acsm_precision_LIBS = @acsm_precision_LIBS@
587586
am__include = @am__include@
588587
am__leading_dot = @am__leading_dot@
589588
am__quote = @am__quote@

‎contrib/eigen/gitshim/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@ ac_ct_CXX = @ac_ct_CXX@
467467
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
468468
ac_ct_F77 = @ac_ct_F77@
469469
ac_ct_FC = @ac_ct_FC@
470-
acsm_precision_LIBS = @acsm_precision_LIBS@
471470
am__include = @am__include@
472471
am__leading_dot = @am__leading_dot@
473472
am__quote = @am__quote@

‎contrib/exodusii/5.22b/exodus/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3450,7 +3450,6 @@ ac_ct_CXX = @ac_ct_CXX@
34503450
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
34513451
ac_ct_F77 = @ac_ct_F77@
34523452
ac_ct_FC = @ac_ct_FC@
3453-
acsm_precision_LIBS = @acsm_precision_LIBS@
34543453
am__include = @am__include@
34553454
am__leading_dot = @am__leading_dot@
34563455
am__quote = @am__quote@

‎contrib/exodusii/5.22b/nemesis/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,6 @@ ac_ct_CXX = @ac_ct_CXX@
528528
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
529529
ac_ct_F77 = @ac_ct_F77@
530530
ac_ct_FC = @ac_ct_FC@
531-
acsm_precision_LIBS = @acsm_precision_LIBS@
532531
am__include = @am__include@
533532
am__leading_dot = @am__leading_dot@
534533
am__quote = @am__quote@

‎contrib/exodusii/Lib/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,6 @@ ac_ct_CXX = @ac_ct_CXX@
20852085
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
20862086
ac_ct_F77 = @ac_ct_F77@
20872087
ac_ct_FC = @ac_ct_FC@
2088-
acsm_precision_LIBS = @acsm_precision_LIBS@
20892088
am__include = @am__include@
20902089
am__leading_dot = @am__leading_dot@
20912090
am__quote = @am__quote@

‎contrib/exodusii/v8.11/exodus/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4378,7 +4378,6 @@ ac_ct_CXX = @ac_ct_CXX@
43784378
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
43794379
ac_ct_F77 = @ac_ct_F77@
43804380
ac_ct_FC = @ac_ct_FC@
4381-
acsm_precision_LIBS = @acsm_precision_LIBS@
43824381
am__include = @am__include@
43834382
am__leading_dot = @am__leading_dot@
43844383
am__quote = @am__quote@

0 commit comments

Comments
 (0)