From 60b010d1f1a37f6f7da260676c976f7859dc864cbd6e7acb06974d0aa64a03ff Mon Sep 17 00:00:00 2001 From: Nicolas Morey Date: Tue, 28 Oct 2025 09:32:04 +0100 Subject: [PATCH] Update to v1.5 Signed-off-by: Nicolas Morey --- ...hey-can-be-compared-without-warnings.patch | 49 ------------------- ...t-with-newer-MPI_Comm_set_errhandler.patch | 21 -------- mpibash-1.3.tar.gz | 3 -- mpibash-1.5.tar.gz | 3 ++ mpibash.changes | 10 ++++ mpibash.spec | 16 +++--- 6 files changed, 19 insertions(+), 83 deletions(-) delete mode 100644 Cast-function-pointer-types-so-they-can-be-compared-without-warnings.patch delete mode 100644 Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch delete mode 100644 mpibash-1.3.tar.gz create mode 100644 mpibash-1.5.tar.gz diff --git a/Cast-function-pointer-types-so-they-can-be-compared-without-warnings.patch b/Cast-function-pointer-types-so-they-can-be-compared-without-warnings.patch deleted file mode 100644 index e78e1b8..0000000 --- a/Cast-function-pointer-types-so-they-can-be-compared-without-warnings.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit 4ae8e1670ea5495275bcf873cb2513302e56702a -Author: Scott Pakin -Date: Wed Feb 19 13:38:08 2020 -0700 - - Cast function pointer types so they can be compared without warnings - -diff --git src/coll.c src/coll.c -index 0ee5964fdd6a..890896a20b72 100644 ---- src/coll.c -+++ src/coll.c -@@ -122,7 +122,7 @@ static char *mpi_bcast_doc[] = { - DEFINE_BUILTIN(mpi_bcast, "mpi_bcast [message] name"); - - /* Define a reduction-type function (allreduce, scan, exscan, etc.). */ --typedef int (*reduction_func_t)(void *, void *, int, MPI_Datatype, MPI_Op, MPI_Comm); -+typedef int (*reduction_func_t)(const void *, void *, int, MPI_Datatype, MPI_Op, MPI_Comm); - - /* Parse an operation name into an MPI_Op. Return 1 on success, 0 on - * failure. */ -@@ -213,25 +213,25 @@ reduction_like (WORD_LIST *list, char *funcname, reduction_func_t func) - /* Parse the target variable, which must not be read-only. */ - YES_ARGS(list); - varname = list->word->word; -- if (mpibash_rank != 0 || func != MPI_Exscan) -+ if (mpibash_rank != 0 || (void *)func != (void *)MPI_Exscan) - REQUIRE_WRITABLE(varname); - list = list->next; - no_args(list); - - /* Perform the reduction operation. Bind the given array variable - * to the result and, for minloc/maxloc, the associated rank. */ -- if (mpibash_rank != 0 || func != MPI_Exscan) { -+ if (mpibash_rank != 0 || (void *)func != (void *)MPI_Exscan) { - bind_array_variable(varname, 0, "", 0); - bind_array_variable(varname, 1, "", 0); - } - if (operation == MPI_MINLOC || operation == MPI_MAXLOC) { - MPI_TRY(func(&number, &result, 1, MPI_LONG_INT, operation, MPI_COMM_WORLD)); -- if (mpibash_rank != 0 || func != MPI_Exscan) -+ if (mpibash_rank != 0 || (void *)func != (void *)MPI_Exscan) - mpibash_bind_array_variable_number(varname, 1, result.rank, 0); - } - else - MPI_TRY(func(&number.value, &result.value, 1, MPI_LONG, operation, MPI_COMM_WORLD)); -- if (mpibash_rank != 0 || func != MPI_Exscan) -+ if (mpibash_rank != 0 || (void *)func != (void *)MPI_Exscan) - mpibash_bind_array_variable_number(varname, 0, result.value, 0); - return EXECUTION_SUCCESS; - } diff --git a/Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch b/Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch deleted file mode 100644 index 7e992a2..0000000 --- a/Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 16a19ee4c568047fb03581b23b4fcb273a615474 -Author: Scott Pakin -Date: Wed Feb 19 13:43:40 2020 -0700 - - Replace deprecated MPI_Errhandler_set with newer MPI_Comm_set_errhandler - - Resolves #17. - -diff --git src/init.c src/init.c -index cd070a785c41..46b1127e538d 100644 ---- src/init.c -+++ src/init.c -@@ -77,7 +77,7 @@ mpi_init_builtin (WORD_LIST *list) - - /* Make MPI errors return instead of crash. Also, store our rank - * and number of ranks. */ -- MPI_Errhandler_set (MPI_COMM_WORLD, MPI_ERRORS_RETURN); -+ MPI_Comm_set_errhandler (MPI_COMM_WORLD, MPI_ERRORS_RETURN); - MPI_Comm_rank (MPI_COMM_WORLD, &mpibash_rank); - MPI_Comm_size (MPI_COMM_WORLD, &mpibash_num_ranks); - diff --git a/mpibash-1.3.tar.gz b/mpibash-1.3.tar.gz deleted file mode 100644 index 138d746..0000000 --- a/mpibash-1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab39dcc0eadce765abaf685e73d38f4351e3229fdb4302aee4b9e6e70d431d99 -size 369803 diff --git a/mpibash-1.5.tar.gz b/mpibash-1.5.tar.gz new file mode 100644 index 0000000..dadae6b --- /dev/null +++ b/mpibash-1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4568ebec5332ef686d9a8a456169ba22b5a8c18027fa9a14b13c9b4cc447dc3 +size 378098 diff --git a/mpibash.changes b/mpibash.changes index 2715a1b..5b7e2a7 100644 --- a/mpibash.changes +++ b/mpibash.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 28 08:30:56 UTC 2025 - Nicolas Morey + +- Update to v1.5 + - No release notes available. +- Drop patches merged upstream: + - Cast-function-pointer-types-so-they-can-be-compared-without-warnings.patch + - Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch +- Disable 32b builds as there is no more openmpi available + ------------------------------------------------------------------- Fri Jul 11 08:22:31 UTC 2025 - Nicolas Morey diff --git a/mpibash.spec b/mpibash.spec index 4e908ec..1dc37cf 100644 --- a/mpibash.spec +++ b/mpibash.spec @@ -1,4 +1,4 @@ -# + # spec file for package mpibash # # Copyright (c) 2025 SUSE LLC @@ -17,7 +17,7 @@ Name: mpibash -Version: 1.3 +Version: 1.5 Release: 0 Summary: Parallel scripting right from the Bourne-Again Shell License: GPL-3.0-or-later @@ -25,13 +25,14 @@ Group: Productivity/Networking/Other URL: https://github.com/lanl/MPI-Bash Source0: https://github.com/lanl/MPI-Bash/releases/download/v%{version}/mpibash-%{version}.tar.gz Source100: README.md -Patch0: Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch -Patch1: Cast-function-pointer-types-so-they-can-be-compared-without-warnings.patch -BuildRequires: bash-devel >= 4.4 +BuildRequires: bash-devel >= 5.2 BuildRequires: libcircle-devel BuildRequires: openmpi-macros-devel %openmpi_requires BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1600 +ExcludeArch: %ix86 %arm +%endif %description MPI-Bash makes it possible to parallelize Bash scripts which run a set of @@ -57,11 +58,6 @@ This package contains example scripts for mpibash. %build %setup_openmpi -# This is to avoid an issue with execute_shell_function which is declared in -# /usr/include/bash/execute_cmd.h but it does not exists for "older" bash -# versions. Once updatig to v1.4 (which will require this header), this flag should -# be dropped -export CFLAGS="-Wno-implicit-function-declaration" %if 0%{?suse_version} > 1500 export CFLAGS="-std=gnu17 $CFLAGS" %endif -- 2.51.1