Skip to content

Commit a61e2f7

Browse files
jjhurseyjjhursey
committed
mca: Dynamic components link against project lib
 * Resolves #3705 * Components should link against the project level library to better support `dlopen` with `RTLD_LOCAL`. * Different project levels link to different sets of libraries by using the `mca_FRAMEWORK_COMPONENT_la_LIBADD` in the `Makefile.am`. ``` MCA components in ompi/ $(top_builddir)/ompi/lib@[email protected] \ $(top_builddir)/orte/lib@[email protected] \ $(top_builddir)/opal/lib@[email protected] MCA components in orte/ $(top_builddir)/orte/lib@[email protected] \ $(top_builddir)/opal/lib@[email protected] MCA components in opal/ $(top_builddir)/opal/lib@[email protected] ``` Note: The changes in this commit were automated. Some components were not included because they are staticly built only. Signed-off-by: Joshua Hursey <[email protected]>
1 parent c667719 commit a61e2f7

File tree

176 files changed

+620
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+620
-78
lines changed

‎ompi/mca/bml/r2/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# Copyright (c) 2004-2005 The Regents of the University of California.
99
# All rights reserved.
1010
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
11+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
1112
# $COPYRIGHT$
1213
#
1314
# Additional copyrights may follow
@@ -37,6 +38,9 @@ mcacomponentdir = $(ompilibdir)
3738
mcacomponent_LTLIBRARIES = $(component_install)
3839
mca_bml_r2_la_SOURCES = $(r2_sources)
3940
mca_bml_r2_la_LDFLAGS = -module -avoid-version
41+
mca_bml_r2_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
42+
$(top_builddir)/orte/lib@[email protected] \
43+
$(top_builddir)/opal/lib@[email protected]
4044

4145
noinst_LTLIBRARIES = $(component_noinst)
4246
libmca_bml_r2_la_SOURCES = $(r2_sources)

‎ompi/mca/coll/basic/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# Copyright (c) 2012 Sandia National Laboratories. All rights reserved.
1414
# Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1515
# reserved.
16+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
1617
# $COPYRIGHT$
1718
#
1819
# Additional copyrights may follow
@@ -63,6 +64,9 @@ mcacomponentdir = $(ompilibdir)
6364
mcacomponent_LTLIBRARIES = $(component_install)
6465
mca_coll_basic_la_SOURCES = $(sources)
6566
mca_coll_basic_la_LDFLAGS = -module -avoid-version
67+
mca_coll_basic_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
68+
$(top_builddir)/orte/lib@[email protected] \
69+
$(top_builddir)/opal/lib@[email protected]
6670

6771
noinst_LTLIBRARIES = $(component_noinst)
6872
libmca_coll_basic_la_SOURCES =$(sources)

‎ompi/mca/coll/cuda/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# of Tennessee Research Foundation. All rights
44
# reserved.
55
# Copyright (c) 2014 NVIDIA Corporation. All rights reserved.
6+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
67
# $COPYRIGHT$
78
#
89
# Additional copyrights may follow
@@ -31,6 +32,9 @@ mcacomponentdir = $(ompilibdir)
3132
mcacomponent_LTLIBRARIES = $(component_install)
3233
mca_coll_cuda_la_SOURCES = $(sources)
3334
mca_coll_cuda_la_LDFLAGS = -module -avoid-version
35+
mca_coll_cuda_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
36+
$(top_builddir)/orte/lib@[email protected] \
37+
$(top_builddir)/opal/lib@[email protected]
3438

3539
noinst_LTLIBRARIES = $(component_noinst)
3640
libmca_coll_cuda_la_SOURCES =$(sources)

‎ompi/mca/coll/demo/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
1314
# $COPYRIGHT$
1415
#
1516
# Additional copyrights may follow
@@ -56,6 +57,9 @@ mcacomponentdir = $(ompilibdir)
5657
mcacomponent_LTLIBRARIES = $(component_install)
5758
mca_coll_demo_la_SOURCES = $(sources)
5859
mca_coll_demo_la_LDFLAGS = -module -avoid-version
60+
mca_coll_demo_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
61+
$(top_builddir)/orte/lib@[email protected] \
62+
$(top_builddir)/opal/lib@[email protected]
5963

6064
noinst_LTLIBRARIES = $(component_noinst)
6165
libmca_coll_demo_la_SOURCES = $(sources)

‎ompi/mca/coll/fca/Makefile.am‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
#
44
# Copyright (c) 2011 Mellanox Technologies. All rights reserved.
5+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
56
# $COPYRIGHT$
67
#
78
# Additional copyrights may follow
@@ -37,7 +38,10 @@ endif
3738
mcacomponentdir = $(ompilibdir)
3839
mcacomponent_LTLIBRARIES = $(component_install)
3940
mca_coll_fca_la_SOURCES = $(coll_fca_sources)
40-
mca_coll_fca_la_LIBADD = $(coll_fca_LIBS)
41+
mca_coll_fca_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
42+
$(top_builddir)/orte/lib@[email protected] \
43+
$(top_builddir)/opal/lib@[email protected] \
44+
$(coll_fca_LIBS)
4145
mca_coll_fca_la_LDFLAGS = -module -avoid-version $(coll_fca_LDFLAGS)
4246

4347
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/coll/hcoll/Makefile.am‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Copyright (c) 2011 Mellanox Technologies. All rights reserved.
55
# Copyright (c) 2015 Research Organization for Information Science
66
# and Technology (RIST). All rights reserved.
7+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -38,7 +39,10 @@ endif
3839
mcacomponentdir = $(ompilibdir)
3940
mcacomponent_LTLIBRARIES = $(component_install)
4041
mca_coll_hcoll_la_SOURCES = $(coll_hcoll_sources)
41-
mca_coll_hcoll_la_LIBADD = $(coll_hcoll_LIBS)
42+
mca_coll_hcoll_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
43+
$(top_builddir)/orte/lib@[email protected] \
44+
$(top_builddir)/opal/lib@[email protected] \
45+
$(coll_hcoll_LIBS)
4246
mca_coll_hcoll_la_LDFLAGS = -module -avoid-version $(coll_hcoll_LDFLAGS)
4347

4448
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/coll/inter/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
1212
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
1314
# $COPYRIGHT$
1415
#
1516
# Additional copyrights may follow
@@ -32,6 +33,9 @@ mcacomponentdir = $(ompilibdir)
3233
mcacomponent_LTLIBRARIES = $(component_install)
3334
mca_coll_inter_la_SOURCES = $(sources)
3435
mca_coll_inter_la_LDFLAGS = -module -avoid-version
36+
mca_coll_inter_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
37+
$(top_builddir)/orte/lib@[email protected] \
38+
$(top_builddir)/opal/lib@[email protected]
3539

3640
noinst_LTLIBRARIES = $(component_noinst)
3741
libmca_coll_inter_la_SOURCES = $(sources)

‎ompi/mca/coll/libnbc/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# reserved.
1515
# Copyright (c) 2017 Research Organization for Information Science
1616
# and Technology (RIST). All rights reserved.
17+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
1718
# $COPYRIGHT$
1819
#
1920
# Additional copyrights may follow
@@ -71,6 +72,9 @@ mcacomponentdir = $(ompilibdir)
7172
mcacomponent_LTLIBRARIES = $(component_install)
7273
mca_coll_libnbc_la_SOURCES = $(sources)
7374
mca_coll_libnbc_la_LDFLAGS = -module -avoid-version
75+
mca_coll_libnbc_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
76+
$(top_builddir)/orte/lib@[email protected] \
77+
$(top_builddir)/opal/lib@[email protected]
7478

7579
noinst_LTLIBRARIES = $(component_noinst)
7680
libmca_coll_libnbc_la_SOURCES =$(sources)

‎ompi/mca/coll/monitoring/Makefile.am‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
22
# Copyright (c) 2016 Inria. All rights reserved.
3+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
34
# $COPYRIGHT$
45
#
56
# Additional copyrights may follow
@@ -45,7 +46,10 @@ mcacomponentdir = $(ompilibdir)
4546
mcacomponent_LTLIBRARIES = $(component_install)
4647
mca_coll_monitoring_la_SOURCES = $(monitoring_sources)
4748
mca_coll_monitoring_la_LDFLAGS = -module -avoid-version
48-
mca_coll_monitoring_la_LIBADD = \
49+
mca_coll_monitoring_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
50+
$(top_builddir)/orte/lib@[email protected] \
51+
$(top_builddir)/opal/lib@[email protected] \
52+
\
4953
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/monitoring/libmca_common_monitoring.la
5054

5155
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/coll/portals4/Makefile.am‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#
22
# Copyright (c) 2013-2015 Sandia National Laboratories. All rights reserved.
33
# Copyright (c) 2015 Bull SAS. All rights reserved.
4+
# Copyright (c) 2017 IBM Corporation. All rights reserved.
45
# $COPYRIGHT$
56
#
67
# Additional copyrights may follow
@@ -32,7 +33,10 @@ AM_CPPFLAGS = $(coll_portals4_CPPFLAGS)
3233
mcacomponentdir = $(ompilibdir)
3334
mcacomponent_LTLIBRARIES = $(component_install)
3435
mca_coll_portals4_la_SOURCES = $(local_sources)
35-
mca_coll_portals4_la_LIBADD = $(coll_portals4_LIBS)
36+
mca_coll_portals4_la_LIBADD = $(top_builddir)/ompi/lib@[email protected] \
37+
$(top_builddir)/orte/lib@[email protected] \
38+
$(top_builddir)/opal/lib@[email protected] \
39+
$(coll_portals4_LIBS)
3640
mca_coll_portals4_la_LDFLAGS = -module -avoid-version $(coll_portals4_LDFLAGS)
3741

3842
noinst_LTLIBRARIES = $(component_noinst)

0 commit comments

Comments
 (0)