Accepting request 1321401 from science

OBS-URL: https://build.opensuse.org/request/show/1321401
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/adios2?expand=0&rev=12

ADIOS2-2.10.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14cf0bcd94772194bce0f2c0e74dba187965d1cffd12d45f801c32929158579e
-size 7234057

ADIOS2-2.11.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a2bd745e3f39745f07587e4a5f92d72f12fa0e2be305e7957bdceda03735dbf
+size 7819195

_multibuild

@@ -1,4 +1,5 @@
 <multibuild>
+  <package>minimal</package>
   <package>mpich</package>
   <package>mvapich2</package>
   <package>openmpi4</package>

adios2-rpmlintrc

@@ -1,5 +1,2 @@
 # Changing this is complicated as ADIOS2 is multi-platform
 addFilter("adios2.* binary-or-shlib-calls-gethostbyname")
-
-# We need this as ADIOS2 is a distributed framework
-addFilter("adios2.* shared-lib-calls-exit")

adios2.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Fri Dec 05 00:00:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com> - 2.11.0
+
+- Added ADIOS2 v2.11.0:
+  * Support for reader-side computed variables with expression evaluation.
+  * Remote Data Access Infrastructure using XRootD.
+  * GPU and Memory Space Improvements.
+  * Campaign Management System Overhaul.
+  * Compression and Data Format Advances.
+  * ADIOS2 now adopts OpenSSF best practices.
+  * Release notes: https://github.com/ornladios/ADIOS2/releases/tag/v2.11.0
+- Dropped patch: missing_includes_for_gcc15.patch
+
+-------------------------------------------------------------------
+Tue Jun 24 00:00:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com>
+
+- Added conflict between minimal and canonical flavor.
+- Added extra description for minimal packages.
+- Do not own the corresponding python libdir when not MPI.
+- Make blosc2 dependency conditional on Leap 15.6+ only.
+- Typo fix for hdf5 dep
+
+-------------------------------------------------------------------
+Tue Jun 10 17:06:06 UTC 2025 - Martin Jambor <mjambor@suse.com>
+
+- Add missing_includes_for_gcc15.patch to allow building with GCC
+  15. [boo#1244421]
+
+-------------------------------------------------------------------
+Thu Jan  9 00:00:00 UTC 2025 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com>
+- Added Python subpackage.
+- Added minimal flavor.
+- Added HDF5, ZeroMQ, ZFP, BLOSC2, and LibPNG support in
+  no-minimal flavors.
+
 -------------------------------------------------------------------
 Fri Dec  6 00:00:00 UTC 2024 - Vicente Adolfo Bolea Sanchez <vicente.bolea@gmail.com> - 2.10.2
 

adios2.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package adios2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,8 +18,8 @@
 
 %define flavor @BUILD_FLAVOR@%{nil}
 %define major_ver 2
-%define minor_ver 10
-%define patch_ver 2
+%define minor_ver 11
+%define patch_ver 0
 # Name the suffix of the pkg
 %if "%{flavor}" != "%{nil}"
   %define pkg_suffix -%{flavor}
@@ -27,20 +27,35 @@
 %if "%{flavor}" == "mpich"
 %global mpi_flavor mpich
 %global mpi_family mpich
+%bcond_with hdf5
 %endif
 %if "%{flavor}" == "mvapich2"
 %global mpi_flavor mvapich2
 %global mpi_family mvapich2
+%bcond_without hdf5
 %endif
 %if "%{flavor}" == "openmpi4"
 %global mpi_flavor openmpi4
 %global mpi_family openmpi
 %global mpi_ver 4
+%bcond_without hdf5
 %endif
 %if "%{flavor}" == "openmpi5"
 %global mpi_flavor openmpi5
 %global mpi_family openmpi
 %global mpi_ver 5
+%bcond_without hdf5
+%endif
+%if "%{flavor}" == "minimal"
+%bcond_with extended_deps
+%bcond_with python
+%else
+%bcond_without extended_deps
+%if 0%{?suse_version} <= 1500
+%bcond_with python
+%else
+%bcond_without python
+%endif
 %endif
 
 # Paths  ----------------------------------------------------------------------
@@ -54,6 +69,8 @@
 %define pkg_incdir  %{pkg_prefix}/include/
 %define pkg_datadir %{pkg_prefix}/share/
 %define shlib       libadios2%{?pkg_suffix}-%{major_ver}_%{minor_ver}
+%define pylib       python3-adios2%{?pkg_suffix}
+
 # Header ----------------------------------------------------------------------
 Name:           adios2%{?pkg_suffix}
 Version:        %{major_ver}.%{minor_ver}.%{patch_ver}
@@ -64,6 +81,8 @@ Group:          Productivity/Scientific/Other
 URL:            https://adios2.readthedocs.io/en/
 Source0:        https://github.com/ornladios/ADIOS2/archive/refs/tags/v%{version}.tar.gz#/ADIOS2-%{version}.tar.gz
 Source1:        adios2-rpmlintrc
+# PATCH-FIX-UPSTREAM boo#1244421
+ExcludeArch:    %{ix86}
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -71,12 +90,35 @@ BuildRequires:  gcc-fortran
 BuildRequires:  libbz2-devel
 BuildRequires:  libffi-devel
 BuildRequires:  liblz4-devel
+BuildRequires:  libzstd-devel
 BuildRequires:  ninja
+BuildRequires:  python-rpm-macros
 BuildRequires:  zlib-devel
-ExcludeArch:    %{ix86}
+%if "%{flavor}" == "minimal"
+Conflicts:      adios2
+%endif
 # mpi4py pkg (Not MPI-4)
 %if %{with mpi}
 BuildRequires:  %{mpi_flavor}-devel
+Requires:       %{mpi_flavor}
+%endif
+%if %{with extended_deps}
+%if 0%{?sle_version} == 150600
+BuildRequires:  blosc2-devel
+%endif
+BuildRequires:  libpng16-devel
+BuildRequires:  zeromq-devel
+BuildRequires:  zfp-devel
+%if %{with hdf5}
+BuildRequires:  hdf5%{?mpi_flavor:-%{mpi_flavor}}-devel
+%endif
+%if %{with python}
+BuildRequires:  python3-devel
+BuildRequires:  python3-numpy-devel
+%if %{with mpi}
+BuildRequires:  python3-mpi4py-devel
+%endif
+%endif
 %endif
 
 %description
@@ -91,11 +133,19 @@ environments.
 This package contains all files needed to run projects that depends on the
 %{?mpi_flavor}%{!?mpi_flavor:serial} version of ADIOS2.
 
+%if "%{flavor}" == "minimal"
+This package is the minimal version of ADIOS2, it does not include the extended
+dependencies like HDF5, ZFP, Blosc2, PNG, and ZeroMQ.
+%endif
+
 %package -n %{shlib}
+%{?mpi_flavor:Requires:       %{mpi_flavor}}
 Summary:        The Adaptable IO System (ADIOS2) run-time libraries
 Group:          System/Libraries
 Provides:       %{name} = %{version}
-%{?mpi_flavor:Requires:       %{mpi_flavor}}
+%if "%{flavor}" == "minimal"
+Conflicts:      libadios2-%{major_ver}_%{minor_ver}
+%endif
 
 %description -n %{shlib}
 ADIOS2: The Adaptable Input Output (I/O) System version 2  is an open-source
@@ -103,15 +153,67 @@ framework that addresses scientific data management challenges.
 
 This package provides the shared libraries for ADIOS2.
 
+%if "%{flavor}" == "minimal"
+This package is the minimal version of ADIOS2, it does not include the extended
+dependencies like HDF5, ZFP, Blosc2, PNG, and ZeroMQ.
+%endif
+
+%if %{with python}
+%package -n %{pylib}
+Summary:        The Adaptable IO System (ADIOS2) python libraries
+Group:          System/Libraries
+Requires:       python3-numpy
+%if "%{flavor}" == "minimal"
+Conflicts:      python3-adios2
+%endif
+
+%description -n %{pylib}
+ADIOS2: The Adaptable Input Output (I/O) System version 2  is an open-source
+framework that addresses scientific data management challenges.
+
+This package provides the python libraries for ADIOS2.
+
+%if "%{flavor}" == "minimal"
+This package is the minimal version of ADIOS2, it does not include the extended
+dependencies like HDF5, ZFP, Blosc2, PNG, and ZeroMQ.
+%endif
+
+%endif
+
 %package devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries/Parallel
 Requires:       %{shlib} = %{version}
+Requires:       libbz2-devel
+Requires:       libffi-devel
+Requires:       liblz4-devel
+Requires:       libzstd-devel
+Requires:       zlib-devel
 Conflicts:      adios%{?pkg_suffix}
-%if 0%{?with_hdf5}
-BuildRequires:  hdf5%{?mpi_flavor:-%{mpi_flavor}}-devel
+%if "%{flavor}" == "minimal"
+Conflicts:      adios2-devel
+%endif
+%if %{with mpi}
+Requires:       %{mpi_flavor}-devel
+%endif
+%if %{with extended_deps}
+%if 0%{?sle_version} == 150600
+Requires:       blosc2-devel
+%endif
+Requires:       libpng16-devel
+Requires:       zeromq-devel
+Requires:       zfp-devel
+%if %{with hdf5}
 Requires:       hdf5%{?mpi_flavor:-%{mpi_flavor}}-devel
 %endif
+%if %{with python}
+Requires:       python3-devel
+Requires:       python3-numpy-devel
+%if %{with mpi}
+Requires:       python3-mpi4py-devel
+%endif
+%endif
+%endif
 
 %description devel
 ADIOS2: The Adaptable Input Output (I/O) System version 2  is an open-source
@@ -120,12 +222,18 @@ framework that addresses scientific data management challenges.
 This package contains all files needed to create projects that use the
 %{?mpi_flavor}%{!?mpi_flavor:serial} version of ADIOS2.
 
+%if "%{flavor}" == "minimal"
+This package is the minimal version of ADIOS2, it does not include the extended
+dependencies like HDF5, ZFP, Blosc2, PNG, and ZeroMQ.
+%endif
+
 %prep
 %autosetup -p1 -n ADIOS2-%{version}
-bindir=%{_bindir} sed -i "1c #!${bindir}/python3" \
+bindir=%{_bindir} sed -i "1c #!%{_bindir}/python3" \
+      source/utils/adios2_json_pp.py \
       source/utils/bp4dbg/bp4dbg.py \
       source/utils/bp5dbg/bp5dbg.py \
-      source/utils/adios2_json_pp.py
+      source/utils/bpcmp/bpcmp.py
 
 %build
 %global __builder ninja
@@ -141,15 +249,26 @@ source %{pkg_prefix}/bin/mpivars.sh
     -DADIOS2_USE_BP5=ON \
     -DADIOS2_USE_BZip2=ON \
     -DADIOS2_USE_Fortran=ON \
-    -DADIOS2_USE_HDF5=%{?with_hdf5:ON}%{!?with_hdf5:OFF} \
-    -DADIOS2_USE_MGARD=OFF \
+%if %{with extended_deps}
+%if %{with hdf5}
+    -DADIOS2_USE_HDF5=ON \
+%endif
+    -DADIOS2_USE_ZFP=ON \
+%if 0%{?sle_version} == 150600
+    -DADIOS2_USE_Blosc2=ON \
+%endif
+    -DADIOS2_USE_ZeroMQ=ON \
+    -DADIOS2_USE_PNG=ON \
+%endif
+    -DADIOS2_USE_Python=%{?with_python:ON}%{!?with_python:OFF} \
     -DADIOS2_USE_MPI=%{?with_mpi:ON}%{!?with_mpi:OFF} \
     -DADIOS2_USE_Profiling=OFF \
-    -DADIOS2_USE_Python=OFF \
     -DBUILD_TESTING=OFF \
     -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \
     -DCMAKE_INSTALL_PREFIX=%{pkg_prefix} \
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+    -Wno-dev \
+    %{nil}
 %cmake_build
 
 %install
@@ -164,6 +283,17 @@ source %{pkg_prefix}/bin/mpivars.sh
 %{pkg_libdir}/*.so.*
 %{pkg_libdir}/adios2-evpath-modules-%{major_ver}_%{minor_ver}
 
+%if %{with python}
+%files -n %{pylib}
+%if %{with mpi}
+# No other package owns these dirs, we need to own them.
+%dir %{pkg_libdir}/python%{python3_version}
+%dir %{pkg_libdir}/python%{python3_version}/site-packages/
+%endif
+
+%{pkg_libdir}/python%{python3_version}/site-packages/adios2
+%endif
+
 %files devel
 %doc Contributing.md ReadMe.md
 %{pkg_bindir}/*