From cd5dd02445e4f53823588ebe556abd78b03d5fe1d26bfd2e9598d5901bdf5438 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 2 Apr 2025 13:55:07 +0000 Subject: [PATCH] Accepting request 1266181 from home:NMorey:branches:science:HPC - Disable and remove support of gnu-hpc build flavours (bsc#1239982) Hopefully this answers your comment from the previous SR. Also, Egbert has agreed to move forward with the drop. OBS-URL: https://build.opensuse.org/request/show/1266181 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=184 --- _multibuild | 3 - python-numpy.changes | 5 ++ python-numpy.spec | 187 ++----------------------------------------- 3 files changed, 12 insertions(+), 183 deletions(-) delete mode 100644 _multibuild diff --git a/_multibuild b/_multibuild deleted file mode 100644 index 1486389..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - gnu-hpc - diff --git a/python-numpy.changes b/python-numpy.changes index 62cae4a..ea1a969 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 24 16:06:08 UTC 2025 - Nicolas Morey + +- Disable and remove support of gnu-hpc build flavours (bsc#1239982) + ------------------------------------------------------------------- Mon Feb 24 16:32:10 UTC 2025 - Markéta Machová diff --git a/python-numpy.spec b/python-numpy.spec index 5780e31..1366dbf 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -16,30 +16,8 @@ # -%global flavor @BUILD_FLAVOR@%{nil} -%define ver 2.2.2 -%define _ver 2_2_2 -%define pname python-numpy %define plainpython python -%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') -%if "%{flavor}" == "" - %bcond_with hpc - %bcond_with openblas -%endif -%if "%{flavor}" == "gnu-hpc" - %bcond_without hpc -%endif -%if "%{flavor}" == "gnu7-hpc" - %define c_f_ver 7 - %bcond_without hpc -%endif -%if %{with hpc} - %bcond_without openblas -%endif -%if 0%{?sle_version} == 120300 -%{?with_openblas:ExclusiveArch: do_not_build} -%endif -%{?with_hpc:%{hpc_requires}} + # %if 0%{?suse_version} > 1500 %bcond_without libalternatives @@ -49,30 +27,11 @@ %bcond_with cblas %endif # -%bcond_with ringdisabled -# -%if %{without hpc} -%define package_name %{pname} -%define p_python_sitearch %{python_sitearch} -%define p_prefix %{_prefix} -%define p_bindir %{_bindir} -%else -%{!?compiler_family:%global compiler_family gnu} -%{hpc_init -c %{compiler_family} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}}} -%define package_name %{hpc_package_name %{_ver}} -%define p_python_sitearch %{hpc_python_sitearch} -%define p_prefix %{hpc_prefix} -%define p_bindir %{hpc_bindir} -# Magic for OBS Staging. Only build the flavors required by -# other packages in the ring. -%if %{with ringdisabled} -ExclusiveArch: do_not_build -%endif -%endif %{?sle15_python_module_pythons} -Name: %{package_name} + +Name: python-numpy # set %%ver and %%_ver instead above -Version: %{ver} +Version: 2.2.2 Release: 0 Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause @@ -112,7 +71,6 @@ BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module typing-extensions >= 4.2.0} # /SECTION -%if %{without hpc} # Last version which packaged %%{_bindir}/f2py without update-alternatives Conflicts: %{plainpython}-numpy <= 1.12.0 %if 0%{?suse_version} @@ -120,9 +78,6 @@ BuildRequires: gcc-fortran %else BuildRequires: gcc-gfortran %endif -%if %{with openblas} -BuildRequires: openblas-devel > 0.3.20 -%else BuildRequires: blas-devel BuildRequires: lapack-devel %if %{with cblas} @@ -130,7 +85,6 @@ BuildRequires: lapack-devel BuildRequires: cblas-devel Recommends: libopenblas_pthreads0 %endif -%endif %if %{with libalternatives} BuildRequires: alts Requires: alts @@ -138,15 +92,6 @@ Requires: alts Requires(post): update-alternatives Requires(postun): update-alternatives %endif -%else -BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel -BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel -%ifnarch %ix86 %arm -BuildRequires: lua-lmod -%endif -BuildRequires: suse-hpc -Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc -%endif %python_subpackages %description @@ -161,33 +106,20 @@ interfacing with general-purpose data-base applications. There are also basic facilities for discrete fourier transform, basic linear algebra and random number generation. -%{?with_hpc:%{hpc_python_master_package -L -a }} - %package devel Summary: Development files for numpy applications Requires: %{name} = %{version} +Requires: blas-devel Requires: python-devel Requires: %plainpython(abi) = %{python_version} -%if %{without hpc} -%if %{with openblas} -Requires: openblas-devel -%else -Requires: blas-devel %if %{with cblas} Requires: cblas-devel %endif Requires: lapack-devel -%endif -%else -Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel -%{hpc_requires_devel} -%endif %description devel This package contains files for developing applications using numpy. -%{?with_hpc:%{hpc_python_master_package devel -a }} - %prep %autosetup -p1 -n numpy-%{version} # Fix non-executable scripts @@ -206,19 +138,7 @@ rm -f PKG-INFO %build export PYTHONDONTWRITEBYTECODE=1 %define _lto_cflags %{nil} -%if %{with hpc} -%hpc_setup -module load openblas -export CFLAGS="$(pkg-config --cflags openblas) %{optflags} -fno-strict-aliasing" LIBS="$(pkg-config --libs openblas)" -cat > site.cfg <