Skip to content

{chem}[foss/2024a] Environ v3.1, QuantumESPRESSO v7.4 w/ Environ 3.1#22365

Open
yqshao wants to merge 3 commits intoeasybuilders:developfrom
yqshao:20250221164353_new_pr_Environ31
Open

{chem}[foss/2024a] Environ v3.1, QuantumESPRESSO v7.4 w/ Environ 3.1#22365
yqshao wants to merge 3 commits intoeasybuilders:developfrom
yqshao:20250221164353_new_pr_Environ31

Conversation

@yqshao
Copy link
Copy Markdown
Contributor

@yqshao yqshao commented Feb 21, 2025

Adds Environ and QuantumESPRESSSO with Environ support, this also includes (depends on) patch in #22345. Only standard QuantumESPRESSO test here, not sure how to include test suites from Environ.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Feb 21, 2025

Updated software QuantumESPRESSO-7.4-foss-2024a-Environ-3.1.eb

Diff against QuantumESPRESSO-7.4-foss-2024a-minimal.eb

easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-minimal.eb

diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-minimal.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-Environ-3.1.eb
index 378170ec51..0001ca5f46 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-minimal.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-Environ-3.1.eb
@@ -1,11 +1,6 @@
-# This compiles QuantumESPRESSSO with minimal dependencies, the module
-# is intended to be used with the koopmans module, where a forked
-# version of qe-utils is used and doesn't support all the QE
-# dependencies when configuring with CMake.
-
 name = 'QuantumESPRESSO'
 version = '7.4'
-versionsuffix = '-minimal'
+versionsuffix = '-Environ-3.1'
 
 homepage = 'https://www.quantum-espresso.org'
 description = """Quantum ESPRESSO  is an integrated suite of computer codes
@@ -41,7 +36,7 @@ sources = [
         "source_urls": ["https://gitlab.com/QEF/q-e/-/archive/qe-%(version)s"],
     },
     {
-        "filename": f"lapack-{local_lapack_hash[:8]}.tar.xz",
+        "filename": "lapack-%s.tar.gz" % local_lapack_hash,
         "git_config": {
             "url": "https://github.com/Reference-LAPACK",
             "repo_name": "lapack",
@@ -49,7 +44,7 @@ sources = [
         },
     },
     {
-        "filename": f"mbd-{local_mbd_hash[:8]}.tar.xz",
+        "filename": "mbd-%s.tar.gz" % local_mbd_hash,
         "git_config": {
             "url": "https://github.com/libmbd",
             "repo_name": "libmbd",
@@ -58,7 +53,7 @@ sources = [
         },
     },
     {
-        "filename": f"devxlib-{local_devxlib_hash[:8]}.tar.xz",
+        "filename": "devxlib-%s.tar.gz" % local_devxlib_hash,
         "git_config": {
             "url": "https://gitlab.com/max-centre/components",
             "repo_name": "devicexlib",
@@ -67,7 +62,7 @@ sources = [
         },
     },
     {
-        "filename": f"d3q-{local_d3q_hash[:8]}.tar.xz",
+        "filename": "d3q-%s.tar.gz" % local_d3q_hash,
         "git_config": {
             "url": "https://github.com/anharmonic",
             "repo_name": "d3q",
@@ -75,7 +70,7 @@ sources = [
         },
     },
     {
-        "filename": f"fox-{local_fox_hash[:8]}.tar.xz",
+        "filename": "fox-%s.tar.gz" % local_fox_hash,
         "git_config": {
             "url": "https://github.com/pietrodelugas",
             "repo_name": "fox",
@@ -83,7 +78,7 @@ sources = [
         },
     },
     {
-        "filename": f"qe-gipaw-{local_qe_gipaw_hash[:8]}.tar.xz",
+        "filename": "qe-gipaw-%s.tar.gz" % local_qe_gipaw_hash,
         "git_config": {
             "url": "https://github.com/dceresoli",
             "repo_name": "qe-gipaw",
@@ -91,7 +86,7 @@ sources = [
         },
     },
     {
-        "filename": f"pw2qmcpack-{local_qmcpack_hash[:8]}.tar.xz",
+        "filename": "pw2qmcpack-%s.tar.gz" % local_qmcpack_hash,
         "git_config": {
             "url": "https://github.com/QMCPACK",
             "repo_name": "pw2qmcpack",
@@ -99,7 +94,7 @@ sources = [
         },
     },
     {
-        "filename": f"wannier90-{local_w90_hash[:8]}.tar.xz",
+        "filename": "wannier90-%s.tar.gz" % local_w90_hash,
         "git_config": {
             "url": "https://github.com/wannier-developers",
             "repo_name": "wannier90",
@@ -108,44 +103,36 @@ sources = [
     },
 ]
 patches = [
-    # sourcepath needed for patches applied outside the first `finalpath` directory
-    {'name': 'QuantumESPRESSO-7.4-d3q.patch', 'sourcepath': '../'},
-    {'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch'},
+    {
+        'name': 'QuantumESPRESSO-7.4-d3q.patch',
+        'sourcepath': '../'  # Needed as patches are normally applied to the first `finalpath` directory
+    },
+    {
+        'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch',
+    },
 ]
+# Holding off git clone checksum checks untill 5.0.x
+# See https://github.com/easybuilders/easybuild-framework/pull/4248
 checksums = [
-    {'q-e-qe-7.4.tar.gz':
-     'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104'},
-    {'lapack-12d82539.tar.xz':
-     '88aea5bca5e730e99fda0a5b9d677d6036c7dd82874e0deaed5cccef1f880111'},
-    {'mbd-89a3cc19.tar.xz':
-     'd026bf0e9334874670a23cd854f445baac003d4f099afa46bab667bc67abb450'},
-    {'devxlib-a6b89ef7.tar.xz':
-     '0a9b7e5350f44017a2390c85176d1683c6ecec0e4b716a59d727f7650f16e807'},
-    {'d3q-808acbaf.tar.xz':
-     '8e42c946c33b90094ad16c3fd545f00a6801958880dfc5e5274759126a4b193c'},
-    {'fox-3453648e.tar.xz':
-     'c8c55cdf9eb2709aebac86a58f936480ee66438dffd3d65c6a35ca7771c031b3'},
-    {'qe-gipaw-9b2ae1a4.tar.xz':
-     '29e6edfda8ee71c12683b1dfce4a29c5fff8aa9046b0a8085441dce01d084475'},
-    {'pw2qmcpack-f72ab25f.tar.xz':
-     'bc9513c4901ec2469d56b8a6b66f56878cb13e3bc7fbcdc5dba0ca6dad880ab9'},
-    {'wannier90-1d6b1873.tar.xz':
-     '351531aaf3434a9aac92d39ee40df5eb949aa27d14fcb93518bf08444478cd2a'},
-    {'QuantumESPRESSO-7.4-d3q.patch':
-     '1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923'},
-    {'QuantumESPRESSO-7.4-parallel-symmetrization.patch':
-     'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2'},
+    'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104',
+    None, None, None, None, None, None, None, None,
+    '1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923',
+    'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2',
 ]
 
 builddependencies = [
     ('M4', '1.4.19'),
     ('CMake', '3.29.3'),
     ('pkgconf', '2.2.0'),
+    ('Environ', '3.1', None, ('foss', '2024a')),
 ]
+
+configopts = "-DENVIRON_ROOT=$EBROOTENVIRON"
+
 dependencies = [
-    # ('HDF5', '1.14.5'),
-    # ('ELPA', '2024.05.001'),
-    # ('libxc', '6.2.2'),
+    ('HDF5', '1.14.5'),
+    ('ELPA', '2024.05.001'),
+    ('libxc', '6.2.2'),
 ]
 
 # Disabled because of
@@ -153,10 +140,10 @@ dependencies = [
 # https://github.com/anharmonic/d3q/issues/15
 build_shared_libs = False
 with_scalapack = True
-with_fox = False
-with_gipaw = False
-with_d3q = False
-with_qmcpack = False
+with_fox = True
+with_gipaw = True
+with_d3q = True
+with_qmcpack = True
 
 moduleclass = "chem"
 
Diff against QuantumESPRESSO-7.4-foss-2024a.eb

easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a.eb

diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-Environ-3.1.eb
index 030f24ab07..0001ca5f46 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-Environ-3.1.eb
@@ -1,5 +1,6 @@
 name = 'QuantumESPRESSO'
 version = '7.4'
+versionsuffix = '-Environ-3.1'
 
 homepage = 'https://www.quantum-espresso.org'
 description = """Quantum ESPRESSO  is an integrated suite of computer codes
@@ -35,7 +36,7 @@ sources = [
         "source_urls": ["https://gitlab.com/QEF/q-e/-/archive/qe-%(version)s"],
     },
     {
-        "filename": f"lapack-{local_lapack_hash[:8]}.tar.xz",
+        "filename": "lapack-%s.tar.gz" % local_lapack_hash,
         "git_config": {
             "url": "https://github.com/Reference-LAPACK",
             "repo_name": "lapack",
@@ -43,7 +44,7 @@ sources = [
         },
     },
     {
-        "filename": f"mbd-{local_mbd_hash[:8]}.tar.xz",
+        "filename": "mbd-%s.tar.gz" % local_mbd_hash,
         "git_config": {
             "url": "https://github.com/libmbd",
             "repo_name": "libmbd",
@@ -52,7 +53,7 @@ sources = [
         },
     },
     {
-        "filename": f"devxlib-{local_devxlib_hash[:8]}.tar.xz",
+        "filename": "devxlib-%s.tar.gz" % local_devxlib_hash,
         "git_config": {
             "url": "https://gitlab.com/max-centre/components",
             "repo_name": "devicexlib",
@@ -61,7 +62,7 @@ sources = [
         },
     },
     {
-        "filename": f"d3q-{local_d3q_hash[:8]}.tar.xz",
+        "filename": "d3q-%s.tar.gz" % local_d3q_hash,
         "git_config": {
             "url": "https://github.com/anharmonic",
             "repo_name": "d3q",
@@ -69,7 +70,7 @@ sources = [
         },
     },
     {
-        "filename": f"fox-{local_fox_hash[:8]}.tar.xz",
+        "filename": "fox-%s.tar.gz" % local_fox_hash,
         "git_config": {
             "url": "https://github.com/pietrodelugas",
             "repo_name": "fox",
@@ -77,7 +78,7 @@ sources = [
         },
     },
     {
-        "filename": f"qe-gipaw-{local_qe_gipaw_hash[:8]}.tar.xz",
+        "filename": "qe-gipaw-%s.tar.gz" % local_qe_gipaw_hash,
         "git_config": {
             "url": "https://github.com/dceresoli",
             "repo_name": "qe-gipaw",
@@ -85,7 +86,7 @@ sources = [
         },
     },
     {
-        "filename": f"pw2qmcpack-{local_qmcpack_hash[:8]}.tar.xz",
+        "filename": "pw2qmcpack-%s.tar.gz" % local_qmcpack_hash,
         "git_config": {
             "url": "https://github.com/QMCPACK",
             "repo_name": "pw2qmcpack",
@@ -93,7 +94,7 @@ sources = [
         },
     },
     {
-        "filename": f"wannier90-{local_w90_hash[:8]}.tar.xz",
+        "filename": "wannier90-%s.tar.gz" % local_w90_hash,
         "git_config": {
             "url": "https://github.com/wannier-developers",
             "repo_name": "wannier90",
@@ -102,40 +103,32 @@ sources = [
     },
 ]
 patches = [
-    # sourcepath needed for patches applied outside the first `finalpath` directory
-    {'name': 'QuantumESPRESSO-7.4-d3q.patch', 'sourcepath': '../'},
-    {'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch'},
+    {
+        'name': 'QuantumESPRESSO-7.4-d3q.patch',
+        'sourcepath': '../'  # Needed as patches are normally applied to the first `finalpath` directory
+    },
+    {
+        'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch',
+    },
 ]
+# Holding off git clone checksum checks untill 5.0.x
+# See https://github.com/easybuilders/easybuild-framework/pull/4248
 checksums = [
-    {'q-e-qe-7.4.tar.gz':
-     'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104'},
-    {'lapack-12d82539.tar.xz':
-     '88aea5bca5e730e99fda0a5b9d677d6036c7dd82874e0deaed5cccef1f880111'},
-    {'mbd-89a3cc19.tar.xz':
-     'd026bf0e9334874670a23cd854f445baac003d4f099afa46bab667bc67abb450'},
-    {'devxlib-a6b89ef7.tar.xz':
-     '0a9b7e5350f44017a2390c85176d1683c6ecec0e4b716a59d727f7650f16e807'},
-    {'d3q-808acbaf.tar.xz':
-     '8e42c946c33b90094ad16c3fd545f00a6801958880dfc5e5274759126a4b193c'},
-    {'fox-3453648e.tar.xz':
-     'c8c55cdf9eb2709aebac86a58f936480ee66438dffd3d65c6a35ca7771c031b3'},
-    {'qe-gipaw-9b2ae1a4.tar.xz':
-     '29e6edfda8ee71c12683b1dfce4a29c5fff8aa9046b0a8085441dce01d084475'},
-    {'pw2qmcpack-f72ab25f.tar.xz':
-     'bc9513c4901ec2469d56b8a6b66f56878cb13e3bc7fbcdc5dba0ca6dad880ab9'},
-    {'wannier90-1d6b1873.tar.xz':
-     '351531aaf3434a9aac92d39ee40df5eb949aa27d14fcb93518bf08444478cd2a'},
-    {'QuantumESPRESSO-7.4-d3q.patch':
-     '1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923'},
-    {'QuantumESPRESSO-7.4-parallel-symmetrization.patch':
-     'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2'},
+    'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104',
+    None, None, None, None, None, None, None, None,
+    '1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923',
+    'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2',
 ]
 
 builddependencies = [
     ('M4', '1.4.19'),
     ('CMake', '3.29.3'),
     ('pkgconf', '2.2.0'),
+    ('Environ', '3.1', None, ('foss', '2024a')),
 ]
+
+configopts = "-DENVIRON_ROOT=$EBROOTENVIRON"
+
 dependencies = [
     ('HDF5', '1.14.5'),
     ('ELPA', '2024.05.001'),
Diff against QuantumESPRESSO-7.3.1-foss-2024a.eb

easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.3.1-foss-2024a.eb

diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.3.1-foss-2024a.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-Environ-3.1.eb
index 9872b557c4..0001ca5f46 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.3.1-foss-2024a.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a-Environ-3.1.eb
@@ -1,5 +1,6 @@
 name = 'QuantumESPRESSO'
-version = '7.3.1'
+version = '7.4'
+versionsuffix = '-Environ-3.1'
 
 homepage = 'https://www.quantum-espresso.org'
 description = """Quantum ESPRESSO  is an integrated suite of computer codes
@@ -17,15 +18,13 @@ toolchainopts = {
 
 # Check hashes inside external/submodule_commit_hash_records when making file for new version
 local_lapack_hash = "12d825396fcef1e0a1b27be9f119f9e554621e55"
-local_mbd_hash = "82005cbb65bdf5d32ca021848eec8f19da956a77"
+local_mbd_hash = "89a3cc199c0a200c9f0f688c3229ef6b9a8d63bd"
 local_devxlib_hash = "a6b89ef77b1ceda48e967921f1f5488d2df9226d"
 local_fox_hash = "3453648e6837658b747b895bb7bef4b1ed2eac40"
-# Different from the one at tag qe-7.3.1 because of:
-# https://gitlab.com/QEF/q-e/-/issues/666
-local_d3q_hash = "de4718351e7bbb9d1d12aad2b7ca232d06775b83"
-# Different from the one at tag qe-7.3.1 because of:
-# https://github.com/dceresoli/qe-gipaw/issues/19
-local_qe_gipaw_hash = "79d3a03b7bdc4325e66f3fad02a24c6e6e3e5806"
+# Different from the one at tag qe-7.4, see https://github.com/anharmonic/d3q/issues/22
+local_d3q_hash = "808acbaf012468f42147d8d6af452ec64b9e5ab0"
+# Different from the one at tag qe-7.4
+local_qe_gipaw_hash = "9b2ae1a46cae045cc04ef02c1072f2e1e74873b2"
 local_qmcpack_hash = "f72ab25fa4ea755c1b4b230ae8074b47d5509c70"
 local_w90_hash = "1d6b187374a2d50b509e5e79e2cab01a79ff7ce1"
 
@@ -37,7 +36,7 @@ sources = [
         "source_urls": ["https://gitlab.com/QEF/q-e/-/archive/qe-%(version)s"],
     },
     {
-        "filename": f"lapack-{local_lapack_hash[:8]}.tar.xz",
+        "filename": "lapack-%s.tar.gz" % local_lapack_hash,
         "git_config": {
             "url": "https://github.com/Reference-LAPACK",
             "repo_name": "lapack",
@@ -45,7 +44,7 @@ sources = [
         },
     },
     {
-        "filename": f"mbd-{local_mbd_hash[:8]}.tar.xz",
+        "filename": "mbd-%s.tar.gz" % local_mbd_hash,
         "git_config": {
             "url": "https://github.com/libmbd",
             "repo_name": "libmbd",
@@ -54,7 +53,7 @@ sources = [
         },
     },
     {
-        "filename": f"devxlib-{local_devxlib_hash[:8]}.tar.xz",
+        "filename": "devxlib-%s.tar.gz" % local_devxlib_hash,
         "git_config": {
             "url": "https://gitlab.com/max-centre/components",
             "repo_name": "devicexlib",
@@ -63,7 +62,7 @@ sources = [
         },
     },
     {
-        "filename": f"d3q-{local_d3q_hash[:8]}.tar.xz",
+        "filename": "d3q-%s.tar.gz" % local_d3q_hash,
         "git_config": {
             "url": "https://github.com/anharmonic",
             "repo_name": "d3q",
@@ -71,7 +70,7 @@ sources = [
         },
     },
     {
-        "filename": f"fox-{local_fox_hash[:8]}.tar.xz",
+        "filename": "fox-%s.tar.gz" % local_fox_hash,
         "git_config": {
             "url": "https://github.com/pietrodelugas",
             "repo_name": "fox",
@@ -79,7 +78,7 @@ sources = [
         },
     },
     {
-        "filename": f"qe-gipaw-{local_qe_gipaw_hash[:8]}.tar.xz",
+        "filename": "qe-gipaw-%s.tar.gz" % local_qe_gipaw_hash,
         "git_config": {
             "url": "https://github.com/dceresoli",
             "repo_name": "qe-gipaw",
@@ -87,7 +86,7 @@ sources = [
         },
     },
     {
-        "filename": f"pw2qmcpack-{local_qmcpack_hash[:8]}.tar.xz",
+        "filename": "pw2qmcpack-%s.tar.gz" % local_qmcpack_hash,
         "git_config": {
             "url": "https://github.com/QMCPACK",
             "repo_name": "pw2qmcpack",
@@ -95,7 +94,7 @@ sources = [
         },
     },
     {
-        "filename": f"wannier90-{local_w90_hash[:8]}.tar.xz",
+        "filename": "wannier90-%s.tar.gz" % local_w90_hash,
         "git_config": {
             "url": "https://github.com/wannier-developers",
             "repo_name": "wannier90",
@@ -103,32 +102,33 @@ sources = [
         },
     },
 ]
+patches = [
+    {
+        'name': 'QuantumESPRESSO-7.4-d3q.patch',
+        'sourcepath': '../'  # Needed as patches are normally applied to the first `finalpath` directory
+    },
+    {
+        'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch',
+    },
+]
+# Holding off git clone checksum checks untill 5.0.x
+# See https://github.com/easybuilders/easybuild-framework/pull/4248
 checksums = [
-    {'q-e-qe-7.3.1.tar.gz':
-     '2c58b8fadfe4177de5a8b69eba447db5e623420b070dea6fd26c1533b081d844'},
-    {'lapack-12d82539.tar.xz':
-     '88aea5bca5e730e99fda0a5b9d677d6036c7dd82874e0deaed5cccef1f880111'},
-    {'mbd-82005cbb.tar.xz':
-     'bbcf6ee38cc46d59dc364eff1fbe18258a15ef1a393f2720a25e483ef188a62d'},
-    {'devxlib-a6b89ef7.tar.xz':
-     '0a9b7e5350f44017a2390c85176d1683c6ecec0e4b716a59d727f7650f16e807'},
-    {'d3q-de471835.tar.xz':
-     '7ba995ecb64578b27acb0f64a9408c7eafa52aa0994f299454a2bbc502ff8474'},
-    {'fox-3453648e.tar.xz':
-     'c8c55cdf9eb2709aebac86a58f936480ee66438dffd3d65c6a35ca7771c031b3'},
-    {'qe-gipaw-79d3a03b.tar.xz':
-     'ce71b9bd1bde3f5261c68eb794ad19b843aaa8c7a5df9cb73a3132c54b306eda'},
-    {'pw2qmcpack-f72ab25f.tar.xz':
-     'bc9513c4901ec2469d56b8a6b66f56878cb13e3bc7fbcdc5dba0ca6dad880ab9'},
-    {'wannier90-1d6b1873.tar.xz':
-     '351531aaf3434a9aac92d39ee40df5eb949aa27d14fcb93518bf08444478cd2a'},
+    'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104',
+    None, None, None, None, None, None, None, None,
+    '1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923',
+    'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2',
 ]
 
 builddependencies = [
     ('M4', '1.4.19'),
     ('CMake', '3.29.3'),
     ('pkgconf', '2.2.0'),
+    ('Environ', '3.1', None, ('foss', '2024a')),
 ]
+
+configopts = "-DENVIRON_ROOT=$EBROOTENVIRON"
+
 dependencies = [
     ('HDF5', '1.14.5'),
     ('ELPA', '2024.05.001'),
@@ -148,15 +148,9 @@ with_qmcpack = True
 moduleclass = "chem"
 
 test_suite_threshold = (
-    0.4  # Low threshold because of https://gitlab.com/QEF/q-e/-/issues/665
+    0.98
 )
 test_suite_max_failed = (
     5  # Allow for some flaky tests (failed due to strict thresholds)
 )
-test_suite_allow_failures = [
-    "test_qe_xclib_",  # 7.3.1:  https://gitlab.com/QEF/q-e/-/issues/640
-    "--hp_",  # 7.3.1:  Broken testsuite (https://gitlab.com/QEF/q-e/-/issues/665)
-    "--ph_",  # 7.3.1:  Broken testsuite (https://gitlab.com/QEF/q-e/-/issues/665)
-    "--epw_",  # 7.3.1:  Broken testsuite (https://gitlab.com/QEF/q-e/-/issues/665)
-    "--tddfpt_",  # 7.3.1:  Broken testsuite (https://gitlab.com/QEF/q-e/-/issues/665)
-]
+test_suite_allow_failures = []

@yqshao yqshao force-pushed the 20250221164353_new_pr_Environ31 branch from a434a65 to 10179bc Compare February 21, 2025 17:41
@yqshao yqshao force-pushed the 20250221164353_new_pr_Environ31 branch from 10179bc to b4339f3 Compare February 21, 2025 18:19
@yqshao
Copy link
Copy Markdown
Contributor Author

yqshao commented Feb 21, 2025

Test report by @yqshao
SUCCESS
Build succeeded for 3 out of 3 (3 easyconfigs in total)
vera-r05-01 - Linux Rocky Linux 9.4, x86_64, AMD EPYC 9354 32-Core Processor, 2 x NVIDIA NVIDIA H100 NVL, 565.57.01, Python 3.9.18
See https://gist.github.com/yqshao/145cf233c700fe03d2a6d29b92c2e8cb for a full test report.

@boegel
Copy link
Copy Markdown
Member

boegel commented Feb 26, 2025

Let's get #22345 merged first, so we can "clean up" this PR afterwards...

@boegel boegel removed the change label Feb 26, 2025
@boegel boegel added this to the 5.0.0 milestone Feb 26, 2025
@boegel boegel added EasyBuild-5.0 EasyBuild 5.0 and removed EasyBuild-5.0 EasyBuild 5.0 labels Feb 26, 2025
@boegel
Copy link
Copy Markdown
Member

boegel commented Mar 5, 2025

@boegelbot please test @ jsc-zen3
EB_BRANCH=5.0.x
CORE_CNT=16

@boegelbot
Copy link
Copy Markdown
Collaborator

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

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

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

Test results coming soon (I hope)...

Details

- notification for comment with ID 2702185824 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
Copy Markdown
Collaborator

Test report by @boegelbot
SUCCESS
Build succeeded for 2 out of 2 (2 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/42446a08dd0425e328a26108befc3db0 for a full test report.

@yqshao
Copy link
Copy Markdown
Contributor Author

yqshao commented Mar 14, 2025

Test report by @yqshao
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
vera-r05-04 - Linux Rocky Linux 9.4, x86_64, AMD EPYC 9354 32-Core Processor, Python 3.9.18
See https://gist.github.com/yqshao/3922cac23dde0bb20a2e158e3d7d825b for a full test report.

@boegel boegel modified the milestones: 5.0.0, release after 5.0.0 Mar 18, 2025
@yqshao yqshao changed the base branch from 5.0.x to develop April 7, 2025 12:43
@Micket Micket closed this Apr 15, 2025
@Micket Micket reopened this Apr 15, 2025
@Micket
Copy link
Copy Markdown
Contributor

Micket commented Apr 18, 2025

@boegel this is good to go right?

@boegel boegel modified the milestones: next release (5.1.0), 5.x May 23, 2025
@Crivella
Copy link
Copy Markdown
Contributor

Crivella commented Jun 30, 2025

Test report by @Crivella
SUCCESS
Build succeeded for 2 out of 2 (2 easyconfigs in total)
crivella-desktop - Linux Ubuntu 22.04.5 LTS (Jammy Jellyfish), x86_64, 13th Gen Intel(R) Core(TM) i9-13900K (skylake), Python 3.11.13
See https://gist.github.com/Crivella/76092242379e12e798d1435032adb384 for a full test report.

Tests

Total Test time (real) = 350.69 sec

The following tests FAILED:
	348 - system--cp_h2o_scan_libxc-correctness (Failed)
Errors while running CTest

== 2025-06-30 15:35:41,542 quantumespresso.py:392 WARNING  85/376 Test #348: system--cp_h2o_scan_libxc-correctness .............................***Failed    0.18 sec
== 2025-06-30 15:35:41,542 quantumespresso.py:397 INFO Total tests passed 375 out of 376  (99.00%)
== 2025-06-30 15:35:41,542 quantumespresso.py:399 WARNING The following tests failed (and are not ignored):
== 2025-06-30 15:35:41,542 quantumespresso.py:401 WARNING |    85/376 Test #348: system--cp_h2o_scan_libxc-correctness .............................***Failed    0.18 sec
== 2025-06-30 15:35:41,542 build_log.py:322 INFO ... (took 5 mins 50 secs)

Copy link
Copy Markdown
Contributor

@Crivella Crivella left a comment

Choose a reason for hiding this comment

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

Changes to use the same convention as in https://github.com/easybuilders/easybuild-easyconfigs/blob/develop/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-7.4-foss-2024a.eb
This allows us to control the checksums of all the required dependencies

('M4', '1.4.19'),
('CMake', '3.29.3'),
('pkgconf', '2.2.0'),
('Environ', '3.1', None, ('foss', '2024a')),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
('Environ', '3.1', None, ('foss', '2024a')),
('Environ', '3.1'),

Does not need to be specified

"source_urls": ["https://gitlab.com/QEF/q-e/-/archive/qe-%(version)s"],
},
{
"filename": "lapack-%s.tar.gz" % local_lapack_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "lapack-%s.tar.gz" % local_lapack_hash,
"filename": f"lapack-{local_lapack_hash[:8]}.tar.xz",

},
},
{
"filename": "mbd-%s.tar.gz" % local_mbd_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "mbd-%s.tar.gz" % local_mbd_hash,
"filename": f"mbd-{local_mbd_hash[:8]}.tar.xz",

},
},
{
"filename": "devxlib-%s.tar.gz" % local_devxlib_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "devxlib-%s.tar.gz" % local_devxlib_hash,
"filename": f"devxlib-{local_devxlib_hash[:8]}.tar.xz",

},
},
{
"filename": "d3q-%s.tar.gz" % local_d3q_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "d3q-%s.tar.gz" % local_d3q_hash,
"filename": f"d3q-{local_d3q_hash[:8]}.tar.xz",

},
},
{
"filename": "fox-%s.tar.gz" % local_fox_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "fox-%s.tar.gz" % local_fox_hash,
"filename": f"fox-{local_fox_hash[:8]}.tar.xz",

},
},
{
"filename": "qe-gipaw-%s.tar.gz" % local_qe_gipaw_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "qe-gipaw-%s.tar.gz" % local_qe_gipaw_hash,
"filename": f"qe-gipaw-{local_qe_gipaw_hash[:8]}.tar.xz",

},
},
{
"filename": "pw2qmcpack-%s.tar.gz" % local_qmcpack_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "pw2qmcpack-%s.tar.gz" % local_qmcpack_hash,
"filename": f"pw2qmcpack-{local_qmcpack_hash[:8]}.tar.xz",

},
},
{
"filename": "wannier90-%s.tar.gz" % local_w90_hash,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
"filename": "wannier90-%s.tar.gz" % local_w90_hash,
"filename": f"wannier90-{local_w90_hash[:8]}.tar.xz",

Comment on lines +116 to +121
checksums = [
'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104',
None, None, None, None, None, None, None, None,
'1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923',
'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2',
]
Copy link
Copy Markdown
Contributor

@Crivella Crivella Jun 30, 2025

Choose a reason for hiding this comment

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

Suggested change
checksums = [
'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104',
None, None, None, None, None, None, None, None,
'1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923',
'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2',
]
checksums = [
{'q-e-qe-7.4.tar.gz':
'b15dcfe25f4fbf15ccd34c1194021e90996393478226e601d876f7dea481d104'},
{'lapack-12d82539.tar.xz':
'88aea5bca5e730e99fda0a5b9d677d6036c7dd82874e0deaed5cccef1f880111'},
{'mbd-89a3cc19.tar.xz':
'd026bf0e9334874670a23cd854f445baac003d4f099afa46bab667bc67abb450'},
{'devxlib-a6b89ef7.tar.xz':
'0a9b7e5350f44017a2390c85176d1683c6ecec0e4b716a59d727f7650f16e807'},
{'d3q-808acbaf.tar.xz':
'8e42c946c33b90094ad16c3fd545f00a6801958880dfc5e5274759126a4b193c'},
{'fox-3453648e.tar.xz':
'c8c55cdf9eb2709aebac86a58f936480ee66438dffd3d65c6a35ca7771c031b3'},
{'qe-gipaw-9b2ae1a4.tar.xz':
'29e6edfda8ee71c12683b1dfce4a29c5fff8aa9046b0a8085441dce01d084475'},
{'pw2qmcpack-f72ab25f.tar.xz':
'bc9513c4901ec2469d56b8a6b66f56878cb13e3bc7fbcdc5dba0ca6dad880ab9'},
{'wannier90-1d6b1873.tar.xz':
'351531aaf3434a9aac92d39ee40df5eb949aa27d14fcb93518bf08444478cd2a'},
{'QuantumESPRESSO-7.4-d3q.patch':
'1f1686365fbf0cc56f634e072a92b3d336fe454348e514d0b4136d447f0d4923'},
{'QuantumESPRESSO-7.4-parallel-symmetrization.patch':
'e11ac954fa2289a3b453e86871a819a78972e94681f08425ec35dc51a908f7d2'},
]

@Crivella
Copy link
Copy Markdown
Contributor

I think this is fine to go in with the suffix, after the checksums are readded.
I think we can have a follow Easyblock + EC pr to remove the suffix and have ENVIRON as a dep handled by the easyblock

Comment on lines +105 to +113
patches = [
{
'name': 'QuantumESPRESSO-7.4-d3q.patch',
'sourcepath': '../' # Needed as patches are normally applied to the first `finalpath` directory
},
{
'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch',
},
]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
patches = [
{
'name': 'QuantumESPRESSO-7.4-d3q.patch',
'sourcepath': '../' # Needed as patches are normally applied to the first `finalpath` directory
},
{
'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch',
},
]
patches = [
# sourcepath needed for patches applied outside the first `finalpath` directory
{'name': 'QuantumESPRESSO-7.4-d3q.patch', 'sourcepath': '../'},
{'name': 'QuantumESPRESSO-7.4-parallel-symmetrization.patch'},
]

@Thyre Thyre added the 2024a issues & PRs related to 2024a common toolchains label Aug 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2024a issues & PRs related to 2024a common toolchains new update

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants