Skip to content

Michael ayele prefixing prrte binaries #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
repository: openpmix/openpmix
path: openpmix/master
ref: master
fetch-depth: 0
- name: Build OpenPMIx
run: |
cd openpmix/master
Expand All @@ -28,6 +29,7 @@ jobs:
# configure.
libevent_cppflags=$(pkg-config libevent --cflags)
libevent_ldflags=$(pkg-config libevent --libs | perl -pe 's/^.*(-L[^ ]+).*$/\1/')
git checkout 08e41ed5
./autogen.pl
./configure --prefix=$RUNNER_TEMP/pmixinstall \
CPPFLAGS=$libevent_cppflags \
Expand Down Expand Up @@ -93,9 +95,11 @@ jobs:
repository: openpmix/openpmix
path: openpmix/master
ref: master
fetch-depth: 0
- name: Build OpenPMIx
run: |
cd openpmix/master
git checkout 08e41ed5
./autogen.pl
./configure --prefix=$RUNNER_TEMP/pmixinstall
make -j
Expand Down Expand Up @@ -141,9 +145,11 @@ jobs:
repository: openpmix/openpmix
path: openpmix/master
ref: master
fetch-depth: 0
- name: Build OpenPMIx
run: |
cd openpmix/master
git checkout 08e41ed5
./autogen.pl
./configure --prefix=$RUNNER_TEMP/pmixinstall
make -j
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,7 @@ src/tools/prun/prun
src/tools/prte_info/prte_info
src/tools/prted/prted
src/tools/prte/prte
src/tools/pcc/pcc
src/tools/pcc/pcc-wrapper-data.txt
src/tools/pterm/pterm
src/tools/psched/psched

src/util/hostfile/hostfile_lex.c
src/util/keyval/keyval_lex.c
Expand Down
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
SUBDIRS = config contrib src include docs
EXTRA_DIST = README.md VERSION LICENSE autogen.pl

include examples/Makefile.include

# Check for common symbols. Use a "-hook" to increase the odds that a
# developer will see it at the end of their installation process.
Expand Down
3 changes: 0 additions & 3 deletions config/prte_config_files.m4
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ AC_DEFUN([PRTE_CONFIG_FILES],[
src/etc/Makefile
src/util/Makefile
src/util/hostfile/Makefile
src/tools/pcc/Makefile
src/tools/prted/Makefile
src/tools/prun/Makefile
src/tools/prte_info/Makefile
src/tools/prte/Makefile
src/tools/pterm/Makefile
src/tools/psched/Makefile
])
])
18 changes: 18 additions & 0 deletions config/prte_configure_options.m4
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dnl Copyright (c) 2016-2020 Intel, Inc. All rights reserved.
dnl Copyright (c) 2021-2023 Nanook Consulting All rights reserved.
dnl Copyright (c) 2022 Amazon.com, Inc. or its affiliates.
dnl All Rights reserved.
dnl Copyright (c) 2024 Jeffrey M. Squyres. All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
Expand Down Expand Up @@ -377,4 +378,21 @@ fi
AC_DEFINE_UNQUOTED([PRTE_ENABLE_GETPWUID], [$prte_want_getpwuid],
[Disable getpwuid support (default: enabled)])

# Optionally add a prefix to all the PRTE executable and library names
AC_MSG_CHECKING([if want custom PRTE binary prefix])
AC_ARG_WITH([prte-binary-prefix],
[AS_HELP_STRING([--with-prte-binary-prefix=STRING],
["Optionally add a prefix to all PRTE binary names (executables and libraries) names"])])
#Set default prefix to "ompi-"
AS_IF([with_prte_binary_prefix=ompi-])

AS_IF([test "$with_prte_binary_prefix" = "no" || \
test "$with_prte_binary_prefix" = "yes" || \
test "$with_prte_binary_prefix" = ""],
[PRTE_BINARY_PREFIX=],
[PRTE_BINARY_PREFIX=$with_prte_binary_prefix])

AC_MSG_RESULT([$PRTE_BINARY_PREFIX])
AC_SUBST(PRTE_BINARY_PREFIX)

])dnl
2 changes: 1 addition & 1 deletion contrib/libadd_mca_comp_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import glob, os, re, shutil

projects= { 'prte' : ["$(top_builddir)/src/libprrte.la"],
projects= { 'prte' : ["$(top_builddir)/src/lib@PRTE_BINARY_PREFIX@prrte.la"],
}

no_anchor_file = []
Expand Down
1 change: 0 additions & 1 deletion docs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ PRTE_MAN1 = \
prted.1 \
prterun.1 \
prun.1 \
psched.1 \
pterm.1

PRTE_MAN5 = \
Expand Down
1 change: 0 additions & 1 deletion docs/man/man1/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ Commands (section 1)
prted.1.rst
prterun.1.rst
prun.1.rst
psched.1.rst
pterm.1.rst
189 changes: 0 additions & 189 deletions docs/man/man1/psched.1.rst

This file was deleted.

71 changes: 0 additions & 71 deletions examples/Makefile

This file was deleted.

Loading
Loading