Skip to content

openmpi.spec: Add override install for openmpi-mca-params.conf #7677

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

openmpi.spec: Add override install for openmpi-mca-params.conf #7677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ompi/mca/coll/cuda/coll_cuda_allreduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "ompi/op/op.h"
#include "opal/datatype/opal_convertor.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"

/*
* allreduce_intra
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/coll/cuda/coll_cuda_exscan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "ompi/op/op.h"
#include "opal/datatype/opal_convertor.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"

int mca_coll_cuda_exscan(const void *sbuf, void *rbuf, int count,
struct ompi_datatype_t *dtype,
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/coll/cuda/coll_cuda_reduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "ompi/op/op.h"
#include "opal/datatype/opal_convertor.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"

/*
* reduce_log_inter
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/coll/cuda/coll_cuda_reduce_scatter_block.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "ompi/op/op.h"
#include "opal/datatype/opal_convertor.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"

/*
* reduce_scatter_block
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/coll/cuda/coll_cuda_scan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include "ompi/op/op.h"
#include "opal/datatype/opal_convertor.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"

/*
* scan
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/coll/libnbc/nbc_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "coll_libnbc.h"
#if OPAL_CUDA_SUPPORT
#include "opal/datatype/opal_convertor.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"
#endif /* OPAL_CUDA_SUPPORT */
#include "ompi/include/ompi/constants.h"
#include "ompi/request/request.h"
Expand Down
1 change: 1 addition & 0 deletions ompi/mca/common/ompio/common_ompio_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "ompi_config.h"

#include "opal/datatype/opal_convertor.h"
#include "opal/util/opal_cuda_copy.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/sys_limits.h"

Expand Down
1 change: 1 addition & 0 deletions ompi/mca/mtl/base/mtl_base_datatype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#if OPAL_CUDA_SUPPORT
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/datatype/opal_convertor.h"
#include "opal/util/opal_cuda_copy.h"
#endif

#ifndef MTL_BASE_DATATYPE_H_INCLUDED
Expand Down
1 change: 1 addition & 0 deletions ompi/mca/mtl/ofi/mtl_ofi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#if OPAL_CUDA_SUPPORT
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/datatype/opal_convertor.h"
#include "opal/util/opal_cuda_copy.h"
#endif

BEGIN_C_DECLS
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/osc/rdma/osc_rdma_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include "opal/util/printf.h"
#include "opal/util/sys_limits.h"
#if OPAL_CUDA_SUPPORT
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"
#endif /* OPAL_CUDA_SUPPORT */
#include "opal/util/info_subscriber.h"
#include "opal/mca/mpool/base/base.h"
Expand Down
1 change: 1 addition & 0 deletions ompi/mca/pml/ob1/pml_ob1_recvfrag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "pml_ob1_hdr.h"
#if OPAL_CUDA_SUPPORT
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"
#endif /* OPAL_CUDA_SUPPORT */

OBJ_CLASS_INSTANCE( mca_pml_ob1_buffer_t,
Expand Down
1 change: 1 addition & 0 deletions ompi/mca/pml/ob1/pml_ob1_recvreq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

#if OPAL_CUDA_SUPPORT
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"
#endif /* OPAL_CUDA_SUPPORT */

#if OPAL_CUDA_SUPPORT
Expand Down
26 changes: 0 additions & 26 deletions opal/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@
# $HEADER$
#

if OPAL_cuda_support
SUBDIRS = \
include \
mca/common/cuda \
datatype \
etc \
util \
Expand All @@ -39,36 +37,12 @@ SUBDIRS = \
# therefore make distclean will fail).
DIST_SUBDIRS = \
include \
mca/common/cuda \
datatype \
etc \
util \
mca/base \
$(MCA_opal_FRAMEWORKS_SUBDIRS) \
$(MCA_opal_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
else
SUBDIRS = \
include \
datatype \
etc \
util \
mca/base \
$(MCA_opal_FRAMEWORKS_SUBDIRS) \
$(MCA_opal_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
. \
$(MCA_opal_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
# libltdl is included by variable because if --disable-dlopen was
# used, there will be no generated Makefile in that directory (and
# therefore make distclean will fail).
DIST_SUBDIRS = \
include \
datatype \
etc \
util \
mca/base \
$(MCA_opal_FRAMEWORKS_SUBDIRS) \
$(MCA_opal_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
endif

# Build the main OPAL library
lib_LTLIBRARIES = lib@[email protected]
Expand Down
2 changes: 1 addition & 1 deletion opal/datatype/opal_convertor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "opal/datatype/opal_datatype_internal.h"
#include "opal/datatype/opal_datatype_prototypes.h"
#if OPAL_CUDA_SUPPORT
# include "opal/mca/common/cuda/common_cuda.h"
# include "opal/util/opal_cuda_copy.h"
# define MEMCPY_CUDA(DST, SRC, BLENGTH, CONVERTOR) \
CONVERTOR->cbmemcpy((DST), (SRC), (BLENGTH), (CONVERTOR))
#endif
Expand Down
2 changes: 1 addition & 1 deletion opal/datatype/opal_datatype_copy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static size_t opal_datatype_memop_block_size = 128 * 1024;
#include "opal_datatype_copy.h"

#if OPAL_CUDA_SUPPORT
# include "opal/mca/common/cuda/common_cuda.h"
# include "opal/util/opal_cuda_copy.h"

# undef MEM_OP_NAME
# define MEM_OP_NAME non_overlap_cuda
Expand Down
2 changes: 1 addition & 1 deletion opal/datatype/opal_datatype_pack_unpack_predefined.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#define OPAL_DATATYPE_PACK_UNPACK_PREDEFINED_H_HAS_BEEN_INCLUDED

#include "opal_config.h"
#include "opal/mca/common/cuda/common_cuda.h"
#include "opal/util/opal_cuda_copy.h"
#include <stdint.h>

/* Improve predefined pack/unpack performance using mpich methods.
Expand Down
Loading