From 8f8bd559c88b80f4ceff14f32b68330e96da01b6 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Mon, 25 Aug 2025 09:37:23 -0600 Subject: [PATCH] sessions: oops, we made up a function Turns out that in commit 6bd36a78716 we had a function that is not part of the MPI standard. This showed while working on ABI support - which requires us to pay attention to the truth rather than make stuff up. This commit removes our made up MPI_Session_set_info method. Turns out who ever was doing the fortran bindings knew this wasn't a method in the standard so there's no need to change the fortran bindings. Same thing applies to the man pages. Related to #13280 Signed-off-by: Howard Pritchard --- ompi/include/mpi.h.in | 2 -- ompi/mpi/c/Makefile.am | 1 - ompi/mpi/c/session_set_info.c.in | 46 -------------------------------- 3 files changed, 49 deletions(-) delete mode 100644 ompi/mpi/c/session_set_info.c.in diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in index 042618cd478..8737818b653 100644 --- a/ompi/include/mpi.h.in +++ b/ompi/include/mpi.h.in @@ -2350,7 +2350,6 @@ OMPI_DECLSPEC int MPI_Session_init (MPI_Info info, MPI_Errhandler errhandler, MPI_Session *session); OMPI_DECLSPEC MPI_Session MPI_Session_f2c (MPI_Fint session); OMPI_DECLSPEC int MPI_Session_set_errhandler(MPI_Session session, MPI_Errhandler errhandler); -OMPI_DECLSPEC int MPI_Session_set_info (MPI_Session session, MPI_Info info); OMPI_DECLSPEC int MPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request *request); @@ -3501,7 +3500,6 @@ OMPI_DECLSPEC int PMPI_Session_init (MPI_Info info, MPI_Errhandler errhandler, MPI_Session *session); OMPI_DECLSPEC MPI_Session PMPI_Session_f2c (MPI_Fint session); OMPI_DECLSPEC int PMPI_Session_set_errhandler(MPI_Session session, MPI_Errhandler errhandler); -OMPI_DECLSPEC int PMPI_Session_set_info (MPI_Session session, MPI_Info info); OMPI_DECLSPEC int PMPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request *request); diff --git a/ompi/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am index c8fad462772..66b9fe527f1 100644 --- a/ompi/mpi/c/Makefile.am +++ b/ompi/mpi/c/Makefile.am @@ -372,7 +372,6 @@ prototype_sources = \ session_get_pset_info.c.in \ session_init.c.in \ session_set_errhandler.c.in \ - session_set_info.c.in \ ssend.c.in \ ssend_init.c.in \ startall.c.in \ diff --git a/ompi/mpi/c/session_set_info.c.in b/ompi/mpi/c/session_set_info.c.in deleted file mode 100644 index ba974b2f402..00000000000 --- a/ompi/mpi/c/session_set_info.c.in +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ -/* - * Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science - * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. - * Copyright (c) 2018-2024 Triad National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "ompi_config.h" - -#include "ompi/mpi/c/bindings.h" -#include "ompi/runtime/params.h" -#include "ompi/instance/instance.h" -#include "ompi/errhandler/errhandler.h" -#include "opal/util/info_subscriber.h" -#include -#include - -PROTOTYPE ERROR_CLASS session_set_info (SESSION session, INFO info) -{ - if (MPI_PARAM_CHECK) { - OMPI_ERR_INIT_FINALIZE(FUNC_NAME); - if (ompi_instance_invalid(session)) { - if (NULL != session) { - return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_SESSION, FUNC_NAME); - } else { - return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_SESSION, FUNC_NAME); - } - - } - if (NULL == info || MPI_INFO_NULL == info || ompi_info_is_freed(info)) { - return OMPI_ERRHANDLER_INVOKE (session, MPI_ERR_INFO, FUNC_NAME); - } - } - - opal_infosubscribe_change_info (&session->super, &info->super); - - return MPI_SUCCESS; -}