From 2d542e54e4f03bf3a2cc1b192817d5a7e6aeee11 Mon Sep 17 00:00:00 2001 From: Jens Henrik Goebbert <j.goebbert@fz-juelich.de> Date: Tue, 6 Jun 2023 16:38:44 +0200 Subject: [PATCH] update to SciPy-bundle --- Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb | 2 +- Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb | 2 +- Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb | 3 ++- Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb | 3 ++- Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb | 3 ++- Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb | 3 ++- Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb | 2 +- Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb | 2 +- Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb | 2 +- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb index d43579630..816bcaaff 100644 --- a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb +++ b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-foss-2022a.eb @@ -26,7 +26,7 @@ builddependencies = [ dependencies = [ ('Python', '3.10.4'), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('zlib', '1.2.12'), ('bzip2', '1.0.8'), ('Szip', '2.1.1'), diff --git a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb index 0fc2729db..cfae237b7 100644 --- a/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb +++ b/Golden_Repo/a/ADIOS2/ADIOS2-2.8.3-gpsmkl-2022a.eb @@ -26,7 +26,7 @@ builddependencies = [ dependencies = [ ('Python', '3.10.4'), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('zlib', '1.2.12'), ('bzip2', '1.0.8'), ('Szip', '2.1.1'), diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb index f33303452..2ed375ca4 100644 --- a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb +++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a-EGL.eb @@ -58,7 +58,8 @@ dependencies = [ ('double-conversion', '3.2.0'), ('Eigen', '3.4.0'), ('Qt5', '5.15.5'), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('OpenGL', '2022a'), ('Catalyst', '2.0.0-rc3'), ('ParaViewData', '5.11.0'), diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb index 112eec485..fe2372cac 100644 --- a/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb +++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-foss-2022a.eb @@ -57,7 +57,8 @@ dependencies = [ ('double-conversion', '3.2.0'), ('Eigen', '3.4.0'), ('Qt5', '5.15.5'), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('OpenGL', '2022a'), ('Catalyst', '2.0.0-rc3'), ('ParaViewData', '5.11.0'), diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb index 2c8ae0980..6c5683799 100644 --- a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb +++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a-EGL.eb @@ -58,7 +58,8 @@ dependencies = [ ('double-conversion', '3.2.0'), ('Eigen', '3.4.0'), ('Qt5', '5.15.5'), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('OpenGL', '2022a'), ('Catalyst', '2.0.0-rc3'), ('ParaViewData', '5.11.0'), diff --git a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb index 91b47e3d1..89f2cfcb7 100644 --- a/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb +++ b/Golden_Repo/p/ParaView/ParaView-5.11.0-gpsmkl-2022a.eb @@ -57,7 +57,8 @@ dependencies = [ ('double-conversion', '3.2.0'), ('Eigen', '3.4.0'), ('Qt5', '5.15.5'), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('matplotlib', '3.5.2', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('OpenGL', '2022a'), ('Catalyst', '2.0.0-rc3'), ('ParaViewData', '5.11.0'), diff --git a/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb b/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb index 34fbf0ab9..f86212993 100644 --- a/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb +++ b/Golden_Repo/v/VTK/VTK-9.2.5-GCCcore-11.3.0-nompi.eb @@ -33,7 +33,7 @@ builddependencies = [ dependencies = [ ('Python', '3.10.4'), ('HDF5', '1.12.2', '-serial'), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), # ('libxc', '5.2.3'), # not in GCCcore toolchain ('netCDF', '4.9.0', '-serial'), ('X11', '20220504'), diff --git a/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb b/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb index 8b48eb2a3..9336ae0dc 100644 --- a/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb +++ b/Golden_Repo/v/VTK/VTK-9.2.5-foss-2022a.eb @@ -32,7 +32,7 @@ builddependencies = [ dependencies = [ ('Python', '3.10.4'), ('HDF5', '1.12.2',), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('mpi4py', '3.1.4'), ('libxc', '5.2.3'), ('netCDF', '4.9.0',), diff --git a/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb b/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb index 801c5d4ff..32a8a375c 100644 --- a/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb +++ b/Golden_Repo/v/VTK/VTK-9.2.5-gpsmkl-2022a.eb @@ -33,7 +33,7 @@ builddependencies = [ dependencies = [ ('Python', '3.10.4'), ('HDF5', '1.12.2',), - ('SciPy-Stack', '2022a', '', ('gcccoremkl', '11.3.0-2022.1.0')), + ('SciPy-bundle', '2022.05', '', ('gcccoremkl', '11.3.0-2022.1.0')), ('mpi4py', '3.1.4'), ('libxc', '5.2.3'), ('netCDF', '4.9.0',), -- GitLab