From 626167f2a9403d244d0d9c5622bbc08b629149b1 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sat, 20 Feb 2016 07:53:11 -0800 Subject: [PATCH 1/2] monitoring lib: rename to ompi_monitoring_prof.so The library that is installed is specific to Open MPI, so put an "ompi_" prefix on it. Also do some minor line wrappings and cleanups of text. Signed-off-by: Jeff Squyres --- test/monitoring/Makefile.am | 23 +++++++++++++---------- test/monitoring/monitoring_prof.c | 11 +++++++++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/test/monitoring/Makefile.am b/test/monitoring/Makefile.am index 54538cf9c5..32319e8366 100644 --- a/test/monitoring/Makefile.am +++ b/test/monitoring/Makefile.am @@ -6,6 +6,7 @@ # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. +# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -19,16 +20,18 @@ if PROJECT_OMPI noinst_PROGRAMS = monitoring_test monitoring_test_SOURCES = monitoring_test.c monitoring_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) - monitoring_test_LDADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la $(top_builddir)/opal/libopen-pal.la + monitoring_test_LDADD = \ + $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \ + $(top_builddir)/opal/libopen-pal.la if MCA_BUILD_ompi_pml_monitoring_DSO - lib_LTLIBRARIES = monitoring_prof.la - monitoring_prof_la_SOURCES = monitoring_prof.c - monitoring_prof_la_LDFLAGS=-module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS) - monitoring_prof_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la $(top_builddir)/opal/libopen-pal.la -endif + lib_LTLIBRARIES = ompi_monitoring_prof.la + ompi_monitoring_prof_la_SOURCES = monitoring_prof.c + ompi_monitoring_prof_la_LDFLAGS= \ + -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS) + ompi_monitoring_prof_la_LIBADD = \ + $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \ + $(top_builddir)/opal/libopen-pal.la +endif # MCA_BUILD_ompi_pml_monitoring_DSO -endif - -distclean: - rm -rf *.dSYM .deps .libs *.la *.lo monitoring_test *.log *.o *.trs Makefile +endif # PROJECT_OMPI diff --git a/test/monitoring/monitoring_prof.c b/test/monitoring/monitoring_prof.c index 946f690a3a..30c7824e84 100644 --- a/test/monitoring/monitoring_prof.c +++ b/test/monitoring/monitoring_prof.c @@ -15,12 +15,19 @@ /* pml monitoring PMPI profiler -Designed by George Bosilca , Emmanuel Jeannot and Guillaume Papauré +Designed by: + George Bosilca + Emmanuel Jeannot + Guillaume Papauré + Contact the authors for questions. To be run as: -mpirun -np 4 -x LD_PRELOAD=ompi_install_dir/lib/monitoring_prof.so --mca pml_monitoring_enable 1 ./my_app +mpirun -np 4 \ + --mca pml_monitoring_enable 1 \ + -x LD_PRELOAD=ompi_install_dir/lib/ompi_monitoring_prof.so \ + ./my_app ... ... From c34ba88b2251afdeb64b66b70a150ed3fb6710fa Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 23 Feb 2016 16:16:34 -0800 Subject: [PATCH 2/2] monitoring lib: fix some Makefile.am macros * Use the proper lib prefix name * Use the proper extra LDFLAGS Signed-off-by: Jeff Squyres --- test/monitoring/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/monitoring/Makefile.am b/test/monitoring/Makefile.am index 32319e8366..469c104ed2 100644 --- a/test/monitoring/Makefile.am +++ b/test/monitoring/Makefile.am @@ -19,10 +19,10 @@ if PROJECT_OMPI noinst_PROGRAMS = monitoring_test monitoring_test_SOURCES = monitoring_test.c - monitoring_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS) + monitoring_test_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS) monitoring_test_LDADD = \ $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \ - $(top_builddir)/opal/libopen-pal.la + $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la if MCA_BUILD_ompi_pml_monitoring_DSO lib_LTLIBRARIES = ompi_monitoring_prof.la @@ -31,7 +31,7 @@ if MCA_BUILD_ompi_pml_monitoring_DSO -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS) ompi_monitoring_prof_la_LIBADD = \ $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \ - $(top_builddir)/opal/libopen-pal.la + $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la endif # MCA_BUILD_ompi_pml_monitoring_DSO endif # PROJECT_OMPI