Skip to content

oshmem: add pkg-config files #4737

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

Merged
merged 1 commit into from
May 18, 2021
Merged
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
8 changes: 6 additions & 2 deletions config/oshmem_config_files.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Copyright (c) 2013 Mellanox Technologies, Inc.
# All rights reserved.
# Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2017-2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -27,5 +27,9 @@ AC_DEFUN([OSHMEM_CONFIG_FILES],[
oshmem/tools/wrappers/shmemcc-wrapper-data.txt
oshmem/tools/wrappers/shmemc++-wrapper-data.txt
oshmem/tools/wrappers/shmemfort-wrapper-data.txt
oshmem/tools/wrappers/oshmem.pc
oshmem/tools/wrappers/oshmem-c.pc
oshmem/tools/wrappers/oshmem-cxx.pc
oshmem/tools/wrappers/oshmem-fort.pc
])
])
3 changes: 3 additions & 0 deletions oshmem/tools/wrappers/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ man_pages = oshcc.1 shmemcc.1 oshc++.1 shmemc++.1 oshcxx.1 shmemcxx.1 oshfort.1
if PROJECT_OSHMEM
man_MANS = $(man_pages)

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = oshmem.pc oshmem-c.pc oshmem-cxx.pc oshmem-fort.pc

nodist_oshmemdata_DATA = \
shmemcc-wrapper-data.txt \
shmemc++-wrapper-data.txt \
Expand Down
24 changes: 24 additions & 0 deletions oshmem/tools/wrappers/oshmem-c.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
#
Name: Open SHMEM
Description: Open MPI based Open SHMEM implementation
Version: @OSHMEM_VERSION@
URL: http://www.open-mpi.org/
#
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
pkgincludedir=@opalincludedir@
#
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
# static linking (they're pulled in by libopen-rte.so's implicit
# dependencies), so only list these in Libs.private.
#
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -loshmem -l@OMPI_LIBMPI_NAME@

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(minor) Does it make sense to create a OMPI_LIBOSHMEM_NAME to replace hardcoded oshmem?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is the only issue left on this PR, I'd say that it's ready / done / can be merged.

@ggouaillardet @amaslenn ?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing apart from this one from my side.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ggouaillardet If you still want this one, I'd say you're clear to merge.

Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
#
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@
24 changes: 24 additions & 0 deletions oshmem/tools/wrappers/oshmem-cxx.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
#
Name: Open SHMEM
Description: Open MPI based Open SHMEM implementation
Version: @OSHMEM_VERSION@
URL: http://www.open-mpi.org/
#
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
pkgincludedir=@opalincludedir@
#
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
# static linking (they're pulled in by libopen-rte.so's implicit
# dependencies), so only list these in Libs.private.
#
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_WRAPPER_CXX_LIB@ -loshmem -l@OMPI_LIBMPI_NAME@
Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
#
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@
23 changes: 23 additions & 0 deletions oshmem/tools/wrappers/oshmem-fort.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
#
Name: Open SHMEM
Description: Open MPI based Open SHMEM implementation
Version: @OSHMEM_VERSION@
URL: http://www.open-mpi.org/
#
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
pkgincludedir=@opalincludedir@
#
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
# static linking (they're pulled in by libopen-rte.so's implicit
# dependencies), so only list these in Libs.private.
#
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -loshmem -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@
24 changes: 24 additions & 0 deletions oshmem/tools/wrappers/oshmem.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
#
Name: Open SHMEM
Description: Open MPI based Open SHMEM implementation
Version: @OSHMEM_VERSION@
URL: http://www.open-mpi.org/
#
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
pkgincludedir=@opalincludedir@
#
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
# static linking (they're pulled in by libopen-rte.so's implicit
# dependencies), so only list these in Libs.private.
#
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -loshmem -l@OMPI_LIBMPI_NAME@
Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
#
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@