Skip to content

Commit cb245c0

Browse files
authored
Merge pull request #978 from trz42/2023.06-grace-2023b-eb490-apps
{2023.06}[2023b,grace] Remaining apps originally built with EB 4.9.0
2 parents 7a7ad59 + 4b4fc6e commit cb245c0

File tree

2 files changed

+83
-0
lines changed

2 files changed

+83
-0
lines changed

easystacks/software.eessi.io/2023.06/grace/eessi-2023.06-eb-4.9.4-2023b.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,78 @@ easyconfigs:
1111
# from-pr: 19940
1212
- OpenMPI-4.1.6-GCC-13.2.0.eb
1313
- foss-2023b.eb
14+
- SciPy-bundle-2023.11-gfbf-2023b.eb
15+
# originally built with EB 4.9.0, PR was included since EB 4.9.1
16+
# - netCDF-4.9.2-gompi-2023b.eb:
17+
# options:
18+
# from-pr: 19534
19+
- netCDF-4.9.2-gompi-2023b.eb
20+
# originally built with EB 4.9.0, PR was included since EB 4.9.1
21+
# - matplotlib-3.8.2-gfbf-2023b.eb:
22+
# options:
23+
# from-pr: 19552
24+
- matplotlib-3.8.2-gfbf-2023b.eb
25+
- Boost-1.83.0-GCC-13.2.0.eb:
26+
options:
27+
# source URLs for Boost have changed, corresponding PR is
28+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22157
29+
# Boost is a dependency of AOFlagger
30+
from-commit: 5bebccf792ccf35a8ee3250bc8fed86dff5d5df9
31+
- Boost.Python-1.83.0-GCC-13.2.0.eb:
32+
options:
33+
# source URLs for Boost.* have changed, corresponding PR is
34+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22240
35+
# Boost.Python is a dependency of AOFlagger
36+
from-commit: e610fe1ac5393d1de668a466fdaaea74c580ee03
37+
- wget-1.21.4-GCCcore-13.2.0.eb:
38+
options:
39+
# way to define source for wget has changed, corresponding PR is
40+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22091
41+
# wget is a dependency of AOFlagger
42+
from-commit: 9487eb335902fae6c184f7ee03711fd6c09b1710
43+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1
44+
# - AOFlagger-3.4.0-foss-2023b.eb:
45+
# options:
46+
# from-pr: 19840
47+
# include-easyblocks-from-pr: 3088
48+
- AOFlagger-3.4.0-foss-2023b.eb
49+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
50+
- arpack-ng-3.9.0-foss-2023b.eb
51+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
52+
- Armadillo-12.8.0-foss-2023b.eb
53+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
54+
- casacore-3.5.0-foss-2023b.eb
55+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
56+
- IDG-1.2.0-foss-2023b.eb
57+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
58+
- EveryBeam-0.5.2-foss-2023b.eb
59+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
60+
- DP3-6.0-foss-2023b.eb
61+
# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
62+
- WSClean-3.4-foss-2023b.eb
63+
# originally built with EB 4.9.0, PR was included since EB 4.9.1
64+
# - CDO-2.2.2-gompi-2023b.eb:
65+
# options:
66+
# from-pr: 19792
67+
- CDO-2.2.2-gompi-2023b.eb
68+
# originally built with EB 4.9.0, PR was included since EB 4.9.1
69+
# - python-casacore-3.5.2-foss-2023b.eb:
70+
# options:
71+
# from-pr: 20089
72+
- python-casacore-3.5.2-foss-2023b.eb
73+
# originally built with EB 4.9.0, PR was included since EB 4.9.1
74+
# - libspatialindex-1.9.3-GCCcore-13.2.0.eb:
75+
# options:
76+
# from-pr: 19922
77+
- libspatialindex-1.9.3-GCCcore-13.2.0.eb
78+
- LittleCMS-2.15-GCCcore-13.2.0.eb
79+
- giflib-5.2.1-GCCcore-13.2.0.eb
80+
- OpenJPEG-2.5.0-GCCcore-13.2.0.eb
81+
- libwebp-1.3.2-GCCcore-13.2.0.eb
82+
- Wayland-1.22.0-GCCcore-13.2.0.eb
83+
# originally built with EB 4.9.0, PR was included since EB 4.9.1
84+
# - Qt5-5.15.13-GCCcore-13.2.0.eb:
85+
# options:
86+
# from-pr: 20201
87+
- Qt5-5.15.13-GCCcore-13.2.0.eb
88+
- OSU-Micro-Benchmarks-7.2-gompi-2023b.eb

eb_hooks.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
CPU_TARGET_NEOVERSE_V1 = 'aarch64/neoverse_v1'
2626
CPU_TARGET_AARCH64_GENERIC = 'aarch64/generic'
2727
CPU_TARGET_A64FX = 'aarch64/a64fx'
28+
CPU_TARGET_NVIDIA_GRACE = 'aarch64/nvidia/grace'
2829

2930
CPU_TARGET_SAPPHIRE_RAPIDS = 'x86_64/intel/sapphirerapids'
3031
CPU_TARGET_ZEN4 = 'x86_64/amd/zen4'
@@ -790,16 +791,23 @@ def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):
790791
FAILED scipy/spatial/tests/test_distance.py::TestPdist::test_pdist_correlation_iris
791792
FAILED scipy/spatial/tests/test_distance.py::TestPdist::test_pdist_correlation_iris_float32
792793
= 4 failed, 54407 passed, 3016 skipped, 223 xfailed, 13 xpassed, 10917 warnings in 6068.43s (1:41:08) =
794+
In version 2023.11 on grace, 2 failing tests in scipy (version 1.11.4):
795+
FAILED scipy/optimize/tests/test_linprog.py::TestLinprogIPSparse::test_bug_6139
796+
FAILED scipy/optimize/tests/test_linprog.py::TestLinprogIPSparsePresolve::test_bug_6139
797+
= 2 failed, 54876 passed, 3021 skipped, 223 xfailed, 13 xpassed in 581.85s (0:09:41) =
793798
(in previous versions we were not as strict yet on the numpy/SciPy tests)
794799
"""
795800
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
796801
scipy_bundle_versions_nv1 = ('2021.10', '2023.02', '2023.07', '2023.11')
797802
scipy_bundle_versions_a64fx = ('2023.07', '2023.11')
803+
scipy_bundle_versions_nvidia_grace = ('2023.11')
798804
if self.name == 'SciPy-bundle':
799805
if cpu_target == CPU_TARGET_NEOVERSE_V1 and self.version in scipy_bundle_versions_nv1:
800806
self.cfg['testopts'] = "|| echo ignoring failing tests"
801807
elif cpu_target == CPU_TARGET_A64FX and self.version in scipy_bundle_versions_a64fx:
802808
self.cfg['testopts'] = "|| echo ignoring failing tests"
809+
elif cpu_target == CPU_TARGET_NVIDIA_GRACE and self.version in scipy_bundle_versions_nvidia_grace:
810+
self.cfg['testopts'] = "|| echo ignoring failing tests"
803811

804812

805813
def pre_test_hook_ignore_failing_tests_netCDF(self, *args, **kwargs):

0 commit comments

Comments
 (0)