Skip to content

Turned main function in prte.c into library function provided in libprrte.so #6

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Turned main function in prte.c into library function provided in libprrte.so #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59774cf
GitHub Actions: checkout specific pmix sha to use for CI
hppritcha Nov 13, 2024
5181ce5
Reworked PRRTE to transition the functionality of prte.c into a libra…
Nov 6, 2024
f430be7
Merge pull request #8 from uofl-capstone-open-mpi/pr/7
gagarc Nov 25, 2024
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
View file
Open in desktop
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
1 change: 0 additions & 1 deletion config/prte_config_files.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ AC_DEFUN([PRTE_CONFIG_FILES],[
src/tools/prted/Makefile
src/tools/prun/Makefile
src/tools/prte_info/Makefile
src/tools/prte/Makefile
src/tools/pterm/Makefile
])
])
1 change: 1 addition & 0 deletions include/prte.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
* Main body of prte functionality
*/
int prte(int argc, char *argv[]);
int prte_launch(int argc, char *argv[]);

#endif
3 changes: 2 additions & 1 deletion src/runtime/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,5 @@ libprrte_la_SOURCES += \
runtime/prte_mca_params.c \
runtime/prte_wait.c \
runtime/prte_data_server.c \
runtime/prte_progress_threads.c
runtime/prte_progress_threads.c \
runtime/prte_launcher.c
2 changes: 1 addition & 1 deletion src/tools/prte/prte.c → src/runtime/prte_launcher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ static char *pmix_getline(FILE *fp)
}
#endif

int main(int argc, char *argv[])
int prte_launch(int argc, char *argv[])
{
int rc = 1, i;
char *param, *timeoutenv, *tpath, *cptr;
Expand Down
2 changes: 0 additions & 2 deletions src/tools/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@ SUBDIRS += \
tools/prted \
tools/prun \
tools/prte_info \
tools/prte \
tools/pterm

DIST_SUBDIRS += \
tools/prted \
tools/prun \
tools/prte_info \
tools/prte \
tools/pterm

55 changes: 0 additions & 55 deletions src/tools/prte/Makefile.am
View file
Open in desktop

This file was deleted.

Loading