Skip to content
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.

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

{phys}[foss/2023b] FDS v6.9.1 #21495

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

akesandgren
Copy link
Contributor

(created using eb --new-pr)

@akesandgren
Copy link
Contributor Author

Test report by @akesandgren
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
b-an02.hpc2n.umu.se - Linux Ubuntu 20.04, x86_64, Intel(R) Xeon(R) CPU E5-2690 v4 @ 2.60GHz, Python 3.8.10
See https://gist.github.com/akesandgren/b7add08ee4195cc96c1198ab8189e21d for a full test report.

@boegel
Copy link
Member

boegel commented Jan 21, 2025

@boegelbot please test @ jsc-zen3

Copy link

Updated software FDS-6.9.1-foss-2023b.eb

Diff against FDS-6.9.1-iomkl-2023a.eb

easybuild/easyconfigs/f/FDS/FDS-6.9.1-iomkl-2023a.eb

diff --git a/easybuild/easyconfigs/f/FDS/FDS-6.9.1-iomkl-2023a.eb b/easybuild/easyconfigs/f/FDS/FDS-6.9.1-foss-2023b.eb
index 12639f0e03..25222e3bd5 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-6.9.1-iomkl-2023a.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-6.9.1-foss-2023b.eb
@@ -7,16 +7,12 @@ homepage = 'https://pages.nist.gov/fds-smv'
 description = """Fire Dynamics Simulator (FDS) is a large-eddy simulation (LES) code for low-speed flows,
  with an emphasis on smoke and heat transport from fires."""
 
-toolchain = {'name': 'iomkl', 'version': '2023a'}
+toolchain = {'name': 'foss', 'version': '2023b'}
 toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
 
 source_urls = ['https://github.com/firemodels/fds/archive/']
 sources = ['FDS-%(version)s.tar.gz']
-patches = ['FDS-%(version)s_intel_ompi.patch']
-checksums = [
-    {'FDS-6.9.1.tar.gz': 'e0fe22d1386dc06512489ddf190dbdbee4c9865856f4a7ca48aec8425b4c0867'},
-    {'FDS-6.9.1_intel_ompi.patch': '719137600e35025dce7dfcb88472e113143c571321bea01ceebfdbb6bc3c3fbb'},
-]
+checksums = ['e0fe22d1386dc06512489ddf190dbdbee4c9865856f4a7ca48aec8425b4c0867']
 
 unpack_options = '--strip-components=1'
 
@@ -26,8 +22,8 @@ start_dir = 'Build'
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
-buildopts = 'impi_intel_linux_openmp &&'
-buildopts += 'cd %(installdir)s/Build && ln -s fds_impi_intel_linux_openmp fds'
+buildopts = 'ompi_gnu_linux &&'
+buildopts += 'cd %(installdir)s/Build && ln -s fds_ompi_gnu_linux fds'
 
 modextrapaths = {'PATH': 'Build'}
 
Diff against FDS-6.9.1-intel-2023a.eb

easybuild/easyconfigs/f/FDS/FDS-6.9.1-intel-2023a.eb

diff --git a/easybuild/easyconfigs/f/FDS/FDS-6.9.1-intel-2023a.eb b/easybuild/easyconfigs/f/FDS/FDS-6.9.1-foss-2023b.eb
index cda862525f..25222e3bd5 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-6.9.1-intel-2023a.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-6.9.1-foss-2023b.eb
@@ -7,11 +7,11 @@ homepage = 'https://pages.nist.gov/fds-smv'
 description = """Fire Dynamics Simulator (FDS) is a large-eddy simulation (LES) code for low-speed flows,
  with an emphasis on smoke and heat transport from fires."""
 
-toolchain = {'name': 'intel', 'version': '2023a'}
+toolchain = {'name': 'foss', 'version': '2023b'}
 toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
 
 source_urls = ['https://github.com/firemodels/fds/archive/']
-sources = ['%(name)s-%(version)s.tar.gz']
+sources = ['FDS-%(version)s.tar.gz']
 checksums = ['e0fe22d1386dc06512489ddf190dbdbee4c9865856f4a7ca48aec8425b4c0867']
 
 unpack_options = '--strip-components=1'
@@ -22,8 +22,8 @@ start_dir = 'Build'
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
-buildopts = 'impi_intel_linux_openmp &&'
-buildopts += ' cd %(installdir)s/Build && ln -s fds_impi_intel_linux_openmp fds'
+buildopts = 'ompi_gnu_linux &&'
+buildopts += 'cd %(installdir)s/Build && ln -s fds_ompi_gnu_linux fds'
 
 modextrapaths = {'PATH': 'Build'}
 
Diff against FDS-6.8.0-iomkl-2022b.eb

easybuild/easyconfigs/f/FDS/FDS-6.8.0-iomkl-2022b.eb

diff --git a/easybuild/easyconfigs/f/FDS/FDS-6.8.0-iomkl-2022b.eb b/easybuild/easyconfigs/f/FDS/FDS-6.9.1-foss-2023b.eb
index fb3b29dbf9..25222e3bd5 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-6.8.0-iomkl-2022b.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-6.9.1-foss-2023b.eb
@@ -1,22 +1,18 @@
 easyblock = 'ConfigureMake'
 
 name = 'FDS'
-version = '6.8.0'
+version = '6.9.1'
 
 homepage = 'https://pages.nist.gov/fds-smv'
 description = """Fire Dynamics Simulator (FDS) is a large-eddy simulation (LES) code for low-speed flows,
  with an emphasis on smoke and heat transport from fires."""
 
-toolchain = {'name': 'iomkl', 'version': '2022b'}
+toolchain = {'name': 'foss', 'version': '2023b'}
 toolchainopts = {'pic': True, 'usempi': True, 'openmp': True}
 
 source_urls = ['https://github.com/firemodels/fds/archive/']
 sources = ['FDS-%(version)s.tar.gz']
-patches = ['FDS-%(version)s_intel_ompi.patch']
-checksums = [
-    {'FDS-6.8.0.tar.gz': 'd8213d706bb36300ca5fdc9a7884fa4610e2820338de23212dd19de75d8e0704'},
-    {'FDS-6.8.0_intel_ompi.patch': '4c2cf6c72ed3e1e440d051a9018da05cb87b31512b74d1762d289aca461426b0'},
-]
+checksums = ['e0fe22d1386dc06512489ddf190dbdbee4c9865856f4a7ca48aec8425b4c0867']
 
 unpack_options = '--strip-components=1'
 
@@ -26,8 +22,8 @@ start_dir = 'Build'
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
-buildopts = 'impi_intel_linux_openmp &&'
-buildopts += 'cd %(installdir)s/Build && ln -s fds_impi_intel_linux_openmp fds'
+buildopts = 'ompi_gnu_linux &&'
+buildopts += 'cd %(installdir)s/Build && ln -s fds_ompi_gnu_linux fds'
 
 modextrapaths = {'PATH': 'Build'}
 
@@ -37,8 +33,7 @@ sanity_check_paths = {
 }
 
 sanity_check_commands = [
-    "fds 2>&1 | grep 'MPI Enabled;'",
-    "fds 2>&1 | grep 'OpenMP Enabled;'",
+    "fds 2>&1 | grep 'MPI version'",
 ]
 
 moduleclass = 'phys'

@boegelbot
Copy link
Collaborator

@boegel: Request for testing this PR well received on jsczen3l1.int.jsc-zen3.fz-juelich.de

PR test command 'if [[ develop != 'develop' ]]; then EB_BRANCH=develop ./easybuild_develop.sh 2> /dev/null 1>&2; EB_PREFIX=/home/boegelbot/easybuild/develop source init_env_easybuild_develop.sh; fi; EB_PR=21495 EB_ARGS= EB_CONTAINER= EB_REPO=easybuild-easyconfigs EB_BRANCH=develop /opt/software/slurm/bin/sbatch --job-name test_PR_21495 --ntasks=8 ~/boegelbot/eb_from_pr_upload_jsc-zen3.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 5564

Test results coming soon (I hope)...

- notification for comment with ID 2605354041 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegel
Copy link
Member

boegel commented Jan 21, 2025

Test report by @boegel
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
node3107.skitty.os - Linux RHEL 9.4, x86_64, Intel(R) Xeon(R) Gold 6140 CPU @ 2.30GHz (skylake_avx512), Python 3.9.18
See https://gist.github.com/boegel/faa3f31bfbe3f23cdfa8c91a655df802 for a full test report.

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
jsczen3c1.int.jsc-zen3.fz-juelich.de - Linux Rocky Linux 9.5, x86_64, AMD EPYC-Milan Processor (zen3), Python 3.9.21
See https://gist.github.com/boegelbot/cf2a49d57a28eadc638d77961159ced4 for a full test report.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants