From 394283eef099696566340d4986c85e8ef1219c9d Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 13 Nov 2024 19:29:36 -0700 Subject: [PATCH 1/2] Register the singleton's nspace with the PMIx server Once we have created the necessary PRRTE infrastructure to support the singleton, we need to register that info with our internal PMIx server so it can be served to any requesting clients. Signed-off-by: Ralph Castain (cherry picked from commit 89fdffe9ea807d9de765f0e82506a297f109ba8c) --- src/tools/prte/prte.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tools/prte/prte.c b/src/tools/prte/prte.c index eba79a3775..b829e03e37 100644 --- a/src/tools/prte/prte.c +++ b/src/tools/prte/prte.c @@ -104,6 +104,7 @@ #include "src/runtime/runtime.h" #include "include/prte.h" +#include "src/prted/pmix/pmix_server.h" #include "src/prted/pmix/pmix_server_internal.h" #include "src/prted/prted.h" @@ -1435,7 +1436,10 @@ static int prep_singleton(const char *name) node->num_procs = 1; node->slots_inuse = 1; - return PRTE_SUCCESS; + // register the info with our PMIx server + rc = prte_pmix_server_register_nspace(jdata); + + return rc; } static void signal_forward_callback(int signum, short args, void *cbdata) From a55b7e9eb6ab91abcb442af4bf215d29f6fa5c73 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 18 Nov 2024 11:19:34 -0700 Subject: [PATCH 2/2] Fix data type declaration in data server The ninfo variable is used as a size_t, so declare it as such. Signed-off-by: Ralph Castain (cherry picked from commit 0bfee1d11c760f5e6f9ac2f20ef98c0adebce732) --- src/runtime/prte_data_server.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/runtime/prte_data_server.c b/src/runtime/prte_data_server.c index 7393d3dd23..32db96e877 100644 --- a/src/runtime/prte_data_server.c +++ b/src/runtime/prte_data_server.c @@ -15,7 +15,7 @@ * Copyright (c) 2015-2020 Intel, Inc. All rights reserved. * Copyright (c) 2017-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2021-2022 Nanook Consulting. All rights reserved. + * Copyright (c) 2021-2024 Nanook Consulting All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -182,7 +182,8 @@ void prte_data_server(int status, pmix_proc_t *sender, prte_data_object_t *data; pmix_data_buffer_t *answer, *reply; int rc, k; - uint32_t ninfo, i; + size_t ninfo; + uint32_t i; char **keys = NULL, *str; bool wait = false; int room_number;