From 682dba8893da014588029b97179fca8078818b0f Mon Sep 17 00:00:00 2001 From: Richard Top Date: Fri, 19 May 2023 06:49:23 +0000 Subject: [PATCH 1/2] Adding make 4.3 as build-dependency for OpenBLAS-0.3.15-GCC-10.3.0 --- easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb index 3b8d83f4116..f3bb9483823 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb @@ -28,7 +28,7 @@ checksums = [ # OpenBLAS-0.3.15_workaround-gcc-miscompilation.patch 'e6b326fb8c4a8a6fd07741d9983c37a72c55c9ff9a4f74a80e1352ce5f975971', ] - +builddependencies = [('make', '4.3')] # extensive testing can be enabled by uncommenting the line below # runtest = 'PATH=.:$PATH lapack-timing' From e096c0fec8037599cd1e88cc006b0d881dac8bf5 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 19 May 2023 11:27:12 +0200 Subject: [PATCH 2/2] consistently use make 4.3 as build dependency for recent OpenBLAS versions --- .../m/make/make-4.3-GCCcore-12.2.0.eb | 29 +++++++++++++++++++ .../o/OpenBLAS/OpenBLAS-0.3.12-GCC-10.2.0.eb | 4 +++ .../o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb | 6 +++- .../o/OpenBLAS/OpenBLAS-0.3.17-GCC-10.3.0.eb | 4 +++ .../o/OpenBLAS/OpenBLAS-0.3.17-GCC-11.2.0.eb | 1 + .../o/OpenBLAS/OpenBLAS-0.3.18-GCC-11.2.0.eb | 1 + .../o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.2.0.eb | 1 + .../o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb | 1 + .../OpenBLAS-0.3.20-NVHPC-22.7-CUDA-11.7.0.eb | 4 +++ .../o/OpenBLAS/OpenBLAS-0.3.21-GCC-12.2.0.eb | 1 + .../o/OpenBLAS/OpenBLAS-0.3.9-GCC-9.3.0.eb | 4 +++ 11 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/m/make/make-4.3-GCCcore-12.2.0.eb diff --git a/easybuild/easyconfigs/m/make/make-4.3-GCCcore-12.2.0.eb b/easybuild/easyconfigs/m/make/make-4.3-GCCcore-12.2.0.eb new file mode 100644 index 00000000000..2d7194c6354 --- /dev/null +++ b/easybuild/easyconfigs/m/make/make-4.3-GCCcore-12.2.0.eb @@ -0,0 +1,29 @@ +easyblock = 'ConfigureMake' + +name = 'make' +version = '4.3' + +homepage = 'https://www.gnu.org/software/make/make.html' +description = "GNU version of make utility" + +toolchain = {'name': 'GCCcore', 'version': '12.2.0'} + +source_urls = [GNU_SOURCE] +sources = [SOURCE_TAR_GZ] +checksums = ['e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19'] + +builddependencies = [('binutils', '2.39')] + +postinstallcmds = ["cd %(installdir)s/bin && ln -s make gmake"] + +sanity_check_paths = { + 'files': ['bin/gmake', 'bin/make'], + 'dirs': [] +} + +sanity_check_commands = [ + "gmake --help", + "make --help", +] + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.12-GCC-10.2.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.12-GCC-10.2.0.eb index c98d769985e..48333ab642d 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.12-GCC-10.2.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.12-GCC-10.2.0.eb @@ -31,6 +31,10 @@ checksums = [ '9cc47898ba4ad090011dbb0b29e597a13eeebd49a52d4dc94e975743072724b7', ] +builddependencies = [ + ('make', '4.3'), +] + # extensive testing can be enabled by uncommenting the line below # runtest = 'PATH=.:$PATH lapack-timing' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb index f3bb9483823..13b731bc6d1 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.15-GCC-10.3.0.eb @@ -28,7 +28,11 @@ checksums = [ # OpenBLAS-0.3.15_workaround-gcc-miscompilation.patch 'e6b326fb8c4a8a6fd07741d9983c37a72c55c9ff9a4f74a80e1352ce5f975971', ] -builddependencies = [('make', '4.3')] + +builddependencies = [ + ('make', '4.3'), +] + # extensive testing can be enabled by uncommenting the line below # runtest = 'PATH=.:$PATH lapack-timing' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-10.3.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-10.3.0.eb index ae8fd51485e..a7984cac146 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-10.3.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-10.3.0.eb @@ -25,6 +25,10 @@ checksums = [ 'e6b326fb8c4a8a6fd07741d9983c37a72c55c9ff9a4f74a80e1352ce5f975971', ] +builddependencies = [ + ('make', '4.3'), +] + # extensive testing can be enabled by uncommenting the line below # runtest = 'PATH=.:$PATH lapack-timing' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-11.2.0.eb index c4b29c67422..1df506125c2 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.17-GCC-11.2.0.eb @@ -39,6 +39,7 @@ checksums = [ ] builddependencies = [ + ('make', '4.3'), # required by LAPACK test suite ('Python', '3.9.6', '-bare'), ] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.18-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.18-GCC-11.2.0.eb index 762a9558bfb..e00c62b1089 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.18-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.18-GCC-11.2.0.eb @@ -36,6 +36,7 @@ checksums = [ ] builddependencies = [ + ('make', '4.3'), # required by LAPACK test suite ('Python', '3.9.6', '-bare'), ] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.2.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.2.0.eb index 98f44c83e7c..ad53aa70e6b 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.2.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.2.0.eb @@ -34,6 +34,7 @@ checksums = [ ] builddependencies = [ + ('make', '4.3'), # required by LAPACK test suite ('Python', '3.9.6', '-bare'), ] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb index 4496c0bc5b3..c00bedf7a63 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb @@ -34,6 +34,7 @@ checksums = [ ] builddependencies = [ + ('make', '4.3'), # required by LAPACK test suite ('Python', '3.10.4', '-bare'), ] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-NVHPC-22.7-CUDA-11.7.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-NVHPC-22.7-CUDA-11.7.0.eb index 39645058d21..7b49821c348 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-NVHPC-22.7-CUDA-11.7.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.20-NVHPC-22.7-CUDA-11.7.0.eb @@ -33,6 +33,10 @@ checksums = [ {'OpenBLAS-0.3.21_avoid-crash-in-zdot.patch': '3dac2c1ec896df574f1b37cde81a16f24550b7f1eb81fbfacb0c4449b0dc7894'}, ] +builddependencies = [ + ('make', '4.3'), +] + # extensive testing can be enabled by uncommenting the line below # runtest = 'PATH=.:$PATH lapack-timing' diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.21-GCC-12.2.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.21-GCC-12.2.0.eb index b0244cb98ce..274aeeec351 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.21-GCC-12.2.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.21-GCC-12.2.0.eb @@ -34,6 +34,7 @@ checksums = [ ] builddependencies = [ + ('make', '4.3'), # required by LAPACK test suite ('Python', '3.10.8', '-bare'), ] diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.9-GCC-9.3.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.9-GCC-9.3.0.eb index c390c260b68..0e4b7e6439e 100644 --- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.9-GCC-9.3.0.eb +++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.9-GCC-9.3.0.eb @@ -36,6 +36,10 @@ checksums = [ '9210a94ae418b4ce6d9f7fab4e00dd3155451f5ef3769536a4d954a2149ca733', # OpenBLAS-0.3.9_fix-lapack_h.patch ] +builddependencies = [ + ('make', '4.3'), +] + # extensive testing can be enabled by uncommenting the line below # runtest = 'PATH=.:$PATH lapack-timing'