Skip to content

Build: add hypre and sundials parallel build for all remaining targets #13654

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
rmcdermo merged 2 commits into from
Oct 30, 2024
Merged

Build: add hypre and sundials parallel build for all remaining targets #13654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10def91
Build: add parallel hypre and sundials build scripts to all remaining…
rmcdermo Oct 30, 2024
b111139
Build: chmod +x to build_thirdparty_libs.sh
rmcdermo Oct 30, 2024
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
Empty file modified Build/Scripts/build_thirdparty_libs.sh
100644 → 100755
View file
Open in desktop
Empty file.
9 changes: 6 additions & 3 deletions Build/impi_intel_linux/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#!/bin/bash
ARG=$1

source ../Scripts/set_intel_compiler.sh $ARG

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
export SOURCE_INTEL_IFORT=1
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target with Intel MPI and $INTEL_IFORT
make -j4 VPATH="../../Source" -f ../makefile $target
7 changes: 3 additions & 4 deletions Build/impi_intel_linux_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
dir=`pwd`
target=${dir##*/}

# Compile third-party libraries.
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
export SOURCE_INTEL_IFORT=1
source ../Scripts/build_thirdparty_libs.sh "$@"


# build fds
# Build fds
echo Building $target with Intel MPI and $INTEL_IFORT
make VPATH="../../Source" -f ../makefile $target
make -j4 VPATH="../../Source" -f ../makefile $target
9 changes: 6 additions & 3 deletions Build/impi_intel_linux_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#!/bin/bash
ARG=$1

source ../Scripts/set_intel_compiler.sh $ARG

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
export SOURCE_INTEL_IFORT=1
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target with Intel MPI and $INTEL_IFORT
make -j4 VPATH="../../Source" -f ../makefile $target
9 changes: 6 additions & 3 deletions Build/impi_intel_linux_openmp/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#!/bin/bash
ARG=$1

source ../Scripts/set_intel_compiler.sh $ARG

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
export SOURCE_INTEL_IFORT=1
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target with Intel MPI and $INTEL_IFORT
make -j4 VPATH="../../Source" -f ../makefile $target
10 changes: 7 additions & 3 deletions Build/impi_intel_linux_openmp_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/bin/bash
ARG=$1

source ../Scripts/set_intel_compiler.sh $ARG

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
export SOURCE_INTEL_IFORT=1
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target with Intel MPI and $INTEL_IFORT
make -j4 VPATH="../../Source" -f ../makefile $target

10 changes: 7 additions & 3 deletions Build/impi_intel_linux_openmp_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/bin/bash
ARG=$1

source ../Scripts/set_intel_compiler.sh $ARG

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
export SOURCE_INTEL_IFORT=1
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target with Intel MPI and $INTEL_IFORT
make -j4 VPATH="../../Source" -f ../makefile $target

6 changes: 6 additions & 0 deletions Build/ompi_gnu_linux/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Builds fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
4 changes: 3 additions & 1 deletion Build/ompi_gnu_linux_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/bin/bash

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries.
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Builds fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
8 changes: 7 additions & 1 deletion Build/ompi_gnu_linux_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Builds fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
make -j4 VPATH="../../Source" -f ../makefile $target
6 changes: 6 additions & 0 deletions Build/ompi_gnu_osx/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
4 changes: 3 additions & 1 deletion Build/ompi_gnu_osx_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/bin/bash

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries.
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
6 changes: 6 additions & 0 deletions Build/ompi_gnu_osx_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
7 changes: 7 additions & 0 deletions Build/ompi_intel_linux/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
#!/bin/bash

dir=`pwd`
target=${dir##*/}

# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target

9 changes: 6 additions & 3 deletions Build/ompi_intel_osx/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
dir=`pwd`
target=${dir##*/}

echo Building $target
`ifort -v`
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

make -j4 VPATH="../../Source" -f ../makefile $target
# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
5 changes: 2 additions & 3 deletions Build/ompi_intel_osx_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
dir=`pwd`
target=${dir##*/}

# Compile third-party libraries.
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target
`ifort -v`

make -j4 VPATH="../../Source" -f ../makefile $target
7 changes: 5 additions & 2 deletions Build/ompi_intel_osx_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
dir=`pwd`
target=${dir##*/}

echo Building $target
`ifort -v`
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
7 changes: 5 additions & 2 deletions Build/ompi_intel_osx_openmp/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
dir=`pwd`
target=${dir##*/}

echo Building $target
`ifort -v`
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
9 changes: 6 additions & 3 deletions Build/ompi_intel_osx_openmp_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
dir=`pwd`
target=${dir##*/}

echo Building $target
`ifort -v`
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

make -j4 VPATH="../../Source" -f ../makefile $target
# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target
9 changes: 6 additions & 3 deletions Build/ompi_intel_osx_openmp_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
dir=`pwd`
target=${dir##*/}

echo Building $target
`ifort -v`
# Compile third-party libraries
export FDS_BUILD_TARGET=$target
source ../Scripts/build_thirdparty_libs.sh "$@"

make -j4 VPATH="../../Source" -f ../makefile $target
# Build fds
echo Building $target
make -j4 VPATH="../../Source" -f ../makefile $target