From 21bac8cbaf13f4baf4ecf5508f4435cea53d2f25 Mon Sep 17 00:00:00 2001 From: xina Date: Fri, 6 Oct 2023 10:55:24 +0200 Subject: [PATCH 01/15] adding easyconfigs: waLBerla-6.1-foss-2021a.eb --- .../w/waLBerla/waLBerla-6.1-foss-2021a.eb | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb new file mode 100644 index 00000000000..94771f62def --- /dev/null +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -0,0 +1,39 @@ +# easyconfig file for waLBerla v6.1 + +easyblock = 'CMakeMake' + + +name = 'waLBerla' +version = '6.1' + +homepage = "https://walberla.net/index.html" +description = '''Widely applicable Lattics-Boltzmann from Erlangen is a +block-structured high-performance framework for multiphysics simulations''' + +toolchain = {'name': 'foss', 'version': '2021a'} +toolchainopts = {'usempi': True, 'pic': True} + +source_urls = ['https://i10git.cs.fau.de/walberla/walberla/-/archive/v6.1'] +sources = ['%(name)s-v%(version)s.tar.gz'] +checksums = ['f0acdd9ad6543bc9306c8aae953dd5065986271d4398916ae0469db8b21c007a'] + +builddependencies = [('CMake', '3.20.1')] + +dependencies = [ + ('pybind11', '2.6.2'), + ('Python', '3.9.5') +] + +parallel = 1 + +configopts = "-WALBERLA_BUILD_WITH_PYTHON=ON -WALBERLA_BUILD_SHOWCASES=OFF -WALBERLA_BUILD_DOC=OFF" + + +sanity_check_paths = { + 'files': ['walberla/waLBerlaDefinitions.h'], + 'dirs': [''], +} + +moduleclass = 'chem' + + From c9faffbfcedf63d874c6c6ebeddd2e8024e034d4 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:24:53 +0200 Subject: [PATCH 02/15] Update waLBerla-6.1-foss-2021a.eb delete empty space and adjust indentation --- .../easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index 94771f62def..063f5569218 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -20,8 +20,8 @@ checksums = ['f0acdd9ad6543bc9306c8aae953dd5065986271d4398916ae0469db8b21c007a'] builddependencies = [('CMake', '3.20.1')] dependencies = [ - ('pybind11', '2.6.2'), - ('Python', '3.9.5') + ('pybind11', '2.6.2'), + ('Python', '3.9.5'), ] parallel = 1 @@ -30,10 +30,8 @@ configopts = "-WALBERLA_BUILD_WITH_PYTHON=ON -WALBERLA_BUILD_SHOWCASES=OFF -WALB sanity_check_paths = { - 'files': ['walberla/waLBerlaDefinitions.h'], - 'dirs': [''], + 'files': ['walberla/waLBerlaDefinitions.h'], + 'dirs': [''], } moduleclass = 'chem' - - From 83377364e0c47c0acd964ca5a1127eedac2f0b13 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:53:16 +0200 Subject: [PATCH 03/15] Update waLBerla-6.1-foss-2021a.eb try to fix test error --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 3 --- 1 file changed, 3 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index 063f5569218..c7bf9300968 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -1,8 +1,6 @@ # easyconfig file for waLBerla v6.1 - easyblock = 'CMakeMake' - name = 'waLBerla' version = '6.1' @@ -28,7 +26,6 @@ parallel = 1 configopts = "-WALBERLA_BUILD_WITH_PYTHON=ON -WALBERLA_BUILD_SHOWCASES=OFF -WALBERLA_BUILD_DOC=OFF" - sanity_check_paths = { 'files': ['walberla/waLBerlaDefinitions.h'], 'dirs': [''], From eb196705dd561c76e118100fbb49ab5db539da22 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:33:31 +0200 Subject: [PATCH 04/15] Update easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb Co-authored-by: Simon Branford <4967+branfosj@users.noreply.github.com> --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index c7bf9300968..de18588bccc 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -5,8 +5,8 @@ name = 'waLBerla' version = '6.1' homepage = "https://walberla.net/index.html" -description = '''Widely applicable Lattics-Boltzmann from Erlangen is a -block-structured high-performance framework for multiphysics simulations''' +description = """Widely applicable Lattics-Boltzmann from Erlangen is a +block-structured high-performance framework for multiphysics simulations""" toolchain = {'name': 'foss', 'version': '2021a'} toolchainopts = {'usempi': True, 'pic': True} From 4f9f88c2c199bee3a0dd5a4dbc8c8f522f2e3f20 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:40:31 +0200 Subject: [PATCH 05/15] Update waLBerla-6.1-foss-2021a.eb update python path and cmake configuration --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index de18588bccc..6a5cdbc14e3 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -24,7 +24,10 @@ dependencies = [ parallel = 1 -configopts = "-WALBERLA_BUILD_WITH_PYTHON=ON -WALBERLA_BUILD_SHOWCASES=OFF -WALBERLA_BUILD_DOC=OFF" +configopts = "-DWALBERLA_BUILD_WITH_PYTHON=ON " +configopts += "-DWALBERLA_BUILD_SHOWCASES=OFF " +configopts += "-DWALBERLA_BUILD_DOC=OFF " +configopts += "-DPython_ROOT_DIR=$EBROOTPYTHON " sanity_check_paths = { 'files': ['walberla/waLBerlaDefinitions.h'], From 317c78dd2f3e23e414e2b812bb29bc87bc63c10f Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:24:51 +0200 Subject: [PATCH 06/15] Update waLBerla-6.1-foss-2021a.eb add Boost.MPI dependency --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index 6a5cdbc14e3..44b93328579 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -20,6 +20,7 @@ builddependencies = [('CMake', '3.20.1')] dependencies = [ ('pybind11', '2.6.2'), ('Python', '3.9.5'), + ('Boost.MPI', '1.76.0'), ] parallel = 1 From cc7b583d35bb3bb1a499c90358aebf6d16e42a25 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:45:39 +0200 Subject: [PATCH 07/15] Update waLBerla-6.1-foss-2021a.eb add patch and sanity check --- .../w/waLBerla/waLBerla-6.1-foss-2021a.eb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index 44b93328579..e67edd92949 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -13,7 +13,13 @@ toolchainopts = {'usempi': True, 'pic': True} source_urls = ['https://i10git.cs.fau.de/walberla/walberla/-/archive/v6.1'] sources = ['%(name)s-v%(version)s.tar.gz'] -checksums = ['f0acdd9ad6543bc9306c8aae953dd5065986271d4398916ae0469db8b21c007a'] +patches = ['waLBerla-6.1_fix_cmakelist_for_easybuild.patch'] +checksums = [ + {'waLBerla-v6.1.tar.gz': 'f0acdd9ad6543bc9306c8aae953dd5065986271d4398916ae0469db8b21c007a'}, + {'waLBerla-6.1_fix_cmakelist_for_easybuild.patch': + '13393d523d8f2e1856ae6acffc04bc74d35b5b6a7c800cfad75fb8e3678e4dad'}, +] + builddependencies = [('CMake', '3.20.1')] @@ -31,8 +37,8 @@ configopts += "-DWALBERLA_BUILD_DOC=OFF " configopts += "-DPython_ROOT_DIR=$EBROOTPYTHON " sanity_check_paths = { - 'files': ['walberla/waLBerlaDefinitions.h'], - 'dirs': [''], + 'files': ['walberla/waLBerlaDefinitions.h', 'walberla/pythonmodule/walberla_cpp.cpython-39-x86_64-linux-gnu.so'], + 'dirs': ['walberla/pythonmodule/'] } moduleclass = 'chem' From 1a4685910a9579748f200a29477329549c29d4a7 Mon Sep 17 00:00:00 2001 From: xina Date: Wed, 18 Oct 2023 15:54:06 +0200 Subject: [PATCH 08/15] add cmake patch file --- .../waLBerla-6.1_fix_cmakelist_for_easybuild.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch new file mode 100644 index 00000000000..62c8fad3044 --- /dev/null +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch @@ -0,0 +1,12 @@ +diff -ruN walberla-v6.1.orig/CMakeLists.txt walberla-v6.1/CMakeLists.txt +--- walberla-v6.1.orig/CMakeLists.txt 2023-10-17 13:06:02.619565000 +0200 ++++ walberla-v6.1/CMakeLists.txt 2023-10-18 14:47:35.047985995 +0200 +@@ -1314,7 +1314,7 @@ + src/waLBerlaDefinitions.h ) + + install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION walberla/ ) +- ++install( DIRECTORY ${walberla_BINARY_DIR}/apps/ DESTINATION walberla/ ) + + # test + if ( WALBERLA_BUILD_TESTS ) From ca39ec81d3b3ca010f134264065daa6e985b7451 Mon Sep 17 00:00:00 2001 From: xina Date: Thu, 26 Oct 2023 17:18:42 +0200 Subject: [PATCH 09/15] update fix patch and pythonpath --- .../w/waLBerla/waLBerla-6.1-foss-2021a.eb | 12 ++++++++---- .../waLBerla-6.1_fix_cmakelist_for_easybuild.patch | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index e67edd92949..fe3ca95573a 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -17,10 +17,9 @@ patches = ['waLBerla-6.1_fix_cmakelist_for_easybuild.patch'] checksums = [ {'waLBerla-v6.1.tar.gz': 'f0acdd9ad6543bc9306c8aae953dd5065986271d4398916ae0469db8b21c007a'}, {'waLBerla-6.1_fix_cmakelist_for_easybuild.patch': - '13393d523d8f2e1856ae6acffc04bc74d35b5b6a7c800cfad75fb8e3678e4dad'}, + '4adbf15c336a47f7642524190d97d93a4baf8309de88f1f19278b5275377331d'}, ] - builddependencies = [('CMake', '3.20.1')] dependencies = [ @@ -35,10 +34,15 @@ configopts = "-DWALBERLA_BUILD_WITH_PYTHON=ON " configopts += "-DWALBERLA_BUILD_SHOWCASES=OFF " configopts += "-DWALBERLA_BUILD_DOC=OFF " configopts += "-DPython_ROOT_DIR=$EBROOTPYTHON " +configopts += "-DCMAKE_INSTALL_PREFIX=%(installdir)s " + +modextrapaths = {'PYTHONPATH': ['pythonmodule']} sanity_check_paths = { - 'files': ['walberla/waLBerlaDefinitions.h', 'walberla/pythonmodule/walberla_cpp.cpython-39-x86_64-linux-gnu.so'], - 'dirs': ['walberla/pythonmodule/'] + 'files': ['waLBerlaDefinitions.h', 'pythonmodule/walberla_cpp.cpython-39-x86_64-linux-gnu.so'], + 'dirs': ['pythonmodule'] } moduleclass = 'chem' + + diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch index 62c8fad3044..7d796c2144c 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch @@ -1,12 +1,16 @@ diff -ruN walberla-v6.1.orig/CMakeLists.txt walberla-v6.1/CMakeLists.txt --- walberla-v6.1.orig/CMakeLists.txt 2023-10-17 13:06:02.619565000 +0200 -+++ walberla-v6.1/CMakeLists.txt 2023-10-18 14:47:35.047985995 +0200 -@@ -1314,7 +1314,7 @@ ++++ walberla-v6.1/CMakeLists.txt 2023-10-26 17:03:11.300212100 +0200 +@@ -1313,8 +1313,10 @@ + configure_file ( src/waLBerlaDefinitions.in.h src/waLBerlaDefinitions.h ) - install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION walberla/ ) +-install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION walberla/ ) - -+install( DIRECTORY ${walberla_BINARY_DIR}/apps/ DESTINATION walberla/ ) ++install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION . ) ++install( DIRECTORY ${walberla_BINARY_DIR}/apps/pythonmodule/ DESTINATION . ) ++install( DIRECTORY ${walberla_BINARY_DIR}/apps/benchmarks/ DESTINATION . ) ++install( DIRECTORY ${walberla_BINARY_DIR}/apps/tutorials/ DESTINATION . ) # test if ( WALBERLA_BUILD_TESTS ) From 7f7c7c3bf3dd03b11b9b200c9cbca80a10f8386c Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:22:16 +0200 Subject: [PATCH 10/15] Update waLBerla-6.1-foss-2021a.eb --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index fe3ca95573a..c2e786ff87a 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -44,5 +44,3 @@ sanity_check_paths = { } moduleclass = 'chem' - - From ee7eaeb8df0c51d24897014365e680f1816934a8 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:26:00 +0200 Subject: [PATCH 11/15] Update waLBerla-6.1_fix_cmakelist_for_easybuild.patch --- .../waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch index 7d796c2144c..2397582632a 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch @@ -8,9 +8,9 @@ diff -ruN walberla-v6.1.orig/CMakeLists.txt walberla-v6.1/CMakeLists.txt -install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION walberla/ ) - +install( FILES ${walberla_BINARY_DIR}/src/waLBerlaDefinitions.h DESTINATION . ) -+install( DIRECTORY ${walberla_BINARY_DIR}/apps/pythonmodule/ DESTINATION . ) -+install( DIRECTORY ${walberla_BINARY_DIR}/apps/benchmarks/ DESTINATION . ) -+install( DIRECTORY ${walberla_BINARY_DIR}/apps/tutorials/ DESTINATION . ) ++install( DIRECTORY ${walberla_BINARY_DIR}/apps/pythonmodule/ DESTINATION pythonmodule/ ) ++install( DIRECTORY ${walberla_BINARY_DIR}/apps/benchmarks/ DESTINATION benchmarks/ ) ++install( DIRECTORY ${walberla_BINARY_DIR}/apps/tutorials/ DESTINATION tutorials/ ) # test if ( WALBERLA_BUILD_TESTS ) From 9ad0ecc63dbf9e009b90a40c259096c0b430bad1 Mon Sep 17 00:00:00 2001 From: xina Date: Thu, 26 Oct 2023 19:36:28 +0200 Subject: [PATCH 12/15] fix install path --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 2 +- .../w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index c2e786ff87a..5b98d3995e4 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -17,7 +17,7 @@ patches = ['waLBerla-6.1_fix_cmakelist_for_easybuild.patch'] checksums = [ {'waLBerla-v6.1.tar.gz': 'f0acdd9ad6543bc9306c8aae953dd5065986271d4398916ae0469db8b21c007a'}, {'waLBerla-6.1_fix_cmakelist_for_easybuild.patch': - '4adbf15c336a47f7642524190d97d93a4baf8309de88f1f19278b5275377331d'}, + '057066d07294e8f159c2545d2d5f9138d439dbb54bc70eb75eca1f82ae650c47'}, ] builddependencies = [('CMake', '3.20.1')] diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch index 2397582632a..c5b275b6fe3 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1_fix_cmakelist_for_easybuild.patch @@ -1,6 +1,6 @@ diff -ruN walberla-v6.1.orig/CMakeLists.txt walberla-v6.1/CMakeLists.txt --- walberla-v6.1.orig/CMakeLists.txt 2023-10-17 13:06:02.619565000 +0200 -+++ walberla-v6.1/CMakeLists.txt 2023-10-26 17:03:11.300212100 +0200 ++++ walberla-v6.1/CMakeLists.txt 2023-10-26 19:28:03.622447001 +0200 @@ -1313,8 +1313,10 @@ configure_file ( src/waLBerlaDefinitions.in.h src/waLBerlaDefinitions.h ) From 7509385d663250aa7270ed21a7255f9d24ec2bc4 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:59:39 +0100 Subject: [PATCH 13/15] Add dependency SciPy-bundle numpy --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 1 + 1 file changed, 1 insertion(+) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index 5b98d3995e4..1a5e2a7b940 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -26,6 +26,7 @@ dependencies = [ ('pybind11', '2.6.2'), ('Python', '3.9.5'), ('Boost.MPI', '1.76.0'), + ('SciPy-bundle', '2021.05'), ] parallel = 1 From 72995a2f9d4c86691d18e22b3bcd489482caf073 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Thu, 2 Nov 2023 12:08:22 +0100 Subject: [PATCH 14/15] Add sanity check command --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index 1a5e2a7b940..11881bde0f5 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -44,4 +44,6 @@ sanity_check_paths = { 'dirs': ['pythonmodule'] } +sanity_check_commands = [('python', "-c 'import waLBerla'")] + moduleclass = 'chem' From e6a32a5b9ae3358d8cd9aa2969261f8f8f91d5c5 Mon Sep 17 00:00:00 2001 From: Xin An <34663977+xinan1911@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:39:08 +0100 Subject: [PATCH 15/15] Remove CMake installation path as easyblock takes care of it already --- easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb index 11881bde0f5..b033fcf10d9 100644 --- a/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb +++ b/easybuild/easyconfigs/w/waLBerla/waLBerla-6.1-foss-2021a.eb @@ -35,7 +35,6 @@ configopts = "-DWALBERLA_BUILD_WITH_PYTHON=ON " configopts += "-DWALBERLA_BUILD_SHOWCASES=OFF " configopts += "-DWALBERLA_BUILD_DOC=OFF " configopts += "-DPython_ROOT_DIR=$EBROOTPYTHON " -configopts += "-DCMAKE_INSTALL_PREFIX=%(installdir)s " modextrapaths = {'PYTHONPATH': ['pythonmodule']}