SHA256
6
0
forked from pool/mpibash

Update to v1.5 #1

Merged
NMorey merged 1 commits from :main into main 2025-10-28 10:31:42 +01:00
6 changed files with 19 additions and 83 deletions

View File

@@ -1,49 +0,0 @@
commit 4ae8e1670ea5495275bcf873cb2513302e56702a
Author: Scott Pakin <pakin@lanl.gov>
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;
}

View File

@@ -1,21 +0,0 @@
commit 16a19ee4c568047fb03581b23b4fcb273a615474
Author: Scott Pakin <pakin@lanl.gov>
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);

View File

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

BIN
mpibash-1.5.tar.gz LFS Normal file

Binary file not shown.

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Oct 28 08:30:56 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
- 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 <nicolas.morey@suse.com>

View File

@@ -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