Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 2b4faa8

Browse files
author
rhc54
committed
Merge pull request #564 from igor-ivanov/pr/oshmem-man-v1.10
Pr/oshmem man v1.10
2 parents a47543f + dc82f2a commit 2b4faa8

File tree

174 files changed

+6522
-108
lines changed

Some content is hidden

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

174 files changed

+6522
-108
lines changed

‎.gitignore‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,17 @@ oshmem/shmem/fortran/profile/pmy_pe_f.c
547547
oshmem/shmem/fortran/profile/pshpalloc_f.c
548548
oshmem/shmem/fortran/profile/pnum_pes_f.c
549549
oshmem/shmem/fortran/profile/pstart_pes_f.c
550+
oshmem/shmem/man/man3/shmem_*.3
551+
oshmem/shmem/man/man3/OpenSHMEM.3
552+
oshmem/shmem/man/man3/intro_shmem.3
553+
oshmem/shmem/man/man3/_my_pe.3
554+
oshmem/shmem/man/man3/_num_pes.3
555+
oshmem/shmem/man/man3/shfree.3
556+
oshmem/shmem/man/man3/shmalloc.3
557+
oshmem/shmem/man/man3/shmemalign.3
558+
oshmem/shmem/man/man3/shrealloc.3
559+
oshmem/shmem/man/man3/start_pes.3
560+
oshmem/shmem/man/man3/.dir-stamp
550561
oshmem/tools/oshmem_info/oshmem_info
551562
oshmem/tools/oshmem_info/oshmem_info.1
552563
oshmem/tools/wrappers/shmemcc-wrapper-data.txt

‎oshmem/Makefile.am‎

Lines changed: 114 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,114 @@
1-
#
2-
# Copyright (c) 2013 Mellanox Technologies, Inc.
3-
# All rights reserved.
4-
# Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved.
5-
# Copyright (c) 2014 Intel, Inc. All rights reserved.
6-
# $COPYRIGHT$
7-
#
8-
# Additional copyrights may follow
9-
#
10-
# $HEADER$
11-
#
12-
13-
# Do we have profiling?
14-
if OSHMEM_PROFILING
15-
c_pshmem_lib = shmem/c/profile/liboshmem_c_pshmem.la
16-
else
17-
c_pshmem_lib =
18-
endif
19-
20-
# Do we have the Fortran bindings?
21-
if OSHMEM_BUILD_FORTRAN_BINDINGS
22-
fortran_oshmem_lib = shmem/fortran/liboshmem_fortran.la
23-
24-
if OSHMEM_PROFILING
25-
fortran_pshmem_lib = shmem/fortran/profile/liboshmem_fortran_pshmem.la
26-
endif
27-
28-
else
29-
fortran_oshmem_lib =
30-
fortran_pshmem_lib =
31-
endif
32-
33-
SUBDIRS = \
34-
include \
35-
shmem/c \
36-
shmem/fortran
37-
38-
if PROJECT_OSHMEM
39-
# Only traverse these dirs if we're building oshmem
40-
SUBDIRS += \
41-
$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
42-
$(MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
43-
. \
44-
$(MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
45-
endif
46-
47-
DIST_SUBDIRS = \
48-
include \
49-
shmem/c \
50-
shmem/fortran \
51-
$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
52-
$(MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
53-
54-
# Build The main OSHMEM library, but only if we're building OSHMEM
55-
lib_LTLIBRARIES =
56-
if PROJECT_OSHMEM
57-
lib_LTLIBRARIES += liboshmem.la
58-
endif
59-
60-
liboshmem_la_SOURCES =
61-
liboshmem_la_LIBADD = \
62-
shmem/c/liboshmem_c.la \
63-
$(c_pshmem_lib) \
64-
$(fortran_oshmem_lib) \
65-
$(fortran_pshmem_lib) \
66-
$(MCA_oshmem_FRAMEWORK_LIBS) \
67-
$(top_ompi_builddir)/ompi/libmpi.la
68-
liboshmem_la_DEPENDENCIES = $(liboshmem_la_LIBADD)
69-
liboshmem_la_LDFLAGS = \
70-
-version-info $(liboshmem_so_version) \
71-
$(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
72-
73-
# included subdirectory Makefile.am's and appended-to variables
74-
headers =
75-
noinst_LTLIBRARIES =
76-
include_HEADERS =
77-
dist_ompidata_DATA =
78-
liboshmem_la_SOURCES += $(headers)
79-
nodist_man_MANS =
80-
81-
# Conditionally install the header files
82-
83-
if WANT_INSTALL_HEADERS
84-
oshmemdir = $(ompiincludedir)/$(subdir)
85-
nobase_oshmem_HEADERS = $(headers)
86-
endif
87-
88-
include op/Makefile.am
89-
include proc/Makefile.am
90-
include request/Makefile.am
91-
include runtime/Makefile.am
92-
include shmem/Makefile.am
93-
include tools/Makefile.am
94-
include util/Makefile.am
1+
#
2+
# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
3+
# All rights reserved.
4+
# Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved.
5+
# Copyright (c) 2014 Intel, Inc. All rights reserved.
6+
# $COPYRIGHT$
7+
#
8+
# Additional copyrights may follow
9+
#
10+
# $HEADER$
11+
#
12+
13+
# Do we have profiling?
14+
if OSHMEM_PROFILING
15+
c_pshmem_lib = shmem/c/profile/liboshmem_c_pshmem.la
16+
else
17+
c_pshmem_lib =
18+
endif
19+
20+
# Do we have the Fortran bindings?
21+
if OSHMEM_BUILD_FORTRAN_BINDINGS
22+
fortran_oshmem_lib = shmem/fortran/liboshmem_fortran.la
23+
24+
if OSHMEM_PROFILING
25+
fortran_pshmem_lib = shmem/fortran/profile/liboshmem_fortran_pshmem.la
26+
endif
27+
28+
else
29+
fortran_oshmem_lib =
30+
fortran_pshmem_lib =
31+
endif
32+
33+
SUBDIRS = \
34+
include \
35+
shmem/c \
36+
shmem/fortran
37+
38+
if PROJECT_OSHMEM
39+
# Only traverse these dirs if we're building oshmem
40+
SUBDIRS += \
41+
$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
42+
$(MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
43+
. \
44+
$(MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
45+
endif
46+
47+
DIST_SUBDIRS = \
48+
include \
49+
shmem/c \
50+
shmem/fortran \
51+
$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
52+
$(MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
53+
54+
# Build The main OSHMEM library, but only if we're building OSHMEM
55+
lib_LTLIBRARIES =
56+
if PROJECT_OSHMEM
57+
lib_LTLIBRARIES += liboshmem.la
58+
endif
59+
60+
liboshmem_la_SOURCES =
61+
liboshmem_la_LIBADD = \
62+
shmem/c/liboshmem_c.la \
63+
$(c_pshmem_lib) \
64+
$(fortran_oshmem_lib) \
65+
$(fortran_pshmem_lib) \
66+
$(MCA_oshmem_FRAMEWORK_LIBS) \
67+
$(top_ompi_builddir)/ompi/libmpi.la
68+
liboshmem_la_DEPENDENCIES = $(liboshmem_la_LIBADD)
69+
liboshmem_la_LDFLAGS = \
70+
-version-info $(liboshmem_so_version) \
71+
$(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
72+
73+
# included subdirectory Makefile.am's and appended-to variables
74+
headers =
75+
noinst_LTLIBRARIES =
76+
include_HEADERS =
77+
dist_ompidata_DATA =
78+
liboshmem_la_SOURCES += $(headers)
79+
nodist_man_MANS =
80+
81+
# Conditionally install the header files
82+
83+
if WANT_INSTALL_HEADERS
84+
oshmemdir = $(ompiincludedir)/$(subdir)
85+
nobase_oshmem_HEADERS = $(headers)
86+
endif
87+
88+
include op/Makefile.am
89+
include proc/Makefile.am
90+
include request/Makefile.am
91+
include runtime/Makefile.am
92+
include shmem/Makefile.am
93+
include shmem/man/man3/Makefile.extra
94+
include tools/Makefile.am
95+
include util/Makefile.am
96+
97+
# Ensure that the man page directory exists before we try to make man
98+
# page files (because ompi/mpi/man/man3 has no config.status-generated
99+
# Makefile)
100+
dir_stamp = $(top_builddir)/$(subdir)/shmem/man/man3/.dir-stamp
101+
102+
# Also ensure that the man pages are rebuilt if the opal_config.h file
103+
# changes (e.g., configure was run again, meaning that the release
104+
# date or version may have changed)
105+
$(nodist_man_MANS): $(dir_stamp) $(top_builddir)/opal/include/opal_config.h
106+
107+
$(dir_stamp):
108+
$(MKDIR_P) `dirname $@`
109+
touch "$@"
110+
111+
# Remove the generated man pages
112+
distclean-local:
113+
rm -f $(nodist_man_MANS) $(dir_stamp)
114+

‎oshmem/include/Makefile.am‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2013 Mellanox Technologies, Inc.
1+
# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
22
# All rights reserved.
33
# $COPYRIGHT$
44
#
@@ -11,21 +11,20 @@
1111
headers = oshmem_config.h
1212
nodist_headers =
1313

14+
if PROJECT_OSHMEM
1415
# Install these in $(includedir)
1516
include_HEADERS =
1617

17-
# Install these in $(includedir)
18-
mppincludedir = $(includedir)/mpp
19-
mppinclude_HEADERS = mpp/shmem.h \
20-
mpp/shmem.fh
21-
2218
# Always install these in $(pkgincludedir)
2319
pkginclude_HEADERS =
2420

2521
include_HEADERS += shmem.fh \
2622
shmemx.h \
2723
shmem-compat.h
2824

25+
nobase_include_HEADERS = mpp/shmem.h \
26+
mpp/shmem.fh
27+
2928
# These files are always installed in $(includedir), but shouldn't be
3029
# shipped since they are generated by configure from their .in
3130
# counterparts (which AM automatically ships).
@@ -36,8 +35,10 @@ include_HEADERS += pshmem.h \
3635
pshmemx.h
3736
endif
3837

39-
nobase_dist_noinst_HEADERS = $(headers)
40-
nobase_nodist_noinst_HEADERS = $(nodist_headers)
38+
oshmemdir=${includedir}/openshmem
39+
nobase_dist_oshmem_HEADERS = $(headers)
40+
nobase_nodist_oshmem_HEADERS = $(nodist_headers)
41+
endif
4142

4243
distclean-local:
4344

‎oshmem/runtime/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99

1010
# This makefile.am does not stand on its own - it is included from oshmem/Makefile.am
1111

12+
if PROJECT_OSHMEM
1213
dist_ompidata_DATA += runtime/help-shmem-runtime.txt
13-
14+
endif
1415

1516
headers += \
1617
runtime/runtime.h \

‎oshmem/shmem/Makefile.am‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
# Copyright (c) 2013 Mellanox Technologies, Inc.
1+
# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
22
# All rights reserved.
33
# $COPYRIGHT$
4-
#
4+
#
55
# Additional copyrights may follow
6-
#
6+
#
77
# $HEADER$
88
#
99

10+
EXTRA_DIST =
11+
1012
headers += shmem/shmem_api_logger.h \
1113
shmem/shmem_lock.h
12-
dist_ompidata_DATA += shmem/c/help-shmem-api.txt
14+
15+
if PROJECT_OSHMEM
16+
dist_ompidata_DATA += shmem/help-shmem-api.txt
17+
endif

‎oshmem/shmem/c/help-shmem-api.txt‎ renamed to ‎oshmem/shmem/help-shmem-api.txt‎

File renamed without changes.

0 commit comments

Comments
 (0)