Skip to content

Commit 8c2a30a

Browse files
authored
Merge pull request #13702 from gforney/master
add hypre/sundials version info to fds status output
2 parents 6a04f32 + ef7598f commit 8c2a30a

File tree

4 files changed

+23
-37
lines changed

4 files changed

+23
-37
lines changed

Build/Scripts/HYPRE/build_hypre.bat

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ set LIB_TAG=v2.32.0
55

66
set LIB_DIR=%LIB_TAG%
77

8-
98
::*** parse options
109

1110
set clean_hypre=
1211

1312
call :getopts %*
1413
if %stopscript% == 1 exit /b
1514

16-
::*** make sure cmake and gcc are installed
15+
::*** make sure cmake and make are installed
1716

1817
set abort=0
1918
set buildstatus=
@@ -219,21 +218,6 @@ exit /b
219218
)
220219
exit /b 0
221220

222-
:: -------------------------------------------------------------
223-
:have_program
224-
:: -------------------------------------------------------------
225-
:: same as is_file_installed except does not abort script if program is not insstalled
226-
227-
set program=%1
228-
where %program% 1> installed_error.txt 2>&1
229-
type installed_error.txt | find /i /c "Could not find" > installed_error_count.txt
230-
set /p nothave=<installed_error_count.txt
231-
erase installed_error_count.txt installed_error.txt
232-
if %nothave% == 1 (
233-
exit /b 1
234-
)
235-
exit /b 0
236-
237221
:: -------------------------------------------------------------
238222
:usage
239223
:: -------------------------------------------------------------

Build/Scripts/SUNDIALS/build_sundials.bat

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set clean_sundials=
1111
call :getopts %*
1212
if %stopscript% == 1 exit /b
1313

14-
::*** make sure cmake and gcc are installed
14+
::*** make sure cmake and make are installed
1515

1616
set abort=0
1717
set buildstatus=
@@ -220,21 +220,6 @@ exit /b
220220
)
221221
exit /b 0
222222

223-
:: -------------------------------------------------------------
224-
:have_program
225-
:: -------------------------------------------------------------
226-
:: same as is_file_installed except does not abort script if program is not insstalled
227-
228-
set program=%1
229-
where %program% 1> installed_error.txt 2>&1
230-
type installed_error.txt | find /i /c "Could not find" > installed_error_count.txt
231-
set /p nothave=<installed_error_count.txt
232-
erase installed_error_count.txt installed_error.txt
233-
if %nothave% == 1 (
234-
exit /b 1
235-
)
236-
exit /b 0
237-
238223
:: -------------------------------------------------------------
239224
:usage
240225
:: -------------------------------------------------------------

Build/makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ ifdef INTEL_IFORT
1818
I_IFORT=$(INTEL_IFORT)
1919
endif
2020

21+
# 3rd part library versions
22+
HYPRE_VERSION=v2.32.0
23+
SUNDIALS_VERSION=v6.7.0
24+
2125
ifeq ($(shell echo "check_quotes"),"check_quotes")
2226
# windows
2327
GIT_HASH := $(shell ..\Scripts\githash)
@@ -44,6 +48,9 @@ else
4448
CLT_VERSION := $(shell ../Scripts/osx_clt.sh)
4549
endif
4650

51+
HYPRE_INFO=-DHYPRE_PP=\"$(HYPRE_VERSION)\"
52+
SUNDIALS_INFO=-DSUNDIALS_PP=\"$(SUNDIALS_VERSION)\"
53+
4754
GITINFO_BASE=-DGITHASH_PP=\"$(GIT_HASH)$(GIT_STAT)-$(GIT_BRANCH)\" -DGITDATE_PP=\""$(GIT_DATE)\""
4855
GITINFO=-fpp $(GITINFO_BASE) -DBUILDDATE_PP=\""$(BUILD_DATE)\""
4956
GITINFOGNU=-cpp $(GITINFO_BASE) -DBUILDDATE_PP=\""$(BUILD_DATE)\""
@@ -107,15 +114,15 @@ endif # MKLROOT test
107114

108115

109116
ifdef SUNDIALS_HOME # This assumes the SUNDIALS library is available.
110-
FFLAGS_SUNDIALS = -DWITH_SUNDIALS -I"${SUNDIALS_HOME}/fortran"
111-
FFLAGS_SUNDIALS_WIN = -DWITH_SUNDIALS /I"${SUNDIALS_HOME}\fortran"
117+
FFLAGS_SUNDIALS = -DWITH_SUNDIALS ${SUNDIALS_INFO} -I"${SUNDIALS_HOME}/fortran"
118+
FFLAGS_SUNDIALS_WIN = -DWITH_SUNDIALS ${SUNDIALS_INFO} /I"${SUNDIALS_HOME}\fortran"
112119
LFLAGS_SUNDIALS = ${SUNDIALS_HOME}/lib/libsundials_fcvode_mod.a ${SUNDIALS_HOME}/lib/libsundials_fnvecserial_mod.a ${SUNDIALS_HOME}/lib/libsundials_cvode.a
113120
LFLAGS_SUNDIALS_WIN = ${SUNDIALS_HOME}\lib\sundials_fcvode_mod.lib ${SUNDIALS_HOME}\lib\sundials_fnvecserial_mod.lib ${SUNDIALS_HOME}\lib\sundials_cvode.lib /link /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:libcmtd.lib
114121
endif
115122

116123
ifdef HYPRE_HOME # This assumes the HYPRE library is available.
117-
FFLAGS_HYPRE = -DWITH_HYPRE -I${HYPRE_HOME}/include
118-
FFLAGS_HYPRE_WIN = -DWITH_HYPRE /I"${HYPRE_HOME}\include"
124+
FFLAGS_HYPRE = -DWITH_HYPRE ${HYPRE_INFO} -I${HYPRE_HOME}/include
125+
FFLAGS_HYPRE_WIN = -DWITH_HYPRE ${HYPRE_INFO} /I"${HYPRE_HOME}\include"
119126
LFLAGS_HYPRE = -L${HYPRE_HOME}/lib -lHYPRE -lm
120127
LFLAGS_HYPRE_WIN = ${HYPRE_HOME}\lib\HYPRE.lib
121128
endif

Source/func.f90

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5915,6 +5915,16 @@ SUBROUTINE WRITE_SUMMARY_INFO(LU,INPUT_FILE_INCLUDED)
59155915
CALL MPI_GET_VERSION(MPIVERSION,MPISUBVERSION,IERR)
59165916
WRITE(LU,'(/A,I1,A,I1)') ' MPI version: ',MPIVERSION,'.',MPISUBVERSION
59175917
WRITE(LU,'(A,A)') ' MPI library version: ',TRIM(MPILIBVERSION)
5918+
#ifdef HYPRE_PP
5919+
WRITE(LU,'(A,A)') ' Hypre library version: ',TRIM(HYPRE_PP)
5920+
#else
5921+
WRITE(LU,'(A)') ' Hypre library: not used '
5922+
#endif
5923+
#ifdef SUNDIALS_PP
5924+
WRITE(LU,'(A,A)') ' Sundials library version: ',TRIM(SUNDIALS_PP)
5925+
#else
5926+
WRITE(LU,'(A)') ' Sundials library: not used'
5927+
#endif
59185928

59195929
END SUBROUTINE WRITE_SUMMARY_INFO
59205930

0 commit comments

Comments
 (0)