Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{data,numlib}[foss/2024a] Armadillo v14.0.3, arpack-ng v3.9.1, GDAL v3.9.2, ... #21608

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from

Conversation

maxim-masterov
Copy link
Collaborator

@maxim-masterov maxim-masterov commented Oct 9, 2024

(created using eb --new-pr)

Depends on:

@maxim-masterov maxim-masterov added the 2024a issues & PRs related to 2024a common toolchains label Oct 9, 2024
@smoors
Copy link
Contributor

smoors commented Nov 26, 2024

@maxim-masterov in the mean time v3.10.0 of GDAL has been released, see #21907
would you be ok if we dropped v3.9.2, or do you still need this version?

Copy link

Updated software Armadillo-14.0.3-foss-2024a.eb

Diff against Armadillo-12.8.0-foss-2023b.eb

easybuild/easyconfigs/a/Armadillo/Armadillo-12.8.0-foss-2023b.eb

diff --git a/easybuild/easyconfigs/a/Armadillo/Armadillo-12.8.0-foss-2023b.eb b/easybuild/easyconfigs/a/Armadillo/Armadillo-14.0.3-foss-2024a.eb
index 2ca0b7de51..68036ea413 100644
--- a/easybuild/easyconfigs/a/Armadillo/Armadillo-12.8.0-foss-2023b.eb
+++ b/easybuild/easyconfigs/a/Armadillo/Armadillo-14.0.3-foss-2024a.eb
@@ -1,24 +1,24 @@
 name = 'Armadillo'
-version = '12.8.0'
+version = '14.0.3'
 
 homepage = 'https://arma.sourceforge.net/'
 description = """Armadillo is an open-source C++ linear algebra library (matrix maths) aiming towards
  a good balance between speed and ease of use. Integer, floating point and complex numbers are supported,
  as well as a subset of trigonometric and statistics functions."""
 
-toolchain = {'name': 'foss', 'version': '2023b'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 
 source_urls = ['https://sourceforge.net/projects/arma/files']
 sources = [SOURCELOWER_TAR_XZ]
-checksums = ['a89bb6fece5ce9fdd1d01a4bc145cf7cc0b939c5777cca46de69c2f5e3412cf0']
+checksums = ['ebd6215eeb01ee412fed078c8a9f7f87d4e1f6187ebcdc1bc09f46095a4f4003']
 
 builddependencies = [
-    ('CMake', '3.27.6'),
+    ('CMake', '3.29.3'),
 ]
 dependencies = [
-    ('Boost', '1.83.0'),
-    ('HDF5', '1.14.3'),
-    ('arpack-ng', '3.9.0'),
+    ('Boost', '1.85.0'),
+    ('HDF5', '1.14.5'),
+    ('arpack-ng', '3.9.1'),
 ]
 
 
Diff against Armadillo-12.6.2-foss-2023a.eb

easybuild/easyconfigs/a/Armadillo/Armadillo-12.6.2-foss-2023a.eb

diff --git a/easybuild/easyconfigs/a/Armadillo/Armadillo-12.6.2-foss-2023a.eb b/easybuild/easyconfigs/a/Armadillo/Armadillo-14.0.3-foss-2024a.eb
index 9b6d74fe58..68036ea413 100644
--- a/easybuild/easyconfigs/a/Armadillo/Armadillo-12.6.2-foss-2023a.eb
+++ b/easybuild/easyconfigs/a/Armadillo/Armadillo-14.0.3-foss-2024a.eb
@@ -1,25 +1,25 @@
 name = 'Armadillo'
-version = '12.6.2'
+version = '14.0.3'
 
 homepage = 'https://arma.sourceforge.net/'
 description = """Armadillo is an open-source C++ linear algebra library (matrix maths) aiming towards
  a good balance between speed and ease of use. Integer, floating point and complex numbers are supported,
  as well as a subset of trigonometric and statistics functions."""
 
-toolchain = {'name': 'foss', 'version': '2023a'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 
 source_urls = ['https://sourceforge.net/projects/arma/files']
 sources = [SOURCELOWER_TAR_XZ]
-checksums = ['e7efaaf29abda3448447bdf8cba2cceaa19afb802981b62f0c6384c842b01609']
+checksums = ['ebd6215eeb01ee412fed078c8a9f7f87d4e1f6187ebcdc1bc09f46095a4f4003']
 
 builddependencies = [
-    ('CMake', '3.26.3'),
+    ('CMake', '3.29.3'),
 ]
-
 dependencies = [
-    ('Boost', '1.82.0'),
-    ('HDF5', '1.14.0'),
-    ('arpack-ng', '3.9.0'),
+    ('Boost', '1.85.0'),
+    ('HDF5', '1.14.5'),
+    ('arpack-ng', '3.9.1'),
 ]
 
+
 moduleclass = 'numlib'
Diff against Armadillo-11.4.3-foss-2022a.eb

easybuild/easyconfigs/a/Armadillo/Armadillo-11.4.3-foss-2022a.eb

diff --git a/easybuild/easyconfigs/a/Armadillo/Armadillo-11.4.3-foss-2022a.eb b/easybuild/easyconfigs/a/Armadillo/Armadillo-14.0.3-foss-2024a.eb
index c8c874dba0..68036ea413 100644
--- a/easybuild/easyconfigs/a/Armadillo/Armadillo-11.4.3-foss-2022a.eb
+++ b/easybuild/easyconfigs/a/Armadillo/Armadillo-14.0.3-foss-2024a.eb
@@ -1,25 +1,25 @@
 name = 'Armadillo'
-version = '11.4.3'
+version = '14.0.3'
 
 homepage = 'https://arma.sourceforge.net/'
 description = """Armadillo is an open-source C++ linear algebra library (matrix maths) aiming towards
  a good balance between speed and ease of use. Integer, floating point and complex numbers are supported,
  as well as a subset of trigonometric and statistics functions."""
 
-toolchain = {'name': 'foss', 'version': '2022a'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 
 source_urls = ['https://sourceforge.net/projects/arma/files']
 sources = [SOURCELOWER_TAR_XZ]
-checksums = ['87603263664988af41da2ca4f36205e36ea47a9281fa6cfd463115f3797a1da2']
+checksums = ['ebd6215eeb01ee412fed078c8a9f7f87d4e1f6187ebcdc1bc09f46095a4f4003']
 
 builddependencies = [
-    ('CMake', '3.24.3'),
+    ('CMake', '3.29.3'),
 ]
-
 dependencies = [
-    ('Boost', '1.79.0'),
-    ('HDF5', '1.12.2'),
-    ('arpack-ng', '3.8.0'),
+    ('Boost', '1.85.0'),
+    ('HDF5', '1.14.5'),
+    ('arpack-ng', '3.9.1'),
 ]
 
+
 moduleclass = 'numlib'

Updated software arpack-ng-3.9.1-foss-2024a.eb

Diff against arpack-ng-3.9.1-foss-2023b.eb

easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2023b.eb

diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2023b.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2024a.eb
index 4f029ffc4f..29d5a00219 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2023b.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2024a.eb
@@ -1,31 +1,35 @@
+# Author:    Robert Mijakovic <[email protected]>
+
 easyblock = 'ConfigureMake'
 
 name = 'arpack-ng'
 version = '3.9.1'
 
 homepage = 'https://github.com/opencollab/arpack-ng'
-description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems."""
+description = "ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems."
 
-toolchain = {'name': 'foss', 'version': '2023b'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
-github_account = 'opencollab'
 source_urls = [GITHUB_SOURCE]
 sources = ['%(version)s.tar.gz']
 checksums = ['f6641deb07fa69165b7815de9008af3ea47eb39b2bb97521fbf74c97aba6e844']
 
 builddependencies = [
-    ('Autotools', '20220317'),
-    ('pkgconf', '2.0.3'),
-    ('Eigen', '3.4.0')
+    ('Autotools', '20231222'),
+    ('pkgconf', '2.2.0'),
+]
+dependencies = [
+    ('Eigen', '3.4.0'),
 ]
 
 preconfigopts = "sh bootstrap && "
 configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
 
+github_account = 'opencollab'
+
 sanity_check_paths = {
-    'files': ['lib64/libarpack.la', 'lib64/libarpack.%s' % SHLIB_EXT,
-              'lib64/libparpack.la', 'lib64/libparpack.%s' % SHLIB_EXT],
+    'files': ['lib64/libarpack.la', 'lib64/libarpack.so', 'lib64/libparpack.la', 'lib64/libparpack.so'],
     'dirs': [],
 }
 
Diff against arpack-ng-3.9.0-foss-2023b.eb

easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb

diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2024a.eb
index 10d825ca22..29d5a00219 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023b.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2024a.eb
@@ -3,23 +3,21 @@
 easyblock = 'ConfigureMake'
 
 name = 'arpack-ng'
-version = '3.9.0'
+version = '3.9.1'
 
 homepage = 'https://github.com/opencollab/arpack-ng'
 description = "ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems."
 
-toolchain = {'name': 'foss', 'version': '2023b'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
-github_account = 'opencollab'
-
 source_urls = [GITHUB_SOURCE]
 sources = ['%(version)s.tar.gz']
-checksums = ['24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0']
+checksums = ['f6641deb07fa69165b7815de9008af3ea47eb39b2bb97521fbf74c97aba6e844']
 
 builddependencies = [
-    ('Autotools', '20220317'),
-    ('pkgconf', '2.0.3'),
+    ('Autotools', '20231222'),
+    ('pkgconf', '2.2.0'),
 ]
 dependencies = [
     ('Eigen', '3.4.0'),
@@ -28,9 +26,10 @@ dependencies = [
 preconfigopts = "sh bootstrap && "
 configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
 
+github_account = 'opencollab'
+
 sanity_check_paths = {
-    'files': ['lib64/libarpack.la', 'lib64/libarpack.%s' % SHLIB_EXT,
-              'lib64/libparpack.la', 'lib64/libparpack.%s' % SHLIB_EXT],
+    'files': ['lib64/libarpack.la', 'lib64/libarpack.so', 'lib64/libparpack.la', 'lib64/libparpack.so'],
     'dirs': [],
 }
 
Diff against arpack-ng-3.9.0-foss-2023a.eb

easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023a.eb

diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023a.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2024a.eb
index bdc9b5aa64..29d5a00219 100644
--- a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.0-foss-2023a.eb
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.9.1-foss-2024a.eb
@@ -1,34 +1,35 @@
-##
 # Author:    Robert Mijakovic <[email protected]>
-##
+
 easyblock = 'ConfigureMake'
 
 name = 'arpack-ng'
-version = '3.9.0'
+version = '3.9.1'
 
 homepage = 'https://github.com/opencollab/arpack-ng'
-description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems."""
+description = "ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems."
 
-toolchain = {'name': 'foss', 'version': '2023a'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
-github_account = 'opencollab'
 source_urls = [GITHUB_SOURCE]
 sources = ['%(version)s.tar.gz']
-checksums = ['24f2a2b259992d3c797d80f626878aa8e2ed5009d549dad57854bbcfb95e1ed0']
+checksums = ['f6641deb07fa69165b7815de9008af3ea47eb39b2bb97521fbf74c97aba6e844']
 
 builddependencies = [
-    ('Autotools', '20220317'),
-    ('pkgconf', '1.9.5'),
-    ('Eigen', '3.4.0')
+    ('Autotools', '20231222'),
+    ('pkgconf', '2.2.0'),
+]
+dependencies = [
+    ('Eigen', '3.4.0'),
 ]
 
 preconfigopts = "sh bootstrap && "
 configopts = '--enable-mpi --with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
 
+github_account = 'opencollab'
+
 sanity_check_paths = {
-    'files': ['lib64/libarpack.la', 'lib64/libarpack.%s' % SHLIB_EXT,
-              'lib64/libparpack.la', 'lib64/libparpack.%s' % SHLIB_EXT],
+    'files': ['lib64/libarpack.la', 'lib64/libarpack.so', 'lib64/libparpack.la', 'lib64/libparpack.so'],
     'dirs': [],
 }
 

Updated software GDAL-3.9.2-foss-2024a.eb

Diff against GDAL-3.9.0-foss-2023b.eb

easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb

diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.2-foss-2024a.eb
index 2129945751..85b6186916 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.2-foss-2024a.eb
@@ -1,7 +1,7 @@
 easyblock = 'CMakeMake'
 
 name = 'GDAL'
-version = '3.9.0'
+version = '3.9.2'
 
 homepage = 'https://www.gdal.org'
 description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
@@ -9,54 +9,54 @@ description = """GDAL is a translator library for raster geospatial data formats
  to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
  data translation and processing."""
 
-toolchain = {'name': 'foss', 'version': '2023b'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 toolchainopts = {'usempi': True}
 
-source_urls = ['https://download.osgeo.org/%(namelower)s/%(version)s/']
-sources = [SOURCELOWER_TAR_XZ]
+source_urls = ['https://github.com/OSGeo/gdal/releases/download/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
 patches = ['%(name)s-3.6.2_fix-python-CC-CXX.patch']
 checksums = [
-    {'gdal-3.9.0.tar.xz': '577f80e9d14ff7c90b6bfbc34201652b4546700c01543efb4f4c3050e0b3fda2'},
+    {'gdal-3.9.2.tar.gz': 'c9767e79ca7245f704bfbcb47d771b2dc317d743536b78d648c3e92b95fbc21e'},
     {'GDAL-3.6.2_fix-python-CC-CXX.patch': '859b874b0c8ff7626a76d51f008bf05b7f89a35b325bdd1d126d2364154acc63'},
 ]
 
 builddependencies = [
-    ('CMake', '3.27.6'),
-    ('pkgconf', '2.0.3'),
+    ('CMake', '3.29.3'),
+    ('pkgconf', '2.2.0'),
     ('Bison', '3.8.2'),
 ]
 dependencies = [
-    ('Python', '3.11.5'),
+    ('Python', '3.12.3'),
     ('netCDF', '4.9.2'),
-    ('expat', '2.5.0'),
-    ('GEOS', '3.12.1'),
-    ('SQLite', '3.43.1'),
-    ('libarchive', '3.7.2'),
-    ('libxml2', '2.11.5'),
-    ('libpng', '1.6.40'),
+    ('expat', '2.6.2'),
+    ('GEOS', '3.12.2'),
+    ('SQLite', '3.45.3'),
+    ('libarchive', '3.7.4'),
+    ('libxml2', '2.12.7'),
+    ('libpng', '1.6.43'),
     ('libjpeg-turbo', '3.0.1'),
     ('LibTIFF', '4.6.0'),
-    ('zlib', '1.2.13'),
-    ('cURL', '8.3.0'),
+    ('zlib', '1.3.1'),
+    ('cURL', '8.7.1'),
     ('PCRE', '8.45'),
-    ('PROJ', '9.3.1'),
+    ('PROJ', '9.4.1'),
     ('libgeotiff', '1.7.3'),
-    ('SciPy-bundle', '2023.11'),
-    ('HDF5', '1.14.3'),
-    ('HDF', '4.2.16-2'),
-    ('Armadillo', '12.8.0'),
-    ('CFITSIO', '4.3.1'),
-    ('zstd', '1.5.5'),
-    ('giflib', '5.2.1'),
+    ('SciPy-bundle', '2024.05'),
+    ('HDF5', '1.14.5'),
+    ('HDF', '4.3.0'),
+    ('Armadillo', '14.0.3'),
+    ('CFITSIO', '4.4.1'),
+    ('zstd', '1.5.6'),
+    ('giflib', '5.2.2'),
     ('json-c', '0.17'),
     ('Xerces-C++', '3.2.5'),
-    ('PCRE2', '10.42'),
-    ('OpenEXR', '3.2.0'),
+    ('PCRE2', '10.43'),
+    ('OpenEXR', '3.2.4'),
     ('Brunsli', '0.1'),
     ('Qhull', '2020.2'),
     ('LERC', '4.0.0'),
-    ('OpenJPEG', '2.5.0'),
-    ('SWIG', '4.1.1'),
+    ('OpenJPEG', '2.5.2'),
+    ('SWIG', '4.2.1'),
 ]
 
 # iterative build for both static and shared libraries
@@ -70,7 +70,7 @@ configopts = [
 
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.a', 'lib/libgdal.%s' % SHLIB_EXT],
+    'files': ['lib/libgdal.a', 'lib/libgdal.so'],
     'dirs': ['bin', 'include', 'lib/python%(pyshortver)s/site-packages'],
 }
 
Diff against GDAL-3.7.1-foss-2023a.eb

easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb

diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.2-foss-2024a.eb
index 88e35cd4db..85b6186916 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.2-foss-2024a.eb
@@ -1,7 +1,7 @@
 easyblock = 'CMakeMake'
 
 name = 'GDAL'
-version = '3.7.1'
+version = '3.9.2'
 
 homepage = 'https://www.gdal.org'
 description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
@@ -9,55 +9,54 @@ description = """GDAL is a translator library for raster geospatial data formats
  to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
  data translation and processing."""
 
-toolchain = {'name': 'foss', 'version': '2023a'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 toolchainopts = {'usempi': True}
 
-source_urls = ['https://download.osgeo.org/%(namelower)s/%(version)s/']
-sources = [SOURCELOWER_TAR_XZ]
+source_urls = ['https://github.com/OSGeo/gdal/releases/download/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
 patches = ['%(name)s-3.6.2_fix-python-CC-CXX.patch']
-
 checksums = [
-    {'gdal-3.7.1.tar.xz': '9297948f0a8ba9e6369cd50e87c7e2442eda95336b94d2b92ef1829d260b9a06'},
+    {'gdal-3.9.2.tar.gz': 'c9767e79ca7245f704bfbcb47d771b2dc317d743536b78d648c3e92b95fbc21e'},
     {'GDAL-3.6.2_fix-python-CC-CXX.patch': '859b874b0c8ff7626a76d51f008bf05b7f89a35b325bdd1d126d2364154acc63'},
 ]
 
 builddependencies = [
-    ('CMake', '3.26.3'),
-    ('pkgconf', '1.9.5'),
+    ('CMake', '3.29.3'),
+    ('pkgconf', '2.2.0'),
     ('Bison', '3.8.2'),
 ]
 dependencies = [
-    ('Python', '3.11.3'),
+    ('Python', '3.12.3'),
     ('netCDF', '4.9.2'),
-    ('expat', '2.5.0'),
-    ('GEOS', '3.12.0'),
-    ('SQLite', '3.42.0'),
-    ('libarchive', '3.6.2'),
-    ('libxml2', '2.11.4'),
-    ('libpng', '1.6.39'),
-    ('libjpeg-turbo', '2.1.5.1'),
-    ('LibTIFF', '4.5.0'),
-    ('zlib', '1.2.13'),
-    ('cURL', '8.0.1'),
+    ('expat', '2.6.2'),
+    ('GEOS', '3.12.2'),
+    ('SQLite', '3.45.3'),
+    ('libarchive', '3.7.4'),
+    ('libxml2', '2.12.7'),
+    ('libpng', '1.6.43'),
+    ('libjpeg-turbo', '3.0.1'),
+    ('LibTIFF', '4.6.0'),
+    ('zlib', '1.3.1'),
+    ('cURL', '8.7.1'),
     ('PCRE', '8.45'),
-    ('PROJ', '9.2.0'),
-    ('libgeotiff', '1.7.1'),
-    ('SciPy-bundle', '2023.07'),
-    ('HDF5', '1.14.0'),
-    ('HDF', '4.2.16-2'),
-    ('Armadillo', '12.6.2'),
-    ('CFITSIO', '4.3.0'),
-    ('zstd', '1.5.5'),
-    ('giflib', '5.2.1'),
-    ('json-c', '0.16'),
-    ('Xerces-C++', '3.2.4'),
-    ('PCRE2', '10.42'),
-    ('OpenEXR', '3.1.7'),
+    ('PROJ', '9.4.1'),
+    ('libgeotiff', '1.7.3'),
+    ('SciPy-bundle', '2024.05'),
+    ('HDF5', '1.14.5'),
+    ('HDF', '4.3.0'),
+    ('Armadillo', '14.0.3'),
+    ('CFITSIO', '4.4.1'),
+    ('zstd', '1.5.6'),
+    ('giflib', '5.2.2'),
+    ('json-c', '0.17'),
+    ('Xerces-C++', '3.2.5'),
+    ('PCRE2', '10.43'),
+    ('OpenEXR', '3.2.4'),
     ('Brunsli', '0.1'),
     ('Qhull', '2020.2'),
     ('LERC', '4.0.0'),
-    ('OpenJPEG', '2.5.0'),
-    ('SWIG', '4.1.1'),
+    ('OpenJPEG', '2.5.2'),
+    ('SWIG', '4.2.1'),
 ]
 
 # iterative build for both static and shared libraries
@@ -71,7 +70,7 @@ configopts = [
 
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.a', 'lib/libgdal.%s' % SHLIB_EXT],
+    'files': ['lib/libgdal.a', 'lib/libgdal.so'],
     'dirs': ['bin', 'include', 'lib/python%(pyshortver)s/site-packages'],
 }
 
Diff against GDAL-3.6.2-foss-2022b.eb

easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb

diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.2-foss-2024a.eb
index 576d90e74d..85b6186916 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.9.2-foss-2024a.eb
@@ -1,7 +1,7 @@
 easyblock = 'CMakeMake'
 
 name = 'GDAL'
-version = '3.6.2'
+version = '3.9.2'
 
 homepage = 'https://www.gdal.org'
 description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
@@ -9,73 +9,73 @@ description = """GDAL is a translator library for raster geospatial data formats
  to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
  data translation and processing."""
 
-toolchain = {'name': 'foss', 'version': '2022b'}
+toolchain = {'name': 'foss', 'version': '2024a'}
 toolchainopts = {'usempi': True}
 
-source_urls = ['https://download.osgeo.org/gdal/%(version)s/']
-sources = [SOURCELOWER_TAR_XZ]
-patches = ['GDAL-3.6.2_fix-python-CC-CXX.patch']
+source_urls = ['https://github.com/OSGeo/gdal/releases/download/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+patches = ['%(name)s-3.6.2_fix-python-CC-CXX.patch']
 checksums = [
-    {'gdal-3.6.2.tar.xz': '35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681'},
+    {'gdal-3.9.2.tar.gz': 'c9767e79ca7245f704bfbcb47d771b2dc317d743536b78d648c3e92b95fbc21e'},
     {'GDAL-3.6.2_fix-python-CC-CXX.patch': '859b874b0c8ff7626a76d51f008bf05b7f89a35b325bdd1d126d2364154acc63'},
 ]
 
 builddependencies = [
-    ('CMake', '3.24.3'),
-    ('pkgconf', '1.9.3'),
+    ('CMake', '3.29.3'),
+    ('pkgconf', '2.2.0'),
     ('Bison', '3.8.2'),
 ]
-
 dependencies = [
-    ('Python', '3.10.8'),
-    ('netCDF', '4.9.0'),
-    ('expat', '2.4.9'),
-    ('GEOS', '3.11.1'),
-    ('SQLite', '3.39.4'),
-    ('libxml2', '2.10.3'),
-    ('libpng', '1.6.38'),
-    ('libjpeg-turbo', '2.1.4'),
-    ('LibTIFF', '4.4.0'),
-    ('zlib', '1.2.12'),
-    ('cURL', '7.86.0'),
+    ('Python', '3.12.3'),
+    ('netCDF', '4.9.2'),
+    ('expat', '2.6.2'),
+    ('GEOS', '3.12.2'),
+    ('SQLite', '3.45.3'),
+    ('libarchive', '3.7.4'),
+    ('libxml2', '2.12.7'),
+    ('libpng', '1.6.43'),
+    ('libjpeg-turbo', '3.0.1'),
+    ('LibTIFF', '4.6.0'),
+    ('zlib', '1.3.1'),
+    ('cURL', '8.7.1'),
     ('PCRE', '8.45'),
-    ('PROJ', '9.1.1'),
-    ('libgeotiff', '1.7.1'),
-    ('SciPy-bundle', '2023.02'),
-    ('HDF5', '1.14.0'),
-    ('HDF', '4.2.15'),
-    ('Armadillo', '11.4.3'),
-    ('CFITSIO', '4.2.0'),
-    ('zstd', '1.5.2'),
-    ('giflib', '5.2.1'),
-    ('json-c', '0.16'),
-    ('Xerces-C++', '3.2.4'),
-    ('PCRE2', '10.40'),
-    ('OpenEXR', '3.1.5'),
+    ('PROJ', '9.4.1'),
+    ('libgeotiff', '1.7.3'),
+    ('SciPy-bundle', '2024.05'),
+    ('HDF5', '1.14.5'),
+    ('HDF', '4.3.0'),
+    ('Armadillo', '14.0.3'),
+    ('CFITSIO', '4.4.1'),
+    ('zstd', '1.5.6'),
+    ('giflib', '5.2.2'),
+    ('json-c', '0.17'),
+    ('Xerces-C++', '3.2.5'),
+    ('PCRE2', '10.43'),
+    ('OpenEXR', '3.2.4'),
     ('Brunsli', '0.1'),
     ('Qhull', '2020.2'),
     ('LERC', '4.0.0'),
-    ('OpenJPEG', '2.5.0'),
+    ('OpenJPEG', '2.5.2'),
+    ('SWIG', '4.2.1'),
 ]
 
-# common configopts for static, shared library builds
-_base_configopts = ' '.join([
-    '-DGDAL_USE_INTERNAL_LIBS=OFF',
-    '-DGEOTIFF_INCLUDE_DIR=$EBROOTLIBGEOTIFF/include',
-    '-DPython_ROOT=$EBROOTPYTHON',
-    '-DGDAL_USE_MYSQL=OFF',
-])
-
 # iterative build for both static and shared libraries
-configopts = [' '.join([_base_configopts, x]) for x in ['-DBUILD_SHARED_LIBS=OFF', '']]
+local_configopts_common = "-DGDAL_USE_INTERNAL_LIBS=OFF -DGDAL_USE_MYSQL=OFF "
+local_configopts_common += "-DGEOTIFF_INCLUDE_DIR=$EBROOTLIBGEOTIFF/include -DPython_ROOT=$EBROOTPYTHON "
+
+configopts = [
+    local_configopts_common + "-DBUILD_SHARED_LIBS=OFF",
+    local_configopts_common
+]
 
-modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
 
 sanity_check_paths = {
-    'files': ['lib/libgdal.a', 'lib/libgdal.%s' % SHLIB_EXT],
-    'dirs': ['bin', 'include', 'lib/python%(pyshortver)s/site-packages']
+    'files': ['lib/libgdal.a', 'lib/libgdal.so'],
+    'dirs': ['bin', 'include', 'lib/python%(pyshortver)s/site-packages'],
 }
 
-sanity_check_commands = ["python -c 'import osgeo.gdal'"]
+sanity_check_commands = ["python -c 'import osgeo.%(namelower)s'"]
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
 
 moduleclass = 'data'

@verdurin
Copy link
Member

There's also the giflib version issue - could it use 5.2.1 instead?

@maxim-masterov
Copy link
Collaborator Author

@smoors I can switch to GDAL v3.10.0, no problem. Only Fiona from #21614 needs to be updated.

@verdurin What's the problem with giflib 5.2.2? I see that #21907 also uses v5.2.2.

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 update
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants