From ce79d418a7b1683af9024b71704a163fa3760567 Mon Sep 17 00:00:00 2001 From: sassy Date: Wed, 18 May 2022 11:04:04 +0100 Subject: [PATCH 1/4] adding easyconfigs: Mmg-5.6.0-gompi-2021a.eb --- .../m/Mmg/Mmg-5.6.0-gompi-2021a.eb | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb diff --git a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb new file mode 100644 index 000000000000..5f1a28b4c64f --- /dev/null +++ b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb @@ -0,0 +1,40 @@ +easyblock = 'CMakeMake' + +name = 'Mmg' +version = '5.6.0' + +homepage = 'https://www.mmgtools.org/' +description = """ +Mmg is an open source software for simplicial remeshing. It provides 3 applications and 4 libraries: +the mmg2d application and the libmmg2d library: adaptation and optimization of a two-dimensional +triangulation and generation of a triangulation from a set of points or from given boundary edges +the mmgs application and the libmmgs library: adaptation and optimization of a surface triangulation +and isovalue discretization the mmg3d application and the libmmg3d library: adaptation and optimization +of a tetrahedral mesh and implicit domain meshing the libmmg library gathering the libmmg2d, +libmmgs and libmmg3d libraries.""" + +toolchain = {'name': 'gompi', 'version': '2021a'} + +source_urls = ['https://github.com/MmgTools/mmg/archive'] +sources = ['v%(version)s.tar.gz'] +checksums = ['bbf9163d65bc6e0f81dd3acc5a51e4a8c47a7fdae849abc26277e01154fe2437'] + +builddependencies = [ + ('CMake', '3.20.1'), + ('binutils', '2.36.1'), +] + +dependencies = [('SCOTCH', '6.1.0')] + +separate_build_dir = True + +configopts = '-DUSE_SCOTCH=ON ' +configopts += '-DLIBMMG2D_SHARED=ON -DLIBMMG3D_SHARED=ON -DLIBMMGS_SHARED=ON -DLIBMMG_SHARED=ON ' + +sanity_check_paths = { + 'files': ['bin/%s_O3' % x for x in ['mmg2d', 'mmg3d', 'mmgs']] + + ['lib/lib%s.%s' % (x, y) for x in ['mmg2d', 'mmg3d', 'mmgs', 'mmg'] for y in ['a', SHLIB_EXT]], + 'dirs': ['include/mmg/%s' % x for x in ['mmg2d', 'mmg3d', 'mmgs']] +} + +moduleclass = 'math' From 6e09e1180386364fa5819105642f7b785768a55f Mon Sep 17 00:00:00 2001 From: sassy Date: Wed, 3 Aug 2022 14:43:26 +0100 Subject: [PATCH 2/4] Tests added, following PR #15622 --- .../easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb index 5f1a28b4c64f..2339f816add1 100644 --- a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb +++ b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb @@ -17,7 +17,13 @@ toolchain = {'name': 'gompi', 'version': '2021a'} source_urls = ['https://github.com/MmgTools/mmg/archive'] sources = ['v%(version)s.tar.gz'] -checksums = ['bbf9163d65bc6e0f81dd3acc5a51e4a8c47a7fdae849abc26277e01154fe2437'] +patches = ['mmg-%(version)s_remove_ci_tests.patch'] + +checksums = [ + 'bbf9163d65bc6e0f81dd3acc5a51e4a8c47a7fdae849abc26277e01154fe2437', # v5.6.0.tar.gz + '99de7437fb9d036c786b7f1526da93d4aa1d28e728fe7279f4c9204bbbb9f734', # mmg-5.6.0_remove_ci_tests.patch + +] builddependencies = [ ('CMake', '3.20.1'), @@ -28,9 +34,15 @@ dependencies = [('SCOTCH', '6.1.0')] separate_build_dir = True -configopts = '-DUSE_SCOTCH=ON ' +# CI tests require downloading of data that might not be available in the future. +# Sticking to tests included in the source with help of patch +configopts = '-DUSE_SCOTCH=ON -DBUILD_TESTING=ON -DONLY_VERY_SHORT_TESTS=ON ' +configopts += '-DTEST_LIBMMG2D=ON -DTEST_LIBMMG3D=ON -DTEST_LIBMMGS=ON ' configopts += '-DLIBMMG2D_SHARED=ON -DLIBMMG3D_SHARED=ON -DLIBMMGS_SHARED=ON -DLIBMMG_SHARED=ON ' +pretestopts = 'export CTEST_PARALLEL_LEVEL=%(parallel)s &&' +runtest = 'test' + sanity_check_paths = { 'files': ['bin/%s_O3' % x for x in ['mmg2d', 'mmg3d', 'mmgs']] + ['lib/lib%s.%s' % (x, y) for x in ['mmg2d', 'mmg3d', 'mmgs', 'mmg'] for y in ['a', SHLIB_EXT]], From 0125c8e66dca61d894285e99b20ec6bef557eae2 Mon Sep 17 00:00:00 2001 From: sassy Date: Wed, 3 Aug 2022 14:51:44 +0100 Subject: [PATCH 3/4] binutils removed --- easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb index 2339f816add1..80a0bcb4e5e9 100644 --- a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb +++ b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb @@ -27,7 +27,6 @@ checksums = [ builddependencies = [ ('CMake', '3.20.1'), - ('binutils', '2.36.1'), ] dependencies = [('SCOTCH', '6.1.0')] From b7dab3b09a4204c22c4821d16cdc6972a36bb6ad Mon Sep 17 00:00:00 2001 From: Alex Domingo Date: Fri, 30 Sep 2022 15:16:37 +0200 Subject: [PATCH 4/4] homogenize easyconfigs of Mmg v5.6.0 --- .../easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb | 12 ++++-------- .../easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021b.eb | 13 ++++++------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb index 80a0bcb4e5e9..eb07a34b0a1a 100644 --- a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb +++ b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021a.eb @@ -6,11 +6,11 @@ version = '5.6.0' homepage = 'https://www.mmgtools.org/' description = """ Mmg is an open source software for simplicial remeshing. It provides 3 applications and 4 libraries: -the mmg2d application and the libmmg2d library: adaptation and optimization of a two-dimensional +the mmg2d application and the libmmg2d library: adaptation and optimization of a two-dimensional triangulation and generation of a triangulation from a set of points or from given boundary edges the mmgs application and the libmmgs library: adaptation and optimization of a surface triangulation -and isovalue discretization the mmg3d application and the libmmg3d library: adaptation and optimization -of a tetrahedral mesh and implicit domain meshing the libmmg library gathering the libmmg2d, +and isovalue discretization the mmg3d application and the libmmg3d library: adaptation and optimization +of a tetrahedral mesh and implicit domain meshing the libmmg library gathering the libmmg2d, libmmgs and libmmg3d libraries.""" toolchain = {'name': 'gompi', 'version': '2021a'} @@ -25,14 +25,10 @@ checksums = [ ] -builddependencies = [ - ('CMake', '3.20.1'), -] +builddependencies = [('CMake', '3.20.1')] dependencies = [('SCOTCH', '6.1.0')] -separate_build_dir = True - # CI tests require downloading of data that might not be available in the future. # Sticking to tests included in the source with help of patch configopts = '-DUSE_SCOTCH=ON -DBUILD_TESTING=ON -DONLY_VERY_SHORT_TESTS=ON ' diff --git a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021b.eb b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021b.eb index a27faef39a93..517ba6a34405 100644 --- a/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021b.eb +++ b/easybuild/easyconfigs/m/Mmg/Mmg-5.6.0-gompi-2021b.eb @@ -6,14 +6,12 @@ version = '5.6.0' homepage = 'https://www.mmgtools.org/' description = """ Mmg is an open source software for simplicial remeshing. It provides 3 applications and 4 libraries: -the mmg2d application and the libmmg2d library: adaptation and optimization of a two-dimensional triangulation -and generation of a triangulation from a set of points or from given boundary edges +the mmg2d application and the libmmg2d library: adaptation and optimization of a two-dimensional +triangulation and generation of a triangulation from a set of points or from given boundary edges the mmgs application and the libmmgs library: adaptation and optimization of a surface triangulation -and isovalue discretization -the mmg3d application and the libmmg3d library: adaptation and optimization of a tetrahedral mesh -and implicit domain meshing -the libmmg library gathering the libmmg2d, libmmgs and libmmg3d libraries -""" +and isovalue discretization the mmg3d application and the libmmg3d library: adaptation and optimization +of a tetrahedral mesh and implicit domain meshing the libmmg library gathering the libmmg2d, +libmmgs and libmmg3d libraries.""" toolchain = {'name': 'gompi', 'version': '2021b'} @@ -35,6 +33,7 @@ configopts = '-DUSE_SCOTCH=ON -DBUILD_TESTING=ON -DONLY_VERY_SHORT_TESTS=ON ' configopts += '-DTEST_LIBMMG2D=ON -DTEST_LIBMMG3D=ON -DTEST_LIBMMGS=ON ' configopts += '-DLIBMMG2D_SHARED=ON -DLIBMMG3D_SHARED=ON -DLIBMMGS_SHARED=ON -DLIBMMG_SHARED=ON ' +pretestopts = 'export CTEST_PARALLEL_LEVEL=%(parallel)s &&' runtest = 'test' sanity_check_paths = {