FireX: Merge with firemodels/master

Build/Scripts/HDF5/build_hdf5.bat

@@ -0,0 +1,236 @@
+@echo off
+set LIB_TAG=hdf5_1.14.5
+
+::*** library and tag name are the same
+
+set LIB_DIR=%LIB_TAG%
+
+::*** parse options
+
+set clean_hdf5=
+call :getopts %*
+if %stopscript% == 1 exit /b
+
+::*** make sure cmake and make are installed
+
+set abort=0
+set buildstatus=
+call :is_file_installed cmake || set abort=1
+call :is_file_installed make  || set abort=1
+if %abort% == 1 exit /b
+
+set CURDIR=%CD%
+
+::*** define root directory where fds repo and libs directories are located
+
+set FIREMODELS=..\..\..\..
+cd %FIREMODELS%
+set FIREMODELS=%CD%
+cd %CURDIR%
+
+set INSTALLDIR=%FIREMODELS%\libs\hdf5\%LIB_DIR%
+
+::*** erase directory if it exists and clean option was specified
+
+if "x%clean_hdf5%" == "x" goto endif1
+  if exist %INSTALLDIR% rmdir /s /q %INSTALLDIR%
+:endif1
+
+::*** if hdf5 library directory exists exit and use it
+
+if not exist %INSTALLDIR% goto endif2
+  set HDF5_HOME=%INSTALLDIR%
+  set buildstatus=prebuilt
+  goto eof
+:endif2
+
+::*** hdf5 library doesn't exist, if hdf5 repo exists build hdf5 library
+
+set LIB_REPO=%FIREMODELS%\hdf5
+if exist %LIB_REPO% goto buildlib
+
+::*** if directory pointed to by SUNDIALS_HOME exists exit and use it
+
+if "x%HDF5_HOME%" == "x" goto else4
+if not exist %HDF5_HOME%  goto else4
+    set buildstatus=prebuilt
+    goto endif4
+:else4
+  set buildstatus=norepo
+:endif4
+goto eof
+
+::*** if we've gotten this far the prebuilt libraries do not exist, the repo does exist so build the hdf5 library
+
+:buildlib
+cd %LIB_REPO%
+
+set buildstatus=build
+echo.
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo building hdf5 library version %LIB_TAG%
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo.
+
+for /f %%i in ('git tag -l %LIB_TAG%') do set FOUND_TAG=%%i
+if "%FOUND_TAG%" == "%LIB_TAG%" (
+    git checkout %LIB_TAG%
+) else (
+    echo Your HDF5 repository is not up to date with the required tag: %LIB_TAG%.
+    echo The FDS build requires HDF5 version %LIB_TAG%. Please update your HDF5 repository.
+    pause
+    exit /b 1
+)
+
+echo.
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo cleaning hdf5 repo
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo.
+
+cd %LIB_REPO%
+set BUILDDIR=%LIB_REPO%\BUILDDIR
+git clean -dxf
+
+mkdir %BUILDDIR%
+cd %BUILDDIR%
+
+::*** configure hdf5
+
+echo.
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo configuring hdf5 version %LIB_TAG%
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo.
+
+cmake ..\  ^
+-G "MinGW Makefiles" ^
+-DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" ^
+-DCMAKE_C_COMPILER=%COMP_CC% ^
+-DCMAKE_Fortran_COMPILER=%COMP_FC% ^
+-DCMAKE_BUILD_TYPE="Release" ^
+-DBUILD_SHARED_LIBS="OFF" ^
+-DBUILD_TESTING="OFF" ^
+-DHDF5_BUILD_TOOLS="OFF" ^
+-DHDF5_BUILD_EXAMPLES="OFF" ^
+-DHDF5_BUILD_FORTRAN="ON" ^
+-DHDF5_ENABLE_PARALLEL="ON" ^
+-DCMAKE_MAKE_PROGRAM="%CMAKE_MAKE_PROGRAM%" ^
+-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded"
+
+
+::*** build and install hdf5
+
+echo.
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo building hdf5 version %LIB_TAG%
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo.
+call make 
+
+echo.
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo installing hdf5 version %LIB_TAG% in %INSTALLDIR%
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo.
+call make install
+
+echo.
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo setting HDF5_HOME environment variable to %INSTALLDIR%
+set HDF5_HOME=%INSTALLDIR%
+echo.
+
+echo The hdf5 library version %LIB_TAG% was built and installed in %INSTALLDIR%
+echo.
+
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo removing .obj and .mod files from Windows fds build directories
+echo ----------------------------------------------------------
+echo ----------------------------------------------------------
+echo.
+for /D %%f in (%FIREMODELS%\fds\Build\*win*) do (
+  cd %%f
+  erase *.obj *.mod > Nul 2> Nul
+)
+
+cd %CURDIR%
+
+goto eof
+
+:: -------------------------------------------------------------
+:getopts
+:: -------------------------------------------------------------
+ set stopscript=0
+ if (%1)==() exit /b
+ set valid=0
+ set arg=%1
+if /I "%1" EQU "--clean-hdf5" (
+    set clean_hdf5=1
+    set valid=1
+ )
+if /I "%1" EQU "--help" (
+   call :usage
+   set stopscript=1
+   exit /b
+ )
+if /I "%1" EQU "-help" (
+   call :usage
+   set stopscript=1
+   exit /b
+ )
+ shift
+ if %valid% == 0 (
+   echo.
+   echo ***Error: the input argument %arg% is invalid
+   echo.
+   echo Usage:
+   call :usage
+   set stopscript=1
+   exit /b
+ )
+if not (%1)==() goto getopts
+exit /b
+
+:: -------------------------------------------------------------
+:is_file_installed
+:: -------------------------------------------------------------
+
+  set program=%1
+  where %program% 1> installed_error.txt 2>&1
+  type installed_error.txt | find /i /c "Could not find" > installed_error_count.txt
+  set /p nothave=<installed_error_count.txt
+  erase installed_error_count.txt installed_error.txt
+  if %nothave% == 1 (
+    echo "***Fatal error: %program% not present"
+    exit /b 1
+  )
+  exit /b 0
+
+:: -------------------------------------------------------------
+:usage  
+:: -------------------------------------------------------------
+echo build hdf5
+echo. 
+echo --clean-hdf5 - force build of hdf5 library
+echo --help           - display this message
+exit /b
+
+:eof
+echo.
+if "%buildstatus%" == "norepo"   echo The hdf5 git repo does not exist, The hdf5 library was not built.  FDS will be built without it.
+if "%buildstatus%" == "prebuilt" echo The hdf5 library exists. Skipping hdf5 build. FDS will be built using the
+if "%buildstatus%" == "prebuilt" echo hdf5 library in %HDF5_HOME%
+echo.

Build/Scripts/HDF5/build_hdf5.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+HDF5_LIB_TAG=hdf5_1.14.5
+
+CONFMAKE=$1
+CLEAN_HDF5=$2
+
+dir=`pwd`
+
+echo "CLEAN_HDF5 = $CLEAN_HDF5"
+if [ "$CLEAN_HDF5" = true ]; then
+  echo "Removing hdf5 library ..."
+  rm -r $FIREMODELS/libs/hdf5
+  rm -r $FIREMODELS/hdf5/BUILDDIR
+fi
+
+echo "Checking for hdf5 library..."
+
+if [ -d "$FIREMODELS/libs/hdf5" ]; then
+  echo "HDF5 library exists.  Skipping HDF5 build."
+  # List all directories under $FIREMODELS/libs/hdf5
+  hdf5_lib_dir=$(ls -d $FIREMODELS/libs/hdf5/*/)
+  # Extract the version part (removes the leading path)
+  HDF5_VERSION=$(basename $hdf5_lib_dir)
+  export HDF5_HOME=$FIREMODELS/libs/hdf5/$HDF5_VERSION
+  echo "HDF5 library:" $FIREMODELS/libs/hdf5/$HDF5_VERSION
+  return 0
+else
+  echo "HDF5 library does not exist."
+fi
+
+echo "Checking for hdf5 repository..."
+
+if [ -d "$FIREMODELS/hdf5" ]; then
+  echo "hdf5 repository exists. Building hdf5 library."
+  cd $FIREMODELS/hdf5
+  # Handle possible corrupted state of repository
+  if git branch | grep -q "* develop"; then
+    echo "On develop branch"
+  else
+    git checkout develop
+  fi
+  git checkout .
+  git clean -dxf
+  if [[ "$(git tag -l $HDF5_LIB_TAG)" == $HDF5_LIB_TAG ]]; then
+    echo "Checking out $HDF5_LIB_TAG"
+    git checkout $HDF5_LIB_TAG
+  else
+    echo "Your HDF5 repository is not up to date with the required tag: $HDF5_LIB_TAG."
+    echo "The FDS build requires HDF5 version $HDF5_LIB_TAG. Please update your HDF5 repository."
+    exit 1
+  fi 
+
+  mkdir $FIREMODELS/hdf5/BUILDDIR
+  cd $FIREMODELS/hdf5/BUILDDIR
+  echo "Creating library directry..."
+  export HDF5_VERSION=$(git describe)
+  mkdir $FIREMODELS/libs/hdf5/$HDF5_VERSION
+  echo "Cleaning hdf5 repository..."
+  rm -r $FIREMODELS/hdf5/BUILDDIR/*
+  cp $FIREMODELS/fds/Build/Scripts/HDF5/$CONFMAKE .
+  ./$CONFMAKE
+  # get back from detached HEAD state
+  cd $FIREMODELS/hdf5
+  git checkout develop
+  cd $dir
+  export HDF5_HOME=$FIREMODELS/libs/hdf5/$HDF5_VERSION
+  echo "HDF5 library:" $FIREMODELS/libs/hdf5/$HDF5_VERSION
+  return 0
+else
+  echo "HDF5 repository does not exist."
+fi

Build/Scripts/HDF5/confmake.sh

@@ -0,0 +1,31 @@
+export HDF5_INSTALL_PREFIX=$FIREMODELS/libs/hdf5/$HDF5_VERSION
+
+cmake_args=(
+  -DCMAKE_INSTALL_PREFIX="$HDF5_INSTALL_PREFIX"
+  -DCMAKE_C_COMPILER="$COMP_CC"
+  -DCMAKE_CXX_COMPILER="$COMP_CXX"
+  -DCMAKE_Fortran_COMPILER="$COMP_FC"
+  -DCMAKE_BUILD_TYPE="Release"
+  -DBUILD_SHARED_LIBS="OFF"
+  -DBUILD_TESTING="OFF"
+  -DHDF5_BUILD_TOOLS="OFF"
+  -DHDF5_BUILD_EXAMPLES="OFF"
+  -DHDF5_BUILD_FORTRAN="ON"
+  -DHDF5_ENABLE_PARALLEL="ON"
+)
+
+
+# Add OSX deployment target if building for macOS
+if [[ "$FDS_BUILD_TARGET" == *"osx"* ]]; then
+   if [ "$(uname -m)" == "x86_64" ]; then
+      cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="10.6")
+   else
+      cmake_args+=(-DCMAKE_OSX_DEPLOYMENT_TARGET="13.0")
+   fi
+fi
+
+# Run cmake with the arguments
+cmake ../ "${cmake_args[@]}"
+
+make install
+

Build/Scripts/HYPRE/build_hypre.bat

@@ -126,6 +126,14 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 
+
+set HYPRE_ENABLE_CUDA=OFF
+if "%BUILD_WITH_GPU%" == "ON" (
+  if "%GPU_ARCH%" == "cuda" (
+    set HYPRE_ENABLE_CUDA=ON
+  )
+)
+
 set BUILDDIR=%LIB_REPO%\build
 cd %BUILDDIR%
 cmake ..\src  ^
@@ -136,7 +144,8 @@ cmake ..\src  ^
 -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded" ^
 -DCMAKE_MAKE_PROGRAM="%CMAKE_MAKE_PROGRAM%" ^
 -DHYPRE_FMANGLE=4 ^
--DCMAKE_INSTALL_LIBDIR="lib"
+-DCMAKE_INSTALL_LIBDIR="lib" ^
+-DHYPRE_ENABLE_CUDA="%HYPRE_ENABLE_CUDA%"
 
 
 echo.

Build/Scripts/HYPRE/confmake.sh

@@ -25,6 +25,23 @@ if [[ "$FDS_BUILD_TARGET" == *"osx"* ]]; then
    fi
 fi
 
+if [[ "$BUILD_WITH_GPU" == "ON" && -n "$GPU_ARCH" ]]; then
+    if [[ "$GPU_ARCH" == "cuda" ]]; then
+        cmake_args+=(-DHYPRE_ENABLE_CUDA="ON")
+    elif [[ "$GPU_ARCH" == "hip" ]]; then
+        cmake_args+=(-DHYPRE_ENABLE_HIP="ON")
+    elif [[ "$GPU_ARCH" == "sycl" ]]; then
+        cmake_args+=(-DHYPRE_ENABLE_SYCL="ON")
+    else
+        echo "Error: Unsupported GPU_ARCH value: $GPU_ARCH" >&2
+        exit 1
+    fi
+
+    if [[ "$HYPRE_ENABLE_GPU_AWARE_MPI" == "ON" ]]; then
+        cmake_args+=(-DHYPRE_ENABLE_GPU_AWARE_MPI="ON")
+    fi
+fi
+
 # Run cmake with the arguments
 cmake ../src "${cmake_args[@]}"