Skip to content

Commit

Permalink
Begin update of the mpich personlity
Browse files Browse the repository at this point in the history
Make it specific to mpich and not hydra so that PMIx knows
what programming model to use for the clients. Significant
work remains, but it will be done a little at a time.

Signed-off-by: Ralph Castain <rhc@pmix.org>
  • Loading branch information
rhc54 committed Nov 30, 2023
1 parent 4676a3c commit 5b7e09b
Show file tree
Hide file tree
Showing 8 changed files with 230 additions and 420 deletions.
File renamed without changes.
1 change: 1 addition & 0 deletions src/mca/schizo/mpich/.prte_unignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rhc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (c) 2015-2020 Intel, Inc. All rights reserved.
# Copyright (c) 2017 IBM Corporation. All rights reserved.
# Copyright (c) 2020 Cisco Systems, Inc. All rights reserved
# Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
# Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -14,28 +14,28 @@ AM_CFLAGS = \
-DDEFAULT_PARAM_FILE_PATH="\"@AMCA_PARAM_SETS_DIR@\""

sources = \
schizo_hydra_component.c \
schizo_hydra.h \
schizo_hydra.c
schizo_mpich_component.c \
schizo_mpich.h \
schizo_mpich.c

# Make the output library in this directory, and name it either
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# (for static builds).

if MCA_BUILD_prte_schizo_hydra_DSO
if MCA_BUILD_prte_schizo_mpich_DSO
component_noinst =
component_install = prte_mca_schizo_hydra.la
component_install = prte_mca_schizo_mpich.la
else
component_noinst = libprtemca_schizo_hydra.la
component_noinst = libprtemca_schizo_mpich.la
component_install =
endif

mcacomponentdir = $(prtelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
prte_mca_schizo_hydra_la_SOURCES = $(sources)
prte_mca_schizo_hydra_la_LDFLAGS = -module -avoid-version
prte_mca_schizo_hydra_la_LIBADD = $(top_builddir)/src/libprrte.la
prte_mca_schizo_mpich_la_SOURCES = $(sources)
prte_mca_schizo_mpich_la_LDFLAGS = -module -avoid-version
prte_mca_schizo_mpich_la_LIBADD = $(top_builddir)/src/libprrte.la

noinst_LTLIBRARIES = $(component_noinst)
libprtemca_schizo_hydra_la_SOURCES = $(sources)
libprtemca_schizo_hydra_la_LDFLAGS = -module -avoid-version
libprtemca_schizo_mpich_la_SOURCES = $(sources)
libprtemca_schizo_mpich_la_LDFLAGS = -module -avoid-version
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2019 Intel, Inc. All rights reserved.
# Copyright (c) 2022 Nanook Consulting. All rights reserved.
# Copyright (c) 2022-2023 Nanook Consulting. All rights reserved.
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates.
# All Rights reserved.
# $COPYRIGHT$
Expand All @@ -24,10 +24,10 @@
# $HEADER$
#

# MCA_schizo_hydra_CONFIG([action-if-found], [action-if-not-found])
# MCA_schizo_mpich_CONFIG([action-if-found], [action-if-not-found])
# -----------------------------------------------------------
AC_DEFUN([MCA_prte_schizo_hydra_CONFIG],[
AC_CONFIG_FILES([src/mca/schizo/hydra/Makefile])
AC_DEFUN([MCA_prte_schizo_mpich_CONFIG],[
AC_CONFIG_FILES([src/mca/schizo/mpich/Makefile])

AC_ARG_ENABLE([mpich-support],
[AS_HELP_STRING([--disable-mpich-support],
Expand Down
File renamed without changes.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/

#ifndef _MCA_SCHIZO_HYDRA_H_
#define _MCA_SCHIZO_HYDRA_H_
#ifndef _MCA_SCHIZO_MPICH_H_
#define _MCA_SCHIZO_MPICH_H_

#include "prte_config.h"

Expand All @@ -26,11 +26,11 @@ BEGIN_C_DECLS
typedef struct {
prte_schizo_base_component_t super;
int priority;
} prte_schizo_hydra_component_t;
} prte_schizo_mpich_component_t;

PRTE_MODULE_EXPORT extern prte_schizo_hydra_component_t prte_schizo_hydra_component;
extern prte_schizo_base_module_t prte_schizo_hydra_module;
PRTE_MODULE_EXPORT extern prte_schizo_mpich_component_t prte_mca_schizo_mpich_component;
extern prte_schizo_base_module_t prte_schizo_mpich_module;

END_C_DECLS

#endif /* MCA_SCHIZO_HYDRA_H_ */
#endif /* MCA_SCHIZO_MPICH_H_ */
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright (c) 2019 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2023 Nanook Consulting. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -21,34 +21,30 @@

#include "src/runtime/prte_globals.h"

#include "schizo_hydra.h"
#include "schizo_mpich.h"
#include "src/mca/schizo/schizo.h"

static int component_query(pmix_mca_base_module_t **module, int *priority);

/*
* Struct of function pointers and all that to let us be initialized
*/
prte_schizo_hydra_component_t prte_schizo_hydra_component = {
prte_schizo_mpich_component_t prte_mca_schizo_mpich_component = {
.super = {
.base_version = {
PRTE_MCA_SCHIZO_BASE_VERSION_1_0_0,
\.pmix_mca_component_name = "hydra",
PMIX_MCA_BASE_MAKE_VERSION(component, PRTE_MAJOR_VERSION, PRTE_MINOR_VERSION,
PMIX_RELEASE_VERSION),
.mca_query_component = component_query,
},
.base_data = {
/* The component is checkpoint ready */
PRTE_MCA_BASE_METADATA_PARAM_CHECKPOINT
},
PRTE_MCA_SCHIZO_BASE_VERSION_1_0_0,
.pmix_mca_component_name = "mpich",
PMIX_MCA_BASE_MAKE_VERSION(component,
PRTE_MAJOR_VERSION,
PRTE_MINOR_VERSION,
PMIX_RELEASE_VERSION),
.pmix_mca_query_component = component_query
},
.priority = 40
};

static int component_query(pmix_mca_base_module_t **module, int *priority)
{
*module = (pmix_mca_base_module_t *) &prte_schizo_hydra_module;
*priority = prte_schizo_hydra_component.priority;
*module = (pmix_mca_base_module_t *) &prte_schizo_mpich_module;
*priority = prte_mca_schizo_mpich_component.priority;
return PRTE_SUCCESS;
}

0 comments on commit 5b7e09b

Please sign in to comment.