Skip to content

Commit 4ad78aa

Browse files
guseravguserav
committed
Revert "Remove opal/mca/common/ofi."
This reverts commit dd20174. Signed-off-by: guserav <[email protected]>
1 parent 6159afc commit 4ad78aa

File tree

7 files changed

+187
-0
lines changed

7 files changed

+187
-0
lines changed

‎VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ libmca_orte_common_alps_so_version=0:0:0
110110

111111
# OPAL layer
112112
libmca_opal_common_cuda_so_version=0:0:0
113+
libmca_opal_common_ofi_so_version=0:0:0
113114
libmca_opal_common_sm_so_version=0:0:0
114115
libmca_opal_common_ucx_so_version=0:0:0
115116
libmca_opal_common_ugni_so_version=0:0:0

‎configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ AC_SUBST(libopen_pal_so_version)
155155
# transparently by adding some intelligence in autogen.pl
156156
# and/or opal_mca.m4, but I don't have the cycles to do this
157157
# right now.
158+
AC_SUBST(libmca_opal_common_ofi_so_version)
158159
AC_SUBST(libmca_opal_common_cuda_so_version)
159160
AC_SUBST(libmca_opal_common_sm_so_version)
160161
AC_SUBST(libmca_opal_common_ugni_so_version)

‎opal/mca/common/ofi/Makefile.am

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
#
2+
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
3+
# University Research and Technology
4+
# Corporation. All rights reserved.
5+
# Copyright (c) 2004-2013 The University of Tennessee and The University
6+
# of Tennessee Research Foundation. All rights
7+
# reserved.
8+
# Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
9+
# University of Stuttgart. All rights reserved.
10+
# Copyright (c) 2004-2005 The Regents of the University of California.
11+
# All rights reserved.
12+
# Copyright (c) 2011-2013 NVIDIA Corporation. All rights reserved.
13+
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
14+
# Copyright (c) 2015 Intel, Inc. All rights reserved.
15+
# Copyright (c) 2017 Los Alamos National Security, LLC. All rights
16+
# reserved.
17+
# $COPYRIGHT$
18+
#
19+
# Additional copyrights may follow
20+
#
21+
# $HEADER$
22+
#
23+
# A word of explanation...
24+
#
25+
# This library is linked against various MCA components because the
26+
# support for ofis is needed in various places.
27+
#
28+
# Note that building this common component statically and linking
29+
# against other dynamic components is *not* supported!
30+
31+
AM_CPPFLAGS = $(opal_common_ofi_CPPFLAGS)
32+
33+
# Header files
34+
35+
headers = \
36+
common_ofi.h
37+
38+
# Source files
39+
40+
sources = \
41+
common_ofi.c
42+
43+
# As per above, we'll either have an installable or noinst result.
44+
# The installable one should follow the same MCA prefix naming rules
45+
# (i.e., libmca_<type>_<name>.la). The noinst one can be named
46+
# whatever it wants, although libmca_<type>_<name>_noinst.la is
47+
# recommended.
48+
49+
# To simplify components that link to this library, we will *always*
50+
# have an output libtool library named libmca_<type>_<name>.la -- even
51+
# for case 2) described above (i.e., so there's no conditional logic
52+
# necessary in component Makefile.am's that link to this library).
53+
# Hence, if we're creating a noinst version of this library (i.e.,
54+
# case 2), we sym link it to the libmca_<type>_<name>.la name
55+
# (libtool will do the Right Things under the covers). See the
56+
# all-local and clean-local rules, below, for how this is effected.
57+
58+
lib_LTLIBRARIES =
59+
noinst_LTLIBRARIES =
60+
comp_inst = lib@OPAL_LIB_PREFIX@mca_common_ofi.la
61+
comp_noinst = lib@OPAL_LIB_PREFIX@mca_common_ofi_noinst.la
62+
63+
64+
if MCA_BUILD_opal_common_ofi_DSO
65+
lib_LTLIBRARIES += $(comp_inst)
66+
else
67+
noinst_LTLIBRARIES += $(comp_noinst)
68+
endif
69+
70+
lib@OPAL_LIB_PREFIX@mca_common_ofi_la_SOURCES = $(headers) $(sources)
71+
lib@OPAL_LIB_PREFIX@mca_common_ofi_la_LDFLAGS = \
72+
$(opal_common_ofi_LDFLAGS) \
73+
-version-info $(libmca_opal_common_ofi_so_version)
74+
lib@OPAL_LIB_PREFIX@mca_common_ofi_la_LIBADD = $(opal_common_ofi_LIBS)
75+
76+
lib@OPAL_LIB_PREFIX@mca_common_ofi_noinst_la_SOURCES = $(headers) $(sources)
77+
lib@OPAL_LIB_PREFIX@mca_common_ofi_noinst_la_LDFLAGS = $(opal_common_ofi_LDFLAGS)
78+
lib@OPAL_LIB_PREFIX@mca_common_ofi_noinst_la_LIBADD = $(opal_common_ofi_LIBS)
79+
80+
# Conditionally install the header files
81+
82+
if WANT_INSTALL_HEADERS
83+
opaldir = $(opalincludedir)/$(subdir)
84+
opal_HEADERS = $(headers)
85+
endif
86+
87+
# These two rules will sym link the "noinst" libtool library filename
88+
# to the installable libtool library filename in the case where we are
89+
# compiling this component statically (case 2), described above).
90+
91+
V=0
92+
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
93+
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
94+
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`;
95+
96+
all-local:
97+
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
98+
rm -f "$(comp_inst)"; \
99+
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \
100+
fi
101+
102+
clean-local:
103+
if test -z "$(lib_LTLIBRARIES)"; then \
104+
rm -f "$(comp_inst)"; \
105+
fi

‎opal/mca/common/ofi/common_ofi.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Copyright (c) 2015 Intel, Inc. All rights reserved.
3+
* Copyright (c) 2017 Los Alamos National Security, LLC. All rights
4+
* reserved.
5+
* $COPYRIGHT$
6+
*
7+
* Additional copyrights may follow
8+
*
9+
* $HEADER$
10+
*/
11+
12+
#include "opal_config.h"
13+
#include "opal/constants.h"
14+
15+
#include <errno.h>
16+
#include <unistd.h>
17+
18+
#include "common_ofi.h"
19+
20+
int mca_common_ofi_register_mca_variables(void)
21+
{
22+
return OPAL_SUCCESS;
23+
}

‎opal/mca/common/ofi/common_ofi.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
2+
/*
3+
* Copyright (c) 2015 Intel, Inc. All rights reserved.
4+
* Copyright (c) 2017 Los Alamos National Security, LLC. All rights
5+
* reserved.
6+
* $COPYRIGHT$
7+
*
8+
* Additional copyrights may follow
9+
*
10+
* $HEADER$
11+
*/
12+
13+
#ifndef OPAL_MCA_COMMON_OFI_H
14+
#define OPAL_MCA_COMMON_OFI_H
15+
16+
OPAL_DECLSPEC int mca_common_ofi_register_mca_variables(void);
17+
18+
#endif /* OPAL_MCA_COMMON_OFI_H */

‎opal/mca/common/ofi/configure.m4

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2011-2013 NVIDIA Corporation. All rights reserved.
4+
# Copyright (c) 2013 The University of Tennessee and The University
5+
# of Tennessee Research Foundation. All rights
6+
# reserved.
7+
# Copyright (c) 2015 Intel, Inc. All rights reserved.
8+
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
9+
# Copyright (c) 2017 Los Alamos National Security, LLC. All rights
10+
# reserved.
11+
# $COPYRIGHT$
12+
#
13+
# Additional copyrights may follow
14+
#
15+
# $HEADER$
16+
#
17+
18+
AC_DEFUN([MCA_opal_common_ofi_CONFIG],[
19+
AC_CONFIG_FILES([opal/mca/common/ofi/Makefile])
20+
21+
# Check for ofi. Note that $opal_common_ofi_happy is
22+
# used in other configure.m4's to know if ofi configured
23+
# successfully.
24+
OPAL_CHECK_OFI([opal_common_ofi],
25+
[opal_common_ofi_happy=yes
26+
common_ofi_WRAPPER_EXTRA_LDFLAGS=$opal_common_ofi_LDFLAGS
27+
common_ofi_WRAPPER_EXTRA_LIBS=$opal_common_ofi_LIBS
28+
$1],
29+
[opal_common_ofi_happy=no
30+
$2])
31+
32+
])dnl

‎opal/mca/common/ofi/owner.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# owner/status file
3+
# owner: institution that is responsible for this package
4+
# status: e.g. active, maintenance, unmaintained
5+
#
6+
owner: Intel
7+
status:active

0 commit comments

Comments
 (0)