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}[foss/2024a] GDAL v3.10.0 #21907

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

Conversation

branfosj
Copy link
Member

@branfosj branfosj commented Nov 24, 2024

Copy link

github-actions bot commented Nov 24, 2024

Updated software GDAL-3.10.0-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.10.0-foss-2024a.eb
index 2129945751..7b452e77df 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-3.9.0-foss-2023b.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb
@@ -1,7 +1,7 @@
 easyblock = 'CMakeMake'
 
 name = 'GDAL'
-version = '3.9.0'
+version = '3.10.0'
 
 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]
 patches = ['%(name)s-3.6.2_fix-python-CC-CXX.patch']
 checksums = [
-    {'gdal-3.9.0.tar.xz': '577f80e9d14ff7c90b6bfbc34201652b4546700c01543efb4f4c3050e0b3fda2'},
+    {'gdal-3.10.0.tar.xz': 'af821a3bcf68cf085724c21c9b53605fd451d83af3c8854d8bf194638eb734a8'},
     {'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
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.10.0-foss-2024a.eb
index 88e35cd4db..7b452e77df 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-3.7.1-foss-2023a.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb
@@ -1,7 +1,7 @@
 easyblock = 'CMakeMake'
 
 name = 'GDAL'
-version = '3.7.1'
+version = '3.10.0'
 
 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]
 patches = ['%(name)s-3.6.2_fix-python-CC-CXX.patch']
-
 checksums = [
-    {'gdal-3.7.1.tar.xz': '9297948f0a8ba9e6369cd50e87c7e2442eda95336b94d2b92ef1829d260b9a06'},
+    {'gdal-3.10.0.tar.xz': 'af821a3bcf68cf085724c21c9b53605fd451d83af3c8854d8bf194638eb734a8'},
     {'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
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.10.0-foss-2024a.eb
index 576d90e74d..7b452e77df 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-3.6.2-foss-2022b.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-3.10.0-foss-2024a.eb
@@ -1,7 +1,7 @@
 easyblock = 'CMakeMake'
 
 name = 'GDAL'
-version = '3.6.2'
+version = '3.10.0'
 
 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/']
+source_urls = ['https://download.osgeo.org/%(namelower)s/%(version)s/']
 sources = [SOURCELOWER_TAR_XZ]
-patches = ['GDAL-3.6.2_fix-python-CC-CXX.patch']
+patches = ['%(name)s-3.6.2_fix-python-CC-CXX.patch']
 checksums = [
-    {'gdal-3.6.2.tar.xz': '35f40d2e08061b342513cdcddc2b997b3814ef8254514f0ef1e8bc7aa56cf681'},
+    {'gdal-3.10.0.tar.xz': 'af821a3bcf68cf085724c21c9b53605fd451d83af3c8854d8bf194638eb734a8'},
     {'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']
+    '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'

@branfosj
Copy link
Member Author

Test report by @branfosj
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
bear-pg0105u03a - Linux RHEL 8.6, x86_64, Intel(R) Xeon(R) Platinum 8360Y CPU @ 2.40GHz (icelake), Python 3.6.8
See https://gist.github.com/branfosj/9f2a15f4068fc791fb077074882344ee for a full test report.

@branfosj
Copy link
Member Author

Test report by @branfosj
SUCCESS
Build succeeded for 1 out of 1 (1 easyconfigs in total)
bear-pg0210u03a.bear.cluster - Linux RHEL 8.6, x86_64, Intel(R) Xeon(R) Platinum 8480CL (sapphirerapids), Python 3.6.8
See https://gist.github.com/branfosj/176c4c87a72779f811ccfab9b0e65de2 for a full test report.

@smoors
Copy link
Contributor

smoors commented Nov 26, 2024

easybuild.tools.build_log.EasyBuildError: 'Missing dependencies: Armadillo/14.0.3-foss-2024a (no easyconfig file or existing module found)'

@branfosj
Copy link
Member Author

easybuild.tools.build_log.EasyBuildError: 'Missing dependencies: Armadillo/14.0.3-foss-2024a (no easyconfig file or existing module found)'

Is in #21608 but that also has a different GDAL.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants