diff --git a/Fix-type-mismatch-error.patch b/Fix-type-mismatch-error.patch new file mode 100644 index 0000000..c1e93af --- /dev/null +++ b/Fix-type-mismatch-error.patch @@ -0,0 +1,30 @@ +commit fc4fb3a80615992277717e3e29ce585ebe1f2256 +Author: Tomislav Janjusic +Date: Tue Feb 18 12:25:27 2025 -0600 + + Fix type mismatch error + + Signed-off-by: Tomislav Janjusic + +diff --git oshmem/mca/sshmem/base/sshmem_base_open.c oshmem/mca/sshmem/base/sshmem_base_open.c +index 1f0d1eb761e2..2694120e1cfe 100644 +--- oshmem/mca/sshmem/base/sshmem_base_open.c ++++ oshmem/mca/sshmem/base/sshmem_base_open.c +@@ -31,7 +31,7 @@ + * globals + */ + +-void *mca_sshmem_base_start_address = UINTPTR_MAX; ++void *mca_sshmem_base_start_address = (void *)UINTPTR_MAX; + + char * mca_sshmem_base_backing_file_dir = NULL; + +@@ -49,7 +49,7 @@ mca_sshmem_base_register (mca_base_register_flag_t flags) + "base", + "start_address", + "Specify base address for shared memory region", +- MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG, ++ MCA_BASE_VAR_TYPE_UNSIGNED_LONG, + NULL, + 0, + MCA_BASE_VAR_FLAG_SETTABLE, diff --git a/_service b/_service deleted file mode 100644 index 2c26ca7..0000000 --- a/_service +++ /dev/null @@ -1,17 +0,0 @@ - - - git - https://github.com/open-mpi/ompi.git - no - .git - openmpi - @PARENT_TAG@.@TAG_OFFSET@.%h - v(.*) - \1 - 8a5c2ef25dc8e4528f0d3fd2ec91a6578160af95 - - - openmpi*.tar - bz2 - - diff --git a/openmpi-5.0.6.0.8a5c2ef25dc8.tar.bz2 b/openmpi-5.0.6.0.8a5c2ef25dc8.tar.bz2 deleted file mode 100644 index d4a37f7..0000000 --- a/openmpi-5.0.6.0.8a5c2ef25dc8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b9bb3fdcbc7d5f66f470d8583ca210278d5b0e9c4e25fa6361d678ea8225f55 -size 16244366 diff --git a/openmpi-5.0.7.tar.bz2 b/openmpi-5.0.7.tar.bz2 new file mode 100644 index 0000000..a52b6a3 --- /dev/null +++ b/openmpi-5.0.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:119f2009936a403334d0df3c0d74d5595a32d99497f9b1d41e90019fee2fc2dd +size 30506871 diff --git a/openmpi5.changes b/openmpi5.changes index bd9ffbf..3ac6a62 100644 --- a/openmpi5.changes +++ b/openmpi5.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Feb 19 15:57:56 UTC 2025 - Nicolas Morey + +- Update to 5.0.7 (jsc#PED-11356): + - Updated UCX version requirement to v1.9 + - Documentation Improvements + - Updated `coll tuned` rules file documentation to reflect changes in versioning and features. + - Updated CUDA-related networking documentation for consistency. + - Improved descriptions for `mpirun` options, including ``--pmixmca`` and ``--prtemca``. + - Fixed typos and formatting issues in `mpirun` man pages. + - Functionality Enhancements + - Improved argument checking for ``MPI_Comm_create_from_group`` and ``MPI_Intercomm_create_from_groups`` to align with MPI 4.0 standards. + - Addressed potential race conditions in `PMIx_Group_construct` calls by adding discriminators. + - Fixed ``MPI_Wtime`` to initialize timing relative to ``MPI_Init`` for accurate session-level measurements. + - Added support for the `alltoall_algorithm_max_requests` parameter in the `coll tuned` rules file, maintaining backward compatibility. + - Introduced a version identifier for the `coll tuned` rules file for better parser handling. + - Adjusted MCA variable scopes across multiple components to allow setting via the `MPI_T` interface: `coll adapt,ucc, han, basic, hcoll` + - Bug Fixes and Minor Enhancements + - Ensures that singletons properly create their own sessions directory trees. + - Fixed community Jenkins build pipeline to handle branch commits properly. + - Resolved missing profiling symbols in the `mpi_f08` Fortran library. + - Corrected parameter mismatches in `coll/cuda` functions to avoid type issues. + - Fixed build issues on Hurd. + - Removed unused portions of rcache base structure. + - Fixed oshmem base segment address exchange. + - Fixed UCC collective fallback issue. + - Updated Nvidia/Mellanox platform file +- openMPI 5 is now the default openmpi for suse_version >= 1600 +- Switch to dist tarball to drop Sphinx and other python dependencies +- Add Fix-type-mismatch-error.patch to fix a compilation error + ------------------------------------------------------------------- Fri Dec 20 11:50:25 UTC 2024 - Nicolas Morey diff --git a/openmpi5.spec b/openmpi5.spec index 4f21589..f5e5e26 100644 --- a/openmpi5.spec +++ b/openmpi5.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana # University Research and Technology # Corporation. All rights reserved. @@ -42,7 +42,7 @@ # % define build_static_devel 1 %define pname openmpi -%define _vers 5_0_6 +%define _vers 5_0_7 %define m_f_ver 5 %bcond_with ringdisabled @@ -102,7 +102,12 @@ ExclusiveArch: do_not_build %endif %endif +# Detect whether we are the default openMPI implemantation or not +%if "%{flavor}" == "standard" && (%{suse_version} >= 1600) +%define default_openmpi 1 +%else %define default_openmpi 0 +%endif %if %{with hpc} %{!?compiler_family:%global compiler_family gnu} @@ -113,8 +118,6 @@ ExclusiveArch: do_not_build %global hpc_openmpi_pack_version %{hpc_openmpi_dep_version} %endif -%define git_ver .0.8a5c2ef25dc8 - ############################################################################# # # Preamble Section @@ -122,19 +125,20 @@ ExclusiveArch: do_not_build ############################################################################# Name: %{package_name}%{?testsuite:-testsuite} -Version: 5.0.6 +Version: 5.0.7 Release: 0 Summary: An implementation of MPI/SHMEM (Version %{m_f_ver}) License: BSD-3-Clause Group: Development/Libraries/Parallel URL: http://www.open-mpi.org/ -Source0: openmpi-%{version}%{git_ver}.tar.bz2 +Source0: https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-%{version}.tar.bz2 Source2: openmpi5-rpmlintrc Source3: macros.hpc-openmpi Source4: mpivars.sh Source5: mpivars.csh Patch1: romio341-backport-fixes-from-mpich.patch Patch2: mtl-ofi-fix-missing-definition-of-container_of.patch +Patch3: Fix-type-mismatch-error.patch Provides: mpi BuildRoot: %{_tmppath}/%{name}-%{version}-build # Exclude 32b archs @@ -151,8 +155,6 @@ BuildRequires: libtool # net-tools is required to run hostname BuildRequires: net-tools BuildRequires: python3 -BuildRequires: python3-Sphinx >= 4.2.0 -BuildRequires: python3-recommonmark %if 0%{?testsuite} BuildArch: noarch BuildRequires: %{package_name} = %{version} @@ -401,7 +403,7 @@ echo with HPC %if %{without hpc} echo without HPC %endif -%autosetup -p0 -n openmpi-%{version}%{git_ver} +%autosetup -p0 -n openmpi-%{version} # Live patch the VERSION file sed -i -e 's/^greek=.*$/greek=%{git_ver}/' -e 's/^repo_rev=.*$/repo_rev=%{version}%{git_ver}/' \ @@ -426,8 +428,6 @@ export HOSTNAME=OBS # configure: error: Please remove this directive and re-run configure. %global _lto_cflags %{nil} %{?with_hpc:%hpc_debug} -# Remove .gitmodules so autogen.pl does not try to run git commands -find . -name .gitmodules -delete ./autogen.pl --force --no-3rdparty libevent,hwloc %if %{with hpc} %{hpc_setup}