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

{vis}[GCCcore/12.3.0] SMV v6.9.5 #22036

Merged

Conversation

pavelToman
Copy link
Collaborator

@pavelToman pavelToman commented Dec 16, 2024

(created using eb --new-pr)
resolves vscentrum/vsc-software-stack#351

Copy link

Updated software SMV-6.9.5-GCCcore-12.3.0.eb

Diff against SMV-6.7.17-iccifort-2020.4.304.eb

easybuild/easyconfigs/s/SMV/SMV-6.7.17-iccifort-2020.4.304.eb

diff --git a/easybuild/easyconfigs/s/SMV/SMV-6.7.17-iccifort-2020.4.304.eb b/easybuild/easyconfigs/s/SMV/SMV-6.9.5-GCCcore-12.3.0.eb
index 484357754e..b164481d03 100644
--- a/easybuild/easyconfigs/s/SMV/SMV-6.7.17-iccifort-2020.4.304.eb
+++ b/easybuild/easyconfigs/s/SMV/SMV-6.9.5-GCCcore-12.3.0.eb
@@ -1,72 +1,44 @@
-##
-# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
-# Author::   Denis Kristak (INUITS)
-##
-
-easyblock = 'MakeCp'
+easyblock = 'CMakeMake'
 
 name = 'SMV'  # SmokeView
-version = '6.7.17'
+version = '6.9.5'
 
 homepage = 'https://github.com/firemodels/smv'
 description = """Smokeview is a visualization program that displays output of FDS and CFAST simulations."""
 
-toolchain = {'name': 'iccifort', 'version': '2020.4.304'}
+toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
 
-source_urls = ['https://github.com/firemodels/%(name)s/archive/refs/tags/']
-sources = ['%(name)s%(version)s.tar.gz']
-patches = [
-    'SMV-%(version)s_missing-includes.patch',
-    ('example.smv', '.'),  # example file for sanity check
-]
-checksums = [
-    '2e718af991e48228bf374fdefcce00d2e8b5827cc29ae2138ae267fda896f127',  # SMV6.7.17.tar.gz
-    '2b287f3e6ff368422684bd887568a369b9db3426a94efefcccc7680392b742ab',  # SMV-6.7.17_missing-includes.patch
-    '1adf7dcc5293ec7a5f7ec01a828dec88b4ddd025505167b4e361d9450f66ea59',  # example.smv
-]
+source_urls = ['https://github.com/firemodels/smv/archive/']
+sources = [SOURCE_TAR_GZ]
+checksums = ['6c6203f6d6cd83c3525c7447ce4201c8df373d18d0c992d607ad232a77590ef7']
 
-dependencies = [
-    ('libgd', '2.3.0'),
-    ('freeglut', '3.2.1'),
-    ('libjpeg-turbo', '2.0.5'),
-    ('libpng', '1.6.37'),
-    ('zlib', '1.2.11'),
-    ('Lua', '5.4.2'),
-    ('LPeg', '1.0.2'),
-    ('libGLU', '9.0.1'),
-    ('glew', '2.1.0'),
-    ('Xvfb', '1.20.9'),
+builddependencies = [
+    ('CMake', '3.26.3'),
+    ('pkgconf', '1.9.5'),
+    ('binutils', '2.40'),
 ]
-
-local_buildopts = ' -lglui -lglut -lfreeglut -lGLU -lGL -llibgd '
-local_buildopts += ' LDFLAGS=" -L%(installdir)s -L$EBROOTFREEGLUT/lib -L$EBROOTLIBGD/lib " '
-local_buildopts += ' IFLAGS=" -I$EBROOTFREEGLUT/include/GL -I%(builddir)s/smv-SMV%(version)s/Source/glui_v2_1_beta/ '
-local_buildopts += ' -I%(builddir)s/smv-SMV%(version)s/Source/glui_gl/GL/glut.h "'
-local_buildopts += ' EB_L_PATH=%(installdir)s '
-local_buildopts += ' CFLAGS="-Dpp_LINUX" '
-
-prebuildopts = "cd %(builddir)s/smv-SMV%(version)s/Build/LIBS/intel_linux_64/ && "
-prebuildopts += " make all -f make_LIBS.make "
-prebuildopts += "SRCDIR=%(builddir)s/smv-SMV%(version)s/Source/ LIBDIR=%(installdir)s && "
-prebuildopts += "cd %(builddir)s/smv-SMV%(version)s/Build/smokeview/ && "
-prebuildopts += "export IFORT_COMPILER_LIB=$EBROOTICCIFORT/lib64/intel64/ && "
-
-buildopts = ' intel_linux_64 ' + local_buildopts
-
-files_to_copy = [
-    (["./Build/smokeview/*.o", "./Build/smokeview/smokeview_linux_64*"], 'bin'),
+dependencies = [
+    ('libgd', '2.3.3'),
+    ('freeglut', '3.4.0'),
+    ('libjpeg-turbo', '2.1.5.1'),
+    ('libpng', '1.6.39'),
+    ('zlib', '1.2.13'),
+    ('json-c', '0.16'),
+    ('Doxygen', '1.9.7'),
+    ('glew', '2.2.0', '-osmesa'),
 ]
 
-postinstallcmds = [
-    'ln -s %(installdir)s/bin/smokeview_linux_64 %(installdir)s/bin/smokeview'
-]
+configopts = '-DVERIFICATION_TESTS=ON'
 
 sanity_check_commands = [
-    "cd %(builddir)s/smv-SMV%(version)s && timeout 10 xvfb-run smokeview example 2>&1 | grep 'Terminated' ",
+    'smokediff -h',
+    'smokezip -h',
+    'smvq -h',
+    'smokeview -h 2>&1 | grep "Visualize"',
 ]
 
 sanity_check_paths = {
-    'files': ['bin/smokeview'],
+    'files': ['bin/smokeview', 'bin/smokediff', 'bin/smokezip', 'bin/smvq'],
     'dirs': [],
 }
 

@pavelToman
Copy link
Collaborator Author

@boegelbot please test @ generoso

@pavelToman
Copy link
Collaborator Author

Test report by @pavelToman
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
node4003.donphan.os - Linux RHEL 8.8, x86_64, Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz, 1 x NVIDIA NVIDIA A2, 545.23.08, Python 3.6.8
See https://gist.github.com/pavelToman/0416ded4faece3f3280bd5122b5c1176 for a full test report.

@boegelbot
Copy link
Collaborator

@pavelToman: Request for testing this PR well received on login1

PR test command 'EB_PR=22036 EB_ARGS= EB_CONTAINER= EB_REPO=easybuild-easyconfigs /opt/software/slurm/bin/sbatch --job-name test_PR_22036 --ntasks=4 ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

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

Test results coming soon (I hope)...

- notification for comment with ID 2545937676 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).

@pavelToman
Copy link
Collaborator Author

Test report by @pavelToman
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
node4212.shinx.os - Linux RHEL 9.4, x86_64, AMD EPYC 9654 96-Core Processor, Python 3.9.18
See https://gist.github.com/pavelToman/74c5f140fe58103e263089fa46206db9 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)
cns2 - Linux Rocky Linux 8.9, x86_64, Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz (haswell), Python 3.6.8
See https://gist.github.com/boegelbot/8b4734a85a908d7fa5d8ad85a89ed9b2 for a full test report.

@pavelToman
Copy link
Collaborator Author

@boegelbot please test @ jsc-zen3

@boegelbot
Copy link
Collaborator

@pavelToman: 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=22036 EB_ARGS= EB_CONTAINER= EB_REPO=easybuild-easyconfigs EB_BRANCH=develop /opt/software/slurm/bin/sbatch --job-name test_PR_22036 --ntasks=8 ~/boegelbot/eb_from_pr_upload_jsc-zen3.sh' executed!

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

Test results coming soon (I hope)...

- notification for comment with ID 2546024257 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).

@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.19
See https://gist.github.com/boegelbot/7438d8594e1dba3b10ddf391f57f96af for a full test report.

Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@boegel
Copy link
Member

boegel commented Dec 17, 2024

Test report by @boegel
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
node3105.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/f0d12c1c6b0ac906119dd0422fb42b9e for a full test report.

@boegel
Copy link
Member

boegel commented Dec 17, 2024

@boegelbot please test @ generoso

@boegelbot
Copy link
Collaborator

@boegel: Request for testing this PR well received on login1

PR test command 'EB_PR=22036 EB_ARGS= EB_CONTAINER= EB_REPO=easybuild-easyconfigs /opt/software/slurm/bin/sbatch --job-name test_PR_22036 --ntasks=4 ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

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

Test results coming soon (I hope)...

- notification for comment with ID 2547956542 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).

@boegelbot
Copy link
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
cns2 - Linux Rocky Linux 8.9, x86_64, Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz (haswell), Python 3.6.8
See https://gist.github.com/boegelbot/37fa474fff201b85c134eee0bd274d67 for a full test report.

@boegel boegel added this to the release after 4.9.4 milestone Dec 17, 2024
@boegel
Copy link
Member

boegel commented Dec 17, 2024

Going in, thanks @pavelToman!

@boegel boegel merged commit 77917f4 into easybuilders:develop Dec 17, 2024
10 checks passed
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.

FDS 6.9.1 AND SMV 6.9.1
3 participants