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

Add easyconfig CGAL-5.6.1-GCCcore-13.2.0.eb #21968

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

Conversation

julianmorillo
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the update label Dec 4, 2024
Copy link

github-actions bot commented Dec 4, 2024

Updated software CGAL-4.14.3-gompi-2023b.eb

Diff against CGAL-5.6.1-GCCcore-13.3.0.eb

easybuild/easyconfigs/c/CGAL/CGAL-5.6.1-GCCcore-13.3.0.eb

diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-5.6.1-GCCcore-13.3.0.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2023b.eb
index 01aa21c631..890188abce 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-5.6.1-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2023b.eb
@@ -1,26 +1,38 @@
-easyblock = 'CMakeMake'
 name = 'CGAL'
-version = '5.6.1'
+version = '4.14.3'
 
 homepage = 'https://www.cgal.org/'
 description = """The goal of the CGAL Open Source Project is to provide easy access to efficient
  and reliable geometric algorithms in the form of a C++ library."""
 
-toolchain = {'name': 'GCCcore', 'version': '13.3.0'}
+toolchain = {'name': 'gompi', 'version': '2023b'}
 toolchainopts = {'strict': True}
 
-source_urls = ['https://github.com/CGAL/cgal/releases/download/v%(version)s/']
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
 sources = [SOURCE_TAR_XZ]
-checksums = ['cdb15e7ee31e0663589d3107a79988a37b7b1719df3d24f2058545d1bcdd5837']
+checksums = ['5bafe7abe8435beca17a1082062d363368ec1e3f0d6581bb0da8b010fb389fe4']
 
 builddependencies = [
-    ('CMake', '3.29.3'),
-    ('binutils', '2.42'),
+    ('CMake', '3.27.6'),
+    ('Eigen', '3.4.0'),
 ]
 
-sanity_check_paths = {
-    'files': ['include/CGAL/Simple_cartesian.h'],
-    'dirs': ['include/CGAL', 'lib/cmake/CGAL'],
-}
+dependencies = [
+    ('zlib', '1.2.13'),
+    ('Python', '3.11.5'),
+    ('Boost', '1.83.0'),
+    ('MPFR', '4.2.1'),
+    ('GMP', '6.3.0'),
+    ('Mesa', '23.1.9'),
+    ('libGLU', '9.0.3'),
+    ('Qt5', '5.15.13'),
+]
+
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
+configopts += '-DOpenGL_GL_PREFERENCE=GLVND '
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
+configopts += "-DWITH_GMPXX=ON -DWITH_LAPACK=ON -DWITH_BLAS=ON "
 
 moduleclass = 'numlib'
Diff against CGAL-5.4-GCCcore-12.3.0.eb

easybuild/easyconfigs/c/CGAL/CGAL-5.4-GCCcore-12.3.0.eb

diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-5.4-GCCcore-12.3.0.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2023b.eb
index aa9a56f6fc..890188abce 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-5.4-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2023b.eb
@@ -1,26 +1,38 @@
-easyblock = 'CMakeMake'
 name = 'CGAL'
-version = '5.4'
+version = '4.14.3'
 
 homepage = 'https://www.cgal.org/'
 description = """The goal of the CGAL Open Source Project is to provide easy access to efficient
  and reliable geometric algorithms in the form of a C++ library."""
 
-toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
+toolchain = {'name': 'gompi', 'version': '2023b'}
 toolchainopts = {'strict': True}
 
-source_urls = ['https://github.com/CGAL/cgal/releases/download/v%(version)s/']
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
 sources = [SOURCE_TAR_XZ]
-checksums = ['b3d735ec42fd65ac1413c70e7a197bf3d971e4499347ccfaad92cc82d62dc256']
+checksums = ['5bafe7abe8435beca17a1082062d363368ec1e3f0d6581bb0da8b010fb389fe4']
 
 builddependencies = [
-    ('CMake', '3.26.3'),
-    ('binutils', '2.40'),
+    ('CMake', '3.27.6'),
+    ('Eigen', '3.4.0'),
 ]
 
-sanity_check_paths = {
-    'files': ['include/CGAL/Simple_cartesian.h'],
-    'dirs': ['include/CGAL', 'lib/cmake/CGAL'],
-}
+dependencies = [
+    ('zlib', '1.2.13'),
+    ('Python', '3.11.5'),
+    ('Boost', '1.83.0'),
+    ('MPFR', '4.2.1'),
+    ('GMP', '6.3.0'),
+    ('Mesa', '23.1.9'),
+    ('libGLU', '9.0.3'),
+    ('Qt5', '5.15.13'),
+]
+
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
+configopts += '-DOpenGL_GL_PREFERENCE=GLVND '
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
+configopts += "-DWITH_GMPXX=ON -DWITH_LAPACK=ON -DWITH_BLAS=ON "
 
 moduleclass = 'numlib'
Diff against CGAL-5.6.1-GCCcore-13.2.0.eb

easybuild/easyconfigs/c/CGAL/CGAL-5.6.1-GCCcore-13.2.0.eb

diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-5.6.1-GCCcore-13.2.0.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2023b.eb
index e0dfb771aa..890188abce 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-5.6.1-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.14.3-gompi-2023b.eb
@@ -1,26 +1,38 @@
-easyblock = 'CMakeMake'
 name = 'CGAL'
-version = '5.6.1'
+version = '4.14.3'
 
 homepage = 'https://www.cgal.org/'
 description = """The goal of the CGAL Open Source Project is to provide easy access to efficient
  and reliable geometric algorithms in the form of a C++ library."""
 
-toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
+toolchain = {'name': 'gompi', 'version': '2023b'}
 toolchainopts = {'strict': True}
 
-source_urls = ['https://github.com/CGAL/cgal/releases/download/v%(version)s/']
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
 sources = [SOURCE_TAR_XZ]
-checksums = ['cdb15e7ee31e0663589d3107a79988a37b7b1719df3d24f2058545d1bcdd5837']
+checksums = ['5bafe7abe8435beca17a1082062d363368ec1e3f0d6581bb0da8b010fb389fe4']
 
 builddependencies = [
     ('CMake', '3.27.6'),
-    ('binutils', '2.40'),
+    ('Eigen', '3.4.0'),
 ]
 
-sanity_check_paths = {
-    'files': ['include/CGAL/Simple_cartesian.h'],
-    'dirs': ['include/CGAL', 'lib/cmake/CGAL'],
-}
+dependencies = [
+    ('zlib', '1.2.13'),
+    ('Python', '3.11.5'),
+    ('Boost', '1.83.0'),
+    ('MPFR', '4.2.1'),
+    ('GMP', '6.3.0'),
+    ('Mesa', '23.1.9'),
+    ('libGLU', '9.0.3'),
+    ('Qt5', '5.15.13'),
+]
+
+configopts = '-DOPENGL_INCLUDE_DIR="$EBROOTMESA/include;$EBROOTLIBGLU/include" '
+configopts += '-DOpenGL_GL_PREFERENCE=GLVND '
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+configopts += "-DWITH_ZLIB=ON -DWITH_MPFR=ON -DWITH_OpenGL=ON -DWITH_Eigen3=ON "
+configopts += "-DWITH_GMPXX=ON -DWITH_LAPACK=ON -DWITH_BLAS=ON "
 
 moduleclass = 'numlib'

Updated software Python-2.7.18-GCCcore-13.2.0-bare.eb

Diff against Python-3.12.3-GCCcore-13.3.0.eb

easybuild/easyconfigs/p/Python/Python-3.12.3-GCCcore-13.3.0.eb

diff --git a/easybuild/easyconfigs/p/Python/Python-3.12.3-GCCcore-13.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-13.2.0-bare.eb
index af5f4d1323..f1d335356e 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.12.3-GCCcore-13.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-13.2.0-bare.eb
@@ -1,72 +1,32 @@
 name = 'Python'
-version = '3.12.3'
+version = '2.7.18'
+versionsuffix = '-bare'
 
 homepage = 'https://python.org/'
 description = """Python is a programming language that lets you work more quickly and integrate your systems
  more effectively."""
 
-toolchain = {'name': 'GCCcore', 'version': '13.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
-patches = ['Python-3.12.3_avoid-tkinter-build.patch']
-checksums = [
-    {'Python-3.12.3.tgz': 'a6b9459f45a6ebbbc1af44f5762623fa355a0c87208ed417628b379d762dddb0'},
-    {'Python-3.12.3_avoid-tkinter-build.patch': '34fa44ca67fc08d41c58db2e289317f12f32777a352a982dca2e63459fc089e3'},
-]
+checksums = ['da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814']
 
 builddependencies = [
-    ('UnZip', '6.0'),
-    ('pkgconf', '2.2.0'),
+    ('pkgconf', '2.0.3'),
 ]
 
 dependencies = [
-    ('binutils', '2.42'),
+    ('binutils', '2.40'),
     ('bzip2', '1.0.8'),  # required for bz2 package in Python stdlib
-    ('zlib', '1.3.1'),
+    ('zlib', '1.2.13'),
     ('libreadline', '8.2'),
-    ('ncurses', '6.5'),
-    ('SQLite', '3.45.3'),
-    ('XZ', '5.4.5'),
-    ('libffi', '3.4.5'),
-    ('OpenSSL', '3', '', SYSTEM),
+    ('ncurses', '6.4'),
+    ('SQLite', '3.43.1'),
+    ('OpenSSL', '1.1', '', SYSTEM),
 ]
 
 install_pip = True
 
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-}
-
-# order is important!
-# package versions updated 2024-05-21
-exts_list = [
-    ('flit_core', '3.9.0', {
-        'checksums': ['72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba'],
-    }),
-    ('wheel', '0.43.0', {
-        'checksums': ['465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85'],
-    }),
-    ('tomli', '2.0.1', {
-        'checksums': ['de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f'],
-    }),
-    ('packaging', '24.0', {
-        'checksums': ['eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9'],
-    }),
-    ('typing_extensions', '4.11.0', {
-        'checksums': ['83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0'],
-    }),
-    ('setuptools', '70.0.0', {
-        'checksums': ['f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0'],
-    }),
-    ('setuptools_scm', '8.1.0', {
-        'checksums': ['42dea1b65771cba93b7a515d65a65d8246e560768a66b9106a592c8e7f26c8a7'],
-    }),
-    ('pip', '24.0', {
-        'checksums': ['ea9bd1a847e8c5774a5777bb398c19e80bcd4e2aa16a4b301b718fe6f593aba2'],
-    }),
-]
-
 moduleclass = 'lang'
Diff against Python-3.11.5-GCCcore-13.2.0.eb

easybuild/easyconfigs/p/Python/Python-3.11.5-GCCcore-13.2.0.eb

diff --git a/easybuild/easyconfigs/p/Python/Python-3.11.5-GCCcore-13.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-13.2.0-bare.eb
index 5ad7ceb101..f1d335356e 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.11.5-GCCcore-13.2.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-13.2.0-bare.eb
@@ -1,5 +1,6 @@
 name = 'Python'
-version = '3.11.5'
+version = '2.7.18'
+versionsuffix = '-bare'
 
 homepage = 'https://python.org/'
 description = """Python is a programming language that lets you work more quickly and integrate your systems
@@ -10,10 +11,9 @@ toolchainopts = {'pic': True}
 
 source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
-checksums = ['a12a0a013a30b846c786c010f2c19dd36b7298d888f7c4bd1581d90ce18b5e58']
+checksums = ['da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814']
 
 builddependencies = [
-    ('UnZip', '6.0'),
     ('pkgconf', '2.0.3'),
 ]
 
@@ -24,47 +24,9 @@ dependencies = [
     ('libreadline', '8.2'),
     ('ncurses', '6.4'),
     ('SQLite', '3.43.1'),
-    ('XZ', '5.4.4'),
-    ('libffi', '3.4.4'),
     ('OpenSSL', '1.1', '', SYSTEM),
 ]
 
 install_pip = True
 
-exts_default_options = {
-    'download_dep_fail': True,
-    'sanity_pip_check': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-}
-
-# order is important!
-# package versions updated 2023-09-28
-exts_list = [
-    ('flit_core', '3.9.0', {
-        'checksums': ['72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba'],
-    }),
-    ('wheel', '0.41.2', {
-        'checksums': ['0c5ac5ff2afb79ac23ab82bab027a0be7b5dbcf2e54dc50efe4bf507de1f7985'],
-    }),
-    ('tomli', '2.0.1', {
-        'checksums': ['de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f'],
-    }),
-    ('packaging', '23.2', {
-        'checksums': ['048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5'],
-    }),
-    ('typing_extensions', '4.8.0', {
-        'checksums': ['df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef'],
-    }),
-    ('setuptools-scm', '8.0.4', {
-        'checksums': ['b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7'],
-    }),
-    ('setuptools', '68.2.2', {
-        'checksums': ['4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87'],
-    }),
-    ('pip', '23.2.1', {
-        'checksums': ['fb0bd5435b3200c602b5bf61d2d43c2f13c02e29c1707567ae7fbc514eb9faf2'],
-    }),
-]
-
 moduleclass = 'lang'
Diff against Python-2.7.18-GCCcore-12.3.0.eb

easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-12.3.0.eb

diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-13.2.0-bare.eb
index 23b38544c6..f1d335356e 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.18-GCCcore-13.2.0-bare.eb
@@ -1,11 +1,12 @@
 name = 'Python'
 version = '2.7.18'
+versionsuffix = '-bare'
 
 homepage = 'https://python.org/'
 description = """Python is a programming language that lets you work more quickly and integrate your systems
  more effectively."""
 
-toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
@@ -13,7 +14,7 @@ sources = [SOURCE_TGZ]
 checksums = ['da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814']
 
 builddependencies = [
-    ('pkgconf', '1.9.5'),
+    ('pkgconf', '2.0.3'),
 ]
 
 dependencies = [
@@ -22,34 +23,10 @@ dependencies = [
     ('zlib', '1.2.13'),
     ('libreadline', '8.2'),
     ('ncurses', '6.4'),
-    ('SQLite', '3.42.0'),
+    ('SQLite', '3.43.1'),
     ('OpenSSL', '1.1', '', SYSTEM),
 ]
 
 install_pip = True
 
-exts_default_options = {
-    'download_dep_fail': True,
-    'sanity_pip_check': True,
-    'source_urls': [PYPI_SOURCE],
-    'use_pip': True,
-}
-
-# order is important!
-# package versions updated 2023-05-17
-# https://pip.pypa.io/en/latest/development/release-process/#python-2-support
-
-exts_list = [
-    ('wheel', '0.37.1', {
-        'checksums': ['e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4'],
-    }),
-    ('setuptools', '44.1.1', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'checksums': ['c67aa55db532a0dadc4d2e20ba9961cbd3ccc84d544e9029699822542b5a476b'],
-    }),
-    ('pip', '20.3.4', {
-        'checksums': ['6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc'],
-    }),
-]
-
 moduleclass = 'lang'

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.

1 participant