diff --git a/src/atomic.h b/src/atomic.h index 93d5859811..be74004696 100644 --- a/src/atomic.h +++ b/src/atomic.h @@ -17,7 +17,7 @@ #define LAM_ATOMIC_H 1 #include "lam_config.h" -#include "lam/stdint.h" +#include "stdint.h" /* * prototypes (we may not implement all of this interface) @@ -97,6 +97,6 @@ void lam_atomic_subtract_rel_uint64_t(volatile uint64_t *p, uint64_t v); * implementation (system specific) */ -#include "lam/os/atomic.h" +#include "os/atomic.h" #endif /* LAM_ATOMIC_H */ diff --git a/src/attribute/attribute.c b/src/attribute/attribute.c index 17ba36f9c7..1e18f53160 100644 --- a/src/attribute/attribute.c +++ b/src/attribute/attribute.c @@ -2,8 +2,8 @@ * $HEADER$ */ -#include "mpi/attribute/attribute.h" -#include "mpi/communicator/communicator.h" +#include "attribute/attribute.h" +#include "communicator/communicator.h" /** * Macros - Lots of them! diff --git a/src/attribute/attribute.h b/src/attribute/attribute.h index 9028ad3a21..cf242b73f3 100644 --- a/src/attribute/attribute.h +++ b/src/attribute/attribute.h @@ -15,12 +15,12 @@ #include "mpi.h" #include "lam_config.h" -#include "lam/lfc/lam_object.h" -#include "lam/lfc/lam_bitmap.h" -#include "lam/lfc/lam_hash_table.h" -#include "mpi/communicator/communicator.h" -#include "mpi/datatype/datatype.h" -#include "mpi/win/win.h" +#include "lfc/lam_object.h" +#include "lfc/lam_bitmap.h" +#include "lfc/lam_hash_table.h" +#include "communicator/communicator.h" +#include "datatype/datatype.h" +#include "win/win.h" /* ******************************************************************* */ diff --git a/src/communicator/communicator.h b/src/communicator/communicator.h index e658d2b42b..78c2b994ee 100644 --- a/src/communicator/communicator.h +++ b/src/communicator/communicator.h @@ -5,14 +5,14 @@ #ifndef LAM_COMMUNICATOR_H #define LAM_COMMUNICATOR_H -#include "lam/stdint.h" -#include "lam/lfc/lam_object.h" -#include "lam/threads/mutex.h" -#include "lam/util/output.h" +#include "stdint.h" +#include "lfc/lam_object.h" +#include "threads/mutex.h" +#include "util/output.h" #include "mpi.h" -#include "mpi/group/group.h" -#include "mca/mpi/coll/coll.h" -#include "lam/lfc/lam_hash_table.h" +#include "group/group.h" +#include "mca/coll/coll.h" +#include "lfc/lam_hash_table.h" extern lam_class_t lam_communicator_t_class; diff --git a/src/communicator/lam_comm_init.c b/src/communicator/lam_comm_init.c index eba8d9c38e..2915789bf0 100644 --- a/src/communicator/lam_comm_init.c +++ b/src/communicator/lam_comm_init.c @@ -6,9 +6,9 @@ #include #include "mpi.h" -#include "mpi/communicator/communicator.h" -#include "mpi/group/group.h" -#include "mca/mpi/pml/pml.h" +#include "communicator/communicator.h" +#include "group/group.h" +#include "mca/pml/pml.h" /* diff --git a/src/ctnetwork/ctchannel.c b/src/ctnetwork/ctchannel.c index 1ac985b0df..54167628c9 100644 --- a/src/ctnetwork/ctchannel.c +++ b/src/ctnetwork/ctchannel.c @@ -4,7 +4,7 @@ #include -#include "lam/ctnetwork/ctchannel.h" +#include "ctnetwork/ctchannel.h" #define CHANNEL_CLS(chnl) \ ((lam_ctchannel_class_t *)(((lam_object_t *) chnl)->obj_class)) diff --git a/src/ctnetwork/ctchannel.h b/src/ctnetwork/ctchannel.h index 317c536d4b..5b2c275355 100644 --- a/src/ctnetwork/ctchannel.h +++ b/src/ctnetwork/ctchannel.h @@ -9,8 +9,8 @@ #include #include -#include "lam/lfc/lam_object.h" -#include "lam/ctnetwork/ctmessage.h" +#include "lfc/lam_object.h" +#include "ctnetwork/ctmessage.h" /* diff --git a/src/ctnetwork/ctclient.c b/src/ctnetwork/ctclient.c index 5a4d9f84df..50f191d221 100644 --- a/src/ctnetwork/ctclient.c +++ b/src/ctnetwork/ctclient.c @@ -2,5 +2,5 @@ * $HEADER$ */ -#include "lam/ctnetwork/ctclient.h" +#include "ctnetwork/ctclient.h" diff --git a/src/ctnetwork/ctcontroller.c b/src/ctnetwork/ctcontroller.c index 7de060903f..152522f589 100644 --- a/src/ctnetwork/ctcontroller.c +++ b/src/ctnetwork/ctcontroller.c @@ -2,5 +2,5 @@ * $HEADER$ */ -#include "lam/ctnetwork/ctpeer.h" +#include "ctnetwork/ctpeer.h" diff --git a/src/ctnetwork/ctcontroller.h b/src/ctnetwork/ctcontroller.h index fa5629e301..a59d4c520d 100644 --- a/src/ctnetwork/ctcontroller.h +++ b/src/ctnetwork/ctcontroller.h @@ -5,8 +5,8 @@ #ifndef LAM_CT_CONTROLLER_H #define LAM_CT_CONTROLLER_H -#include "lam/lfc/lam_object.h" -#include "lam/ctnetwork/ctnode.h" +#include "lfc/lam_object.h" +#include "ctnetwork/ctnode.h" typedef void (*lam_ctmsg_recvd_fn)(struct lam_ctcontroller *, lam_ctmsg_t *, diff --git a/src/ctnetwork/ctmessage.c b/src/ctnetwork/ctmessage.c index 1ff6b4237f..dd30e02143 100644 --- a/src/ctnetwork/ctmessage.c +++ b/src/ctnetwork/ctmessage.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "lam/ctnetwork/ctmessage.h" +#include "ctnetwork/ctmessage.h" lam_class_t lam_ct_ctrl_t_class = { diff --git a/src/ctnetwork/ctmessage.h b/src/ctnetwork/ctmessage.h index 289e2decc0..40f98a1ffe 100644 --- a/src/ctnetwork/ctmessage.h +++ b/src/ctnetwork/ctmessage.h @@ -5,7 +5,7 @@ #ifndef LAM_CT_MESSAGE_H #define LAM_CT_MESSAGE_H -#include "lam/lfc/lam_object.h" +#include "lfc/lam_object.h" /* diff --git a/src/ctnetwork/ctnode.c b/src/ctnetwork/ctnode.c index a68aaebe67..b16f1ab9a1 100644 --- a/src/ctnetwork/ctnode.c +++ b/src/ctnetwork/ctnode.c @@ -2,5 +2,5 @@ * $HEADER$ */ -#include "lam/ctnetwork/ctnode.h" +#include "ctnetwork/ctnode.h" diff --git a/src/ctnetwork/ctnode.h b/src/ctnetwork/ctnode.h index 4a78312be6..e32d02834c 100644 --- a/src/ctnetwork/ctnode.h +++ b/src/ctnetwork/ctnode.h @@ -5,9 +5,9 @@ #ifndef LAM_CT_NODE_H #define LAM_CT_NODE_H -#include "lam/stdint.h" -#include "lam/lfc/lam_object.h" -#include "lam/lfc/hash_table.h" +#include "stdint.h" +#include "lfc/lam_object.h" +#include "lfc/hash_table.h" /* diff --git a/src/ctnetwork/ctpeer.c b/src/ctnetwork/ctpeer.c index 7de060903f..152522f589 100644 --- a/src/ctnetwork/ctpeer.c +++ b/src/ctnetwork/ctpeer.c @@ -2,5 +2,5 @@ * $HEADER$ */ -#include "lam/ctnetwork/ctpeer.h" +#include "ctnetwork/ctpeer.h" diff --git a/src/ctnetwork/ctpeer.h b/src/ctnetwork/ctpeer.h index 6b9e85f979..510ea925e5 100644 --- a/src/ctnetwork/ctpeer.h +++ b/src/ctnetwork/ctpeer.h @@ -5,6 +5,6 @@ #ifndef LAM_CT_PEER_H #define LAM_CT_PEER_H -#include "lam/lfc/lam_object.h" +#include "lfc/lam_object.h" #endif /* LAM_CT_PEER_H */ diff --git a/src/datatype/datatype.c b/src/datatype/datatype.c index 1654224140..b85bde39ab 100644 --- a/src/datatype/datatype.c +++ b/src/datatype/datatype.c @@ -7,7 +7,7 @@ */ #include "lam_config.h" -#include "mpi/datatype/datatype.h" +#include "datatype/datatype.h" /* * Global variables diff --git a/src/datatype/datatype.h b/src/datatype/datatype.h index 4db66109ca..f0460e2427 100644 --- a/src/datatype/datatype.h +++ b/src/datatype/datatype.h @@ -21,11 +21,11 @@ #include #include "lam_config.h" -#include "lam/constants.h" -#include "lam/stdint.h" -#include "lam/lfc/lam_object.h" -#include "lam/lfc/lam_hash_table.h" -#include "lam/types.h" +#include "constants.h" +#include "stdint.h" +#include "lfc/lam_object.h" +#include "lfc/lam_hash_table.h" +#include "types.h" #include "mpi.h" diff --git a/src/event/epoll.c b/src/event/epoll.c index fa6cd6aac7..3a6c74687b 100644 --- a/src/event/epoll.c +++ b/src/event/epoll.c @@ -55,7 +55,7 @@ #include "event.h" #include "evsignal.h" -#include "lam/threads/mutex.h" +#include "threads/mutex.h" extern struct lam_event_list lam_eventqueue; extern volatile sig_atomic_t lam_evsignal_caught; diff --git a/src/event/event.c b/src/event/event.c index 5c4aea1bef..626fbb893d 100644 --- a/src/event/event.c +++ b/src/event/event.c @@ -62,12 +62,12 @@ #endif #include "event.h" -#include "lam/types.h" -#include "lam/constants.h" -#include "lam/lfc/lam_object.h" -#include "lam/threads/mutex.h" -#include "lam/threads/thread.h" -#include "lam/util/output.h" +#include "types.h" +#include "constants.h" +#include "lfc/lam_object.h" +#include "threads/mutex.h" +#include "threads/thread.h" +#include "util/output.h" #ifdef HAVE_SELECT extern const struct lam_eventop lam_selectops; diff --git a/src/event/event.h b/src/event/event.h index 9f24ca0f17..6360d09ec7 100644 --- a/src/event/event.h +++ b/src/event/event.h @@ -37,7 +37,7 @@ extern "C" { /* LAM: Conform to LAM's header file scheme -- specify the full include path from "src/". Also, config.h is a terrible unqualified name for a header file. :-) */ -#include "lam/event/config.h" +#include "event/config.h" #endif #ifdef HAVE_SYS_TIME_H diff --git a/src/event/kqueue.c b/src/event/kqueue.c index 0268cbec27..4f131a4810 100644 --- a/src/event/kqueue.c +++ b/src/event/kqueue.c @@ -63,7 +63,7 @@ #endif #include "event.h" -#include "lam/threads/mutex.h" +#include "threads/mutex.h" extern struct event_list timequeue; extern struct event_list eventqueue; diff --git a/src/event/poll.c b/src/event/poll.c index f8b1fa0306..16468454e8 100644 --- a/src/event/poll.c +++ b/src/event/poll.c @@ -55,7 +55,7 @@ #include "event.h" #include "evsignal.h" -#include "lam/threads/mutex.h" +#include "threads/mutex.h" extern struct lam_event_list lam_eventqueue; diff --git a/src/event/select.c b/src/event/select.c index f2fcf6f99a..75c304d092 100644 --- a/src/event/select.c +++ b/src/event/select.c @@ -54,7 +54,7 @@ #include "event.h" #include "evsignal.h" -#include "lam/threads/mutex.h" +#include "threads/mutex.h" extern struct lam_event_list lam_eventqueue; extern lam_mutex_t lam_event_lock; diff --git a/src/file/file.h b/src/file/file.h index ec053de4ca..feb0f10b2a 100644 --- a/src/file/file.h +++ b/src/file/file.h @@ -6,7 +6,7 @@ #define LAM_FILE_H #include "mpi.h" -#include "mca/mpi/io/io.h" +#include "mca/io/io.h" typedef enum { LAM_IO_1_0_0, diff --git a/src/group/group.h b/src/group/group.h index e52ea0312d..fc04aa8f60 100644 --- a/src/group/group.h +++ b/src/group/group.h @@ -6,8 +6,8 @@ #define LAM_GROUP_H #include "mpi.h" -#include "mpi/proc/proc.h" -#include "lam/lfc/lam_pointer_array.h" +#include "proc/proc.h" +#include "lfc/lam_pointer_array.h" /* This must correspond to the fortran MPI_GROUP_NULL index */ #define LAM_GROUP_NULL_FORTRAN 0 diff --git a/src/group/mpi_group_init.c b/src/group/mpi_group_init.c index 75ccffe923..eb4ebf238f 100644 --- a/src/group/mpi_group_init.c +++ b/src/group/mpi_group_init.c @@ -2,8 +2,8 @@ * $HEADER$ */ -#include "mpi/group/group.h" -#include "lam/constants.h" +#include "group/group.h" +#include "constants.h" #include "mpi.h" /* define class information */ diff --git a/src/group/mpi_set_group_rank.c b/src/group/mpi_set_group_rank.c index 731e63cbd3..ca33e29447 100644 --- a/src/group/mpi_set_group_rank.c +++ b/src/group/mpi_set_group_rank.c @@ -2,8 +2,8 @@ * $HEADER$ */ -#include "mpi/group/group.h" -#include "lam/constants.h" +#include "group/group.h" +#include "constants.h" void lam_set_group_rank(lam_group_t *group, lam_proc_t *proc_pointer) { diff --git a/src/include/lam_config_bottom.h b/src/include/lam_config_bottom.h index c8991a187f..8d745b7673 100644 --- a/src/include/lam_config_bottom.h +++ b/src/include/lam_config_bottom.h @@ -53,12 +53,12 @@ extern bool lam_mpi_param_check; */ #if LAM_ENABLE_MEM_DEBUG && defined(LAM_BUILDING) && LAM_BUILDING -/* It is safe to include lam/mem/malloc.h here because a) it will only +/* It is safe to include mem/malloc.h here because a) it will only happen when we are building LAM and therefore have a full LAM source tree [including headers] available, and b) we guaranteed to - *not* to include anything else via lam/mem/malloc.h, so we won't + *not* to include anything else via mem/malloc.h, so we won't have Cascading Includes Of Death. */ -#include "lam/mem/malloc.h" +#include "mem/malloc.h" #define malloc(size) lam_malloc((size), __FILE__, __LINE__) #define realloc(ptr, size) lam_realloc((ptr), (size), __FILE__, __LINE__) #define free(ptr) lam_free((ptr), __FILE__, __LINE__) diff --git a/src/info/info.c b/src/info/info.c index a1ff9e3788..56000ea071 100644 --- a/src/info/info.c +++ b/src/info/info.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "mpi/info/info.h" +#include "info/info.h" /* * lam_info_t classes diff --git a/src/info/info.h b/src/info/info.h index 000dd313ad..7de9d60008 100644 --- a/src/info/info.h +++ b/src/info/info.h @@ -8,9 +8,9 @@ #include #include "mpi.h" -#include "lam/util/strncpy.h" -#include "lam/lfc/lam_list.h" -#include "lam/lam.h" +#include "util/strncpy.h" +#include "lfc/lam_list.h" +#include "lam.h" /** diff --git a/src/lam.h b/src/lam.h index d58cbb2c7f..c6a1e5debd 100644 --- a/src/lam.h +++ b/src/lam.h @@ -9,8 +9,8 @@ #include #include "lam_config.h" -#include "lam/stdint.h" -#include "lam/types.h" -#include "lam/constants.h" +#include "stdint.h" +#include "types.h" +#include "constants.h" #endif /* LAM_H */ diff --git a/src/lfc/lam_bitmap.c b/src/lfc/lam_bitmap.c index c3090629d3..2faa506e28 100644 --- a/src/lfc/lam_bitmap.c +++ b/src/lfc/lam_bitmap.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "lam/lfc/lam_bitmap.h" +#include "lfc/lam_bitmap.h" #define SIZE_OF_CHAR (sizeof(char) * 8) #define LAM_INVALID_BIT -1 diff --git a/src/lfc/lam_bitmap.h b/src/lfc/lam_bitmap.h index df45d23d0f..34e2513e40 100644 --- a/src/lfc/lam_bitmap.h +++ b/src/lfc/lam_bitmap.h @@ -15,9 +15,9 @@ #include #include "lam_config.h" -#include "lam/stdint.h" -#include "lam/types.h" -#include "lam/lfc/lam_object.h" +#include "stdint.h" +#include "types.h" +#include "lfc/lam_object.h" /* VPS: Just to compile right now, has to move later on */ #define LAM_ERR_SYSRESOURCE -1 diff --git a/src/lfc/lam_hash_table.c b/src/lfc/lam_hash_table.c index 1adcf3c70c..f7ecf0ef18 100644 --- a/src/lfc/lam_hash_table.c +++ b/src/lfc/lam_hash_table.c @@ -6,10 +6,10 @@ #include #include "lam_config.h" -#include "lam/stdint.h" -#include "lam/constants.h" -#include "lam/util/output.h" -#include "lam/lfc/lam_hash_table.h" +#include "stdint.h" +#include "constants.h" +#include "util/output.h" +#include "lfc/lam_hash_table.h" /* * lam_hash_table_t diff --git a/src/lfc/lam_hash_table.h b/src/lfc/lam_hash_table.h index 375c76b3ea..c2b04deaf1 100644 --- a/src/lfc/lam_hash_table.h +++ b/src/lfc/lam_hash_table.h @@ -13,9 +13,9 @@ #define LAM_HASH_TABLE_H #include "lam_config.h" -#include "lam/stdint.h" -#include "lam/types.h" -#include "lam/lfc/lam_list.h" +#include "stdint.h" +#include "types.h" +#include "lfc/lam_list.h" extern lam_class_t lam_hash_table_t_class; diff --git a/src/lfc/lam_list.c b/src/lfc/lam_list.c index 0f510a4138..ddfb6594d0 100644 --- a/src/lfc/lam_list.c +++ b/src/lfc/lam_list.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "lam/lfc/lam_list.h" +#include "lfc/lam_list.h" /* * List classes diff --git a/src/lfc/lam_list.h b/src/lfc/lam_list.h index f84279312d..1e591fa8f5 100644 --- a/src/lfc/lam_list.h +++ b/src/lfc/lam_list.h @@ -6,7 +6,7 @@ #define LAM_LIST_H #include -#include "lam/lfc/lam_object.h" +#include "lfc/lam_object.h" /* * diff --git a/src/lfc/lam_object.c b/src/lfc/lam_object.c index 84403fb880..0b2e33d8f8 100644 --- a/src/lfc/lam_object.c +++ b/src/lfc/lam_object.c @@ -10,8 +10,8 @@ #include -#include "lam/constants.h" -#include "lam/lfc/lam_object.h" +#include "constants.h" +#include "lfc/lam_object.h" /* * Instantiation of class descriptor for the base class. This is diff --git a/src/lfc/lam_pointer_array.c b/src/lfc/lam_pointer_array.c index 9928e59412..cbcb8e2d11 100644 --- a/src/lfc/lam_pointer_array.c +++ b/src/lfc/lam_pointer_array.c @@ -11,9 +11,9 @@ #include #include -#include "lam/constants.h" -#include "lam/lfc/lam_pointer_array.h" -#include "lam/util/output.h" +#include "constants.h" +#include "lfc/lam_pointer_array.h" +#include "util/output.h" static void lam_pointer_array_construct(lam_pointer_array_t *); static void lam_pointer_array_destruct(lam_pointer_array_t *); diff --git a/src/lfc/lam_pointer_array.h b/src/lfc/lam_pointer_array.h index ca3cb323f4..82eefbceb7 100644 --- a/src/lfc/lam_pointer_array.h +++ b/src/lfc/lam_pointer_array.h @@ -6,8 +6,8 @@ #define _LAM_POINTER_ARRAY -#include "lam/threads/mutex.h" -#include "lam/lfc/lam_object.h" +#include "threads/mutex.h" +#include "lfc/lam_object.h" /* * typedefs diff --git a/src/lfc/lam_value_array.c b/src/lfc/lam_value_array.c index fd83dc2448..ae3dc1cdbc 100644 --- a/src/lfc/lam_value_array.c +++ b/src/lfc/lam_value_array.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "lam/lfc/lam_value_array.h" +#include "lfc/lam_value_array.h" static void lam_value_array_construct(lam_value_array_t* array) diff --git a/src/lfc/lam_value_array.h b/src/lfc/lam_value_array.h index 61753eb50e..a600b5ccfe 100644 --- a/src/lfc/lam_value_array.h +++ b/src/lfc/lam_value_array.h @@ -7,11 +7,11 @@ #include #include "lam_config.h" -#include "lam/constants.h" -#include "lam/types.h" -#include "lam/lfc/lam_object.h" +#include "constants.h" +#include "types.h" +#include "lfc/lam_object.h" #if LAM_ENABLE_DEBUG -#include "lam/util/output.h" +#include "util/output.h" #endif /* diff --git a/src/mca/base/base.h b/src/mca/base/base.h index cd4543bb03..800087a0dc 100644 --- a/src/mca/base/base.h +++ b/src/mca/base/base.h @@ -10,8 +10,8 @@ /* * These units are large enough to warrant their own .h files */ -#include "mca/lam/base/mca_base_param.h" -#include "mca/lam/base/mca_base_module_exchange.h" +#include "mca/base/mca_base_param.h" +#include "mca/base/mca_base_module_exchange.h" /* diff --git a/src/mca/base/mca_base_close.c b/src/mca/base/mca_base_close.c index 4bf5373f5c..448e4656ee 100644 --- a/src/mca/base/mca_base_close.c +++ b/src/mca/base/mca_base_close.c @@ -4,9 +4,9 @@ #include "lam_config.h" -#include "lam/util/output.h" +#include "util/output.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" +#include "mca/base/base.h" /* diff --git a/src/mca/base/mca_base_cmd_line.c b/src/mca/base/mca_base_cmd_line.c index c4b74e6469..074ab04ec9 100644 --- a/src/mca/base/mca_base_cmd_line.c +++ b/src/mca/base/mca_base_cmd_line.c @@ -7,10 +7,10 @@ #include #include -#include "lam/constants.h" -#include "lam/util/cmd_line.h" -#include "lam/util/argv.h" -#include "mca/lam/base/base.h" +#include "constants.h" +#include "util/cmd_line.h" +#include "util/argv.h" +#include "mca/base/base.h" /* diff --git a/src/mca/base/mca_base_module_compare.c b/src/mca/base/mca_base_module_compare.c index 1eb42ee0ef..042064da33 100644 --- a/src/mca/base/mca_base_module_compare.c +++ b/src/mca/base/mca_base_module_compare.c @@ -7,7 +7,7 @@ #include #include "mca/mca.h" -#include "mca/lam/base/base.h" +#include "mca/base/base.h" /* diff --git a/src/mca/base/mca_base_module_exchange.c b/src/mca/base/mca_base_module_exchange.c index 6d98c1933f..d8e64b971b 100644 --- a/src/mca/base/mca_base_module_exchange.c +++ b/src/mca/base/mca_base_module_exchange.c @@ -4,13 +4,13 @@ #include #include "lam_config.h" -#include "lam/lfc/lam_hash_table.h" -#include "lam/util/output.h" -#include "mpi/proc/proc.h" +#include "lfc/lam_hash_table.h" +#include "util/output.h" +#include "proc/proc.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/oob/oob.h" -#include "mca/lam/base/mca_base_module_exchange.h" +#include "mca/base/base.h" +#include "mca/oob/oob.h" +#include "mca/base/mca_base_module_exchange.h" diff --git a/src/mca/base/mca_base_module_exchange.h b/src/mca/base/mca_base_module_exchange.h index fc6b7e830a..75e20d8f20 100644 --- a/src/mca/base/mca_base_module_exchange.h +++ b/src/mca/base/mca_base_module_exchange.h @@ -11,7 +11,7 @@ #include -#include "mpi/proc/proc.h" +#include "proc/proc.h" #include "mca/mca.h" diff --git a/src/mca/base/mca_base_module_find.c b/src/mca/base/mca_base_module_find.c index e579f8c2f0..3b0560095c 100644 --- a/src/mca/base/mca_base_module_find.c +++ b/src/mca/base/mca_base_module_find.c @@ -12,11 +12,11 @@ /* Ensure to get the right */ #include "mca/ltdl.h" -#include "lam/constants.h" -#include "lam/util/output.h" -#include "lam/lfc/lam_list.h" +#include "constants.h" +#include "util/output.h" +#include "lfc/lam_list.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" +#include "mca/base/base.h" /* diff --git a/src/mca/base/mca_base_module_registry.c b/src/mca/base/mca_base_module_registry.c index b4ce6e2e9c..894049d3d3 100644 --- a/src/mca/base/mca_base_module_registry.c +++ b/src/mca/base/mca_base_module_registry.c @@ -12,10 +12,10 @@ /* Ensure to get the right */ #include "mca/ltdl.h" -#include "lam/constants.h" -#include "lam/lfc/lam_list.h" +#include "constants.h" +#include "lfc/lam_list.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" +#include "mca/base/base.h" /* diff --git a/src/mca/base/mca_base_modules_close.c b/src/mca/base/mca_base_modules_close.c index 581bfdb323..39c5bc4b18 100644 --- a/src/mca/base/mca_base_modules_close.c +++ b/src/mca/base/mca_base_modules_close.c @@ -4,10 +4,10 @@ #include "lam_config.h" -#include "lam/lfc/lam_list.h" -#include "lam/util/output.h" +#include "lfc/lam_list.h" +#include "util/output.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" +#include "mca/base/base.h" int mca_base_modules_close(int output_id, lam_list_t *modules_available, diff --git a/src/mca/base/mca_base_modules_open.c b/src/mca/base/mca_base_modules_open.c index c2ef664e78..be3f1945d8 100644 --- a/src/mca/base/mca_base_modules_open.c +++ b/src/mca/base/mca_base_modules_open.c @@ -8,12 +8,12 @@ #include #include -#include "lam/lfc/lam_list.h" -#include "lam/util/strncpy.h" -#include "lam/util/argv.h" -#include "lam/util/output.h" +#include "lfc/lam_list.h" +#include "util/strncpy.h" +#include "util/argv.h" +#include "util/output.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" +#include "mca/base/base.h" struct module_name_t { diff --git a/src/mca/base/mca_base_open.c b/src/mca/base/mca_base_open.c index 4b83ee9e4a..a3d3f53bf4 100644 --- a/src/mca/base/mca_base_open.c +++ b/src/mca/base/mca_base_open.c @@ -8,9 +8,9 @@ #include #include -#include "lam/util/output.h" +#include "util/output.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" +#include "mca/base/base.h" /* diff --git a/src/mca/base/mca_base_param.c b/src/mca/base/mca_base_param.c index 3c87233bcd..dcad9781ba 100644 --- a/src/mca/base/mca_base_param.c +++ b/src/mca/base/mca_base_param.c @@ -10,10 +10,10 @@ #include #include -#include "lam/constants.h" -#include "lam/lfc/lam_value_array.h" +#include "constants.h" +#include "lfc/lam_value_array.h" #include "mca/mca.h" -#include "mca/lam/base/mca_base_param.h" +#include "mca/base/mca_base_param.h" /* @@ -415,13 +415,13 @@ static int param_register(const char *type_name, const char *module_name, /* - * DO NOT MODIFY THIS FUNCTION WITHOUT ALSO MODIFYING mca_mpi_param.c! + * DO NOT MODIFY THIS FUNCTION WITHOUT ALSO MODIFYING mca_base_param.c! * * This function appears in liblam. Because of unix linker semantics, * it's simply easier to essentially duplicate this function in libmpi * because in libmpi, we need to lookup on a keyval before looking in * the environment. The logic is simpler if we just duplicate/alter - * the code in mca_mpi_param.c rather than try to make this a) public, + * the code in mca_base_param.c rather than try to make this a) public, * and b) more general (to accomodate looking up keyvals while not * linking to MPI_Comm_get_attr() in libmpi). */ diff --git a/src/mca/base/mca_lam_param.c b/src/mca/base/mca_lam_param.c index e9f38d9a18..fb2a229340 100644 --- a/src/mca/base/mca_lam_param.c +++ b/src/mca/base/mca_lam_param.c @@ -10,10 +10,10 @@ #include #include -#include "lam/constants.h" -#include "lam/lfc/array.h" +#include "constants.h" +#include "lfc/array.h" #include "mca/mca.h" -#include "mca/lam/base/mca_lam_param.h" +#include "mca/base/mca_lam_param.h" typedef enum { @@ -404,13 +404,13 @@ param_register(const char *type_name, const char *module_name, const char *param /* - * DO NOT MODIFY THIS FUNCTION WITHOUT ALSO MODIFYING mca_mpi_param.c! + * DO NOT MODIFY THIS FUNCTION WITHOUT ALSO MODIFYING mca_base_param.c! * * This function appears in liblam. Because of unix linker semantics, * it's simply easier to essentially duplicate this function in libmpi * because in libmpi, we need to lookup on a keyval before looking in * the environment. The logic is simpler if we just duplicate/alter - * the code in mca_mpi_param.c rather than try to make this a) public, + * the code in mca_base_param.c rather than try to make this a) public, * and b) more general (to accomodate looking up keyvals while not * linking to MPI_Comm_get_attr() in libmpi). */ diff --git a/src/mca/base/mca_mpi_base_open.c b/src/mca/base/mca_mpi_base_open.c index 73307e42a0..45cbede511 100644 --- a/src/mca/base/mca_mpi_base_open.c +++ b/src/mca/base/mca_mpi_base_open.c @@ -8,8 +8,8 @@ #include #include -#include "mca/lam/base/base.h" -#include "mca/mpi/base/base.h" +#include "mca/base/base.h" +#include "mca/base/base.h" /* @@ -18,7 +18,7 @@ int mca_base_mpi_param_check_param = -1; -int mca_mpi_open(void) +int mca_base_open(void) { mca_base_mpi_param_check_param = mca_base_param_register_int("base", NULL, "mpi_param_check", diff --git a/src/mca/base/mca_mpi_init_select_modules.c b/src/mca/base/mca_mpi_init_select_modules.c index 09107d7361..eaea594e56 100644 --- a/src/mca/base/mca_mpi_init_select_modules.c +++ b/src/mca/base/mca_mpi_init_select_modules.c @@ -6,15 +6,15 @@ #include -#include "lam/constants.h" -#include "lam/lfc/lam_list.h" -#include "mca/mpi/base/base.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/base.h" +#include "constants.h" +#include "lfc/lam_list.h" +#include "mca/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/base.h" /* @@ -25,7 +25,7 @@ * * The contents of this function will likely be replaced */ -int mca_mpi_init_select_modules(int requested, +int mca_base_init_select_modules(int requested, bool allow_multi_user_threads, bool have_hidden_threads, int *provided) { diff --git a/src/mca/base/mca_mpi_mem.c b/src/mca/base/mca_mpi_mem.c index c4090ecb70..b7f837a387 100644 --- a/src/mca/base/mca_mpi_mem.c +++ b/src/mca/base/mca_mpi_mem.c @@ -9,10 +9,10 @@ #include "mpi.h" #include "mca/mca.h" -#include "mca/mpi/base/base.h" +#include "mca/base/base.h" -int mca_mpi_alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr) +int mca_base_alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr) { void *temp; @@ -36,7 +36,7 @@ int mca_mpi_alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr) } -int mca_mpi_free_mem(void *baseptr) +int mca_base_free_mem(void *baseptr) { if (NULL != baseptr) free(baseptr); diff --git a/src/mca/base/mpi_base.h b/src/mca/base/mpi_base.h index b5975eb2da..4187059e95 100644 --- a/src/mca/base/mpi_base.h +++ b/src/mca/base/mpi_base.h @@ -2,8 +2,8 @@ * $HEADER$ */ -#ifndef MCA_MPI_BASE_H -#define MCA_MPI_BASE_H +#ifndef MCA_BASE_BASE_H +#define MCA_BASE_BASE_H #include "lam_config.h" @@ -15,10 +15,10 @@ * Types for each function */ -typedef int (*mca_mpi_init_cb_t)(void); -typedef int (*mca_mpi_alloc_mem_fn_t)(MPI_Aint size, MPI_Info info, +typedef int (*mca_base_init_cb_t)(void); +typedef int (*mca_base_alloc_mem_fn_t)(MPI_Aint size, MPI_Info info, void **base); -typedef int (*mca_mpi_free_mem_fn_t)(void *base); +typedef int (*mca_base_free_mem_fn_t)(void *base); /* @@ -35,23 +35,23 @@ extern int mca_base_mpi_param_check_param; #if defined(c_plusplus) || defined(__cplusplus) extern "C" { #endif - int mca_mpi_alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr); - int mca_mpi_free_mem(void *baseptr); + int mca_base_alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr); + int mca_base_free_mem(void *baseptr); - int mca_mpi_open(void); - int mca_mpi_init_select_modules(int requested, + int mca_base_open(void); + int mca_base_init_select_modules(int requested, bool allow_multi_user_threads, bool have_hidden_threads, int *provided); #if 0 /* JMS Not implemented yet */ - int mca_mpi_init_callback(mca_mpi_init_cb_t func); - int mca_mpi_init_callbacks_invoke(void); - int mca_mpi_module_select(int requested); + int mca_base_init_callback(mca_base_init_cb_t func); + int mca_base_init_callbacks_invoke(void); + int mca_base_module_select(int requested); - int mca_mpi_param_associate(int index, int keyval); - int mca_mpi_param_lookup_int(int index, MPI_Comm comm); - char *mca_mpi_param_lookup_string(int index, MPI_Comm comm); + int mca_base_param_associate(int index, int keyval); + int mca_base_param_lookup_int(int index, MPI_Comm comm); + char *mca_base_param_lookup_string(int index, MPI_Comm comm); #endif #if defined(c_plusplus) || defined(__cplusplus) diff --git a/src/mca/coll/base/base.h b/src/mca/coll/base/base.h index b9dcf4d01c..242f2e20d2 100644 --- a/src/mca/coll/base/base.h +++ b/src/mca/coll/base/base.h @@ -8,8 +8,8 @@ #include "lam_config.h" #include "mpi.h" -#include "lam/lfc/lam_list.h" -#include "mca/mpi/coll/coll.h" +#include "lfc/lam_list.h" +#include "mca/coll/coll.h" /* diff --git a/src/mca/coll/base/coll_base_close.c b/src/mca/coll/base/coll_base_close.c index 03298ba48f..e9d2d93dd3 100644 --- a/src/mca/coll/base/coll_base_close.c +++ b/src/mca/coll/base/coll_base_close.c @@ -6,11 +6,11 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "mca/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" int mca_coll_base_close(void) diff --git a/src/mca/coll/base/coll_base_open.c b/src/mca/coll/base/coll_base_open.c index b35e42be48..21fd3ceceb 100644 --- a/src/mca/coll/base/coll_base_open.c +++ b/src/mca/coll/base/coll_base_open.c @@ -7,9 +7,9 @@ #include #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "mca/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" /* @@ -18,7 +18,7 @@ * module's public mca_base_module_t struct. */ -#include "mca/mpi/coll/base/static-modules.h" +#include "mca/coll/base/static-modules.h" /* diff --git a/src/mca/coll/base/coll_base_select.c b/src/mca/coll/base/coll_base_select.c index 1a1eea3806..3d3e51bada 100644 --- a/src/mca/coll/base/coll_base_select.c +++ b/src/mca/coll/base/coll_base_select.c @@ -5,8 +5,8 @@ #include "lam_config.h" #include "mca/mca.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" int mca_coll_base_select(lam_list_t *selected, bool *allow_multi_user_threads, diff --git a/src/mca/coll/basic/src/coll_basic.c b/src/mca/coll/basic/src/coll_basic.c index 4bf250797e..f5876f7cd5 100644 --- a/src/mca/coll/basic/src/coll_basic.c +++ b/src/mca/coll/basic/src/coll_basic.c @@ -8,8 +8,8 @@ #include #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic.h b/src/mca/coll/basic/src/coll_basic.h index 4455ec2307..acb6dcace6 100644 --- a/src/mca/coll/basic/src/coll_basic.h +++ b/src/mca/coll/basic/src/coll_basic.h @@ -8,7 +8,7 @@ #include "lam_config.h" #include "mca/mca.h" -#include "mca/mpi/coll/coll.h" +#include "mca/coll/coll.h" /* diff --git a/src/mca/coll/basic/src/coll_basic_allgather.c b/src/mca/coll/basic/src/coll_basic_allgather.c index f01851a4a2..5ac704313c 100644 --- a/src/mca/coll/basic/src/coll_basic_allgather.c +++ b/src/mca/coll/basic/src/coll_basic_allgather.c @@ -5,11 +5,11 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mpi/communicator/communicator.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "communicator/communicator.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_allgatherv.c b/src/mca/coll/basic/src/coll_basic_allgatherv.c index e3e91b43c7..703fd7a161 100644 --- a/src/mca/coll/basic/src/coll_basic_allgatherv.c +++ b/src/mca/coll/basic/src/coll_basic_allgatherv.c @@ -5,11 +5,11 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mpi/communicator/communicator.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "communicator/communicator.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_allreduce.c b/src/mca/coll/basic/src/coll_basic_allreduce.c index c2126e5f3e..c9140ef7db 100644 --- a/src/mca/coll/basic/src/coll_basic_allreduce.c +++ b/src/mca/coll/basic/src/coll_basic_allreduce.c @@ -5,11 +5,11 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mpi/communicator/communicator.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "communicator/communicator.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_alltoall.c b/src/mca/coll/basic/src/coll_basic_alltoall.c index 26d43ff10a..c557effcc7 100644 --- a/src/mca/coll/basic/src/coll_basic_alltoall.c +++ b/src/mca/coll/basic/src/coll_basic_alltoall.c @@ -8,11 +8,11 @@ #include #include -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mpi/datatype/datatype.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "datatype/datatype.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_alltoallv.c b/src/mca/coll/basic/src/coll_basic_alltoallv.c index a7e5c0f8f8..c0a911bc64 100644 --- a/src/mca/coll/basic/src/coll_basic_alltoallv.c +++ b/src/mca/coll/basic/src/coll_basic_alltoallv.c @@ -8,11 +8,11 @@ #include #include -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mpi/datatype/datatype.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "datatype/datatype.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_alltoallw.c b/src/mca/coll/basic/src/coll_basic_alltoallw.c index f396b506b3..8d3622685e 100644 --- a/src/mca/coll/basic/src/coll_basic_alltoallw.c +++ b/src/mca/coll/basic/src/coll_basic_alltoallw.c @@ -8,11 +8,11 @@ #include #include -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mpi/datatype/datatype.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "datatype/datatype.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_barrier.c b/src/mca/coll/basic/src/coll_basic_barrier.c index 05dfb4fc16..0b3726cab4 100644 --- a/src/mca/coll/basic/src/coll_basic_barrier.c +++ b/src/mca/coll/basic/src/coll_basic_barrier.c @@ -5,10 +5,10 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_bcast.c b/src/mca/coll/basic/src/coll_basic_bcast.c index 5016eb61d3..45371a0dd2 100644 --- a/src/mca/coll/basic/src/coll_basic_bcast.c +++ b/src/mca/coll/basic/src/coll_basic_bcast.c @@ -5,10 +5,10 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_exscan.c b/src/mca/coll/basic/src/coll_basic_exscan.c index 0ead5abf43..43b4acd2cd 100644 --- a/src/mca/coll/basic/src/coll_basic_exscan.c +++ b/src/mca/coll/basic/src/coll_basic_exscan.c @@ -7,10 +7,10 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_gather.c b/src/mca/coll/basic/src/coll_basic_gather.c index fa7ae3dcab..4c5338369e 100644 --- a/src/mca/coll/basic/src/coll_basic_gather.c +++ b/src/mca/coll/basic/src/coll_basic_gather.c @@ -5,10 +5,10 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_gatherv.c b/src/mca/coll/basic/src/coll_basic_gatherv.c index c9b3d0f463..2ec6f6e988 100644 --- a/src/mca/coll/basic/src/coll_basic_gatherv.c +++ b/src/mca/coll/basic/src/coll_basic_gatherv.c @@ -5,10 +5,10 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_module.c b/src/mca/coll/basic/src/coll_basic_module.c index 34e057bfcb..c274aa2ea9 100644 --- a/src/mca/coll/basic/src/coll_basic_module.c +++ b/src/mca/coll/basic/src/coll_basic_module.c @@ -12,7 +12,7 @@ #include "coll_basic.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" +#include "mca/coll/coll.h" #include "coll_basic.h" /* diff --git a/src/mca/coll/basic/src/coll_basic_reduce.c b/src/mca/coll/basic/src/coll_basic_reduce.c index a4b283fa51..2772f3c14b 100644 --- a/src/mca/coll/basic/src/coll_basic_reduce.c +++ b/src/mca/coll/basic/src/coll_basic_reduce.c @@ -7,10 +7,10 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_reduce_scatter.c b/src/mca/coll/basic/src/coll_basic_reduce_scatter.c index 1c64236b58..d791027416 100644 --- a/src/mca/coll/basic/src/coll_basic_reduce_scatter.c +++ b/src/mca/coll/basic/src/coll_basic_reduce_scatter.c @@ -8,10 +8,10 @@ #include #include -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_scan.c b/src/mca/coll/basic/src/coll_basic_scan.c index 5d00bc228d..4cacb08313 100644 --- a/src/mca/coll/basic/src/coll_basic_scan.c +++ b/src/mca/coll/basic/src/coll_basic_scan.c @@ -7,10 +7,10 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_scatter.c b/src/mca/coll/basic/src/coll_basic_scatter.c index 8d76b303d0..23932aa229 100644 --- a/src/mca/coll/basic/src/coll_basic_scatter.c +++ b/src/mca/coll/basic/src/coll_basic_scatter.c @@ -5,10 +5,10 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/basic/src/coll_basic_scatterv.c b/src/mca/coll/basic/src/coll_basic_scatterv.c index 77f5338130..fed60ef964 100644 --- a/src/mca/coll/basic/src/coll_basic_scatterv.c +++ b/src/mca/coll/basic/src/coll_basic_scatterv.c @@ -5,10 +5,10 @@ #include "lam_config.h" #include "coll_basic.h" -#include "lam/constants.h" +#include "constants.h" #include "mpi.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/coll_tags.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/coll_tags.h" #include "coll_basic.h" diff --git a/src/mca/coll/coll.h b/src/mca/coll/coll.h index c966eeedd1..13366567df 100644 --- a/src/mca/coll/coll.h +++ b/src/mca/coll/coll.h @@ -9,7 +9,7 @@ #include "mpi.h" #include "mca/mca.h" -#include "mca/mpi/base/base.h" +#include "mca/base/base.h" /* @@ -140,8 +140,8 @@ struct mca_coll_1_0_0_t { /* Memory allocation / freeing */ - mca_mpi_alloc_mem_fn_t coll_alloc_mem; - mca_mpi_free_mem_fn_t coll_free_mem; + mca_base_alloc_mem_fn_t coll_alloc_mem; + mca_base_free_mem_fn_t coll_free_mem; /* Collective function pointers */ diff --git a/src/mca/io/romio/src/file_open.c b/src/mca/io/romio/src/file_open.c index 2516551497..7e1d7878cc 100644 --- a/src/mca/io/romio/src/file_open.c +++ b/src/mca/io/romio/src/file_open.c @@ -3,9 +3,9 @@ */ #include "mpi.h" -#include "mpi/file/file.h" +#include "file/file.h" #include "io_romio.h" -#include "mpi/request/request.h" +#include "request/request.h" #include int mca_io_romio_File_open(MPI_Comm comm, char *filename, int amode, diff --git a/src/mca/io/romio/src/file_read.c b/src/mca/io/romio/src/file_read.c index 9d972f1325..6846da39da 100644 --- a/src/mca/io/romio/src/file_read.c +++ b/src/mca/io/romio/src/file_read.c @@ -3,9 +3,9 @@ */ #include "mpi.h" -#include "mpi/file/file.h" +#include "file/file.h" #include "io_romio.h" -#include "mpi/request/request.h" +#include "request/request.h" int mca_io_romio_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,int count, MPI_Datatype datatype, MPI_Status *status){ int ret; diff --git a/src/mca/io/romio/src/file_request.c b/src/mca/io/romio/src/file_request.c index bff4af7fbf..a18b50d925 100644 --- a/src/mca/io/romio/src/file_request.c +++ b/src/mca/io/romio/src/file_request.c @@ -3,9 +3,9 @@ */ #include "mpi.h" -#include "mpi/file/file.h" +#include "file/file.h" #include "io_romio.h" -#include "mpi/request/request.h" +#include "request/request.h" #include diff --git a/src/mca/io/romio/src/file_write.c b/src/mca/io/romio/src/file_write.c index 3cb7703e9b..7d652ab2d9 100644 --- a/src/mca/io/romio/src/file_write.c +++ b/src/mca/io/romio/src/file_write.c @@ -3,9 +3,9 @@ */ #include "mpi.h" -#include "mpi/file/file.h" +#include "file/file.h" #include "io_romio.h" -#include "mpi/request/request.h" +#include "request/request.h" int mca_io_romio_File_write_at(MPI_File fh, MPI_Offset offset, void *buf,int count, MPI_Datatype datatype, MPI_Status *status){ diff --git a/src/mca/io/romio/src/global.c b/src/mca/io/romio/src/global.c index fe65ae54c7..cf7a6407ad 100644 --- a/src/mca/io/romio/src/global.c +++ b/src/mca/io/romio/src/global.c @@ -1,7 +1,7 @@ /* * $HEADER */ -#include "lam/threads/mutex.h" +#include "threads/mutex.h" #include "io_romio.h" lam_mutex_t mca_io_romio_mutex; diff --git a/src/mca/io/romio/src/io_romio.h b/src/mca/io/romio/src/io_romio.h index ee49258aa8..dfb9e30969 100644 --- a/src/mca/io/romio/src/io_romio.h +++ b/src/mca/io/romio/src/io_romio.h @@ -5,9 +5,9 @@ #ifndef MCA_IO_ROMIO_H #define MCA_IO_ROMIO_H -#include "mpi/request/request.h" -#include "mpi/file/file.h" -#include "lam/threads/mutex.h" +#include "request/request.h" +#include "file/file.h" +#include "threads/mutex.h" #include "romio-1.2.5.1/include/mpio.h" /* global variables, instantiated in global.c */ diff --git a/src/mca/io/romio/src/io_romio_module.c b/src/mca/io/romio/src/io_romio_module.c index 64ad60ea90..37bc6cf216 100644 --- a/src/mca/io/romio/src/io_romio_module.c +++ b/src/mca/io/romio/src/io_romio_module.c @@ -3,7 +3,7 @@ */ #include "mpi.h" -#include "mca/mpi/io/io.h" +#include "mca/io/io.h" #include "io_romio.h" diff --git a/src/mca/mca.h b/src/mca/mca.h index f2dfad5d55..e9f2eb0a3b 100644 --- a/src/mca/mca.h +++ b/src/mca/mca.h @@ -6,8 +6,8 @@ #define LAM_MCA_H #include "mpi.h" -#include "lam/lfc/lam_list.h" -#include "lam/util/cmd_line.h" +#include "lfc/lam_list.h" +#include "util/cmd_line.h" /* * Types for each function diff --git a/src/mca/oob/base/base.h b/src/mca/oob/base/base.h index cd7cd7e4fb..80d869517c 100644 --- a/src/mca/oob/base/base.h +++ b/src/mca/oob/base/base.h @@ -8,9 +8,9 @@ #include "lam_config.h" -#include "lam/types.h" +#include "types.h" #include "mca/mca.h" -#include "mca/lam/oob/oob.h" +#include "mca/oob/oob.h" /* * Global functions for MCA overall collective open and close diff --git a/src/mca/oob/base/oob_base_close.c b/src/mca/oob/base/oob_base_close.c index 56013f11c2..2986ffdac4 100644 --- a/src/mca/oob/base/oob_base_close.c +++ b/src/mca/oob/base/oob_base_close.c @@ -6,11 +6,11 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/oob/oob.h" -#include "mca/lam/oob/base/base.h" +#include "mca/base/base.h" +#include "mca/oob/oob.h" +#include "mca/oob/base/base.h" int mca_oob_base_close(void) diff --git a/src/mca/oob/base/oob_base_open.c b/src/mca/oob/base/oob_base_open.c index c86c1642b6..87a94be5d0 100644 --- a/src/mca/oob/base/oob_base_open.c +++ b/src/mca/oob/base/oob_base_open.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/oob/oob.h" -#include "mca/lam/oob/base/base.h" +#include "mca/base/base.h" +#include "mca/oob/oob.h" +#include "mca/oob/base/base.h" /* @@ -16,7 +16,7 @@ * module's public mca_base_module_t struct. */ -#include "mca/lam/oob/base/static-modules.h" +#include "mca/oob/base/static-modules.h" /* diff --git a/src/mca/oob/base/oob_base_select.c b/src/mca/oob/base/oob_base_select.c index f22e0a717c..e84c12e720 100644 --- a/src/mca/oob/base/oob_base_select.c +++ b/src/mca/oob/base/oob_base_select.c @@ -6,12 +6,12 @@ #include -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" +#include "runtime/runtime.h" +#include "util/output.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/oob/oob.h" -#include "mca/lam/oob/base/base.h" +#include "mca/base/base.h" +#include "mca/oob/oob.h" +#include "mca/oob/base/base.h" /** diff --git a/src/mca/oob/cofs/src/oob_cofs.c b/src/mca/oob/cofs/src/oob_cofs.c index 21b2c6c08e..3e4873979b 100644 --- a/src/mca/oob/cofs/src/oob_cofs.c +++ b/src/mca/oob/cofs/src/oob_cofs.c @@ -6,9 +6,9 @@ #include "lam_config.h" -#include "mca/lam/oob/oob.h" -#include "mca/lam/oob/cofs/src/oob_cofs.h" -#include "lam/types.h" +#include "mca/oob/oob.h" +#include "mca/oob/cofs/src/oob_cofs.h" +#include "types.h" #include #include diff --git a/src/mca/oob/cofs/src/oob_cofs.h b/src/mca/oob/cofs/src/oob_cofs.h index 34b094e934..6927a5f8de 100644 --- a/src/mca/oob/cofs/src/oob_cofs.h +++ b/src/mca/oob/cofs/src/oob_cofs.h @@ -5,8 +5,8 @@ */ #include "lam_config.h" -#include "mca/lam/oob/oob.h" -#include "lam/types.h" +#include "mca/oob/oob.h" +#include "types.h" /* * Module open / close diff --git a/src/mca/oob/cofs/src/oob_cofs_module.c b/src/mca/oob/cofs/src/oob_cofs_module.c index 8b607d7bd8..3d9ab2a87a 100644 --- a/src/mca/oob/cofs/src/oob_cofs_module.c +++ b/src/mca/oob/cofs/src/oob_cofs_module.c @@ -6,11 +6,11 @@ #include "lam_config.h" -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/oob/oob.h" -#include "mca/lam/oob/cofs/src/oob_cofs.h" -#include "lam/types.h" +#include "mca/oob/oob.h" +#include "mca/oob/cofs/src/oob_cofs.h" +#include "types.h" #include #include diff --git a/src/mca/oob/oob.h b/src/mca/oob/oob.h index e64c2d5e31..513b63e0ed 100644 --- a/src/mca/oob/oob.h +++ b/src/mca/oob/oob.h @@ -26,7 +26,7 @@ * on the interface. * * The out-of-band messaging interface is actually implemented through - * the lam/oob mca module - details of a particular implementation + * the oob mca module - details of a particular implementation * will be found there. */ @@ -35,7 +35,7 @@ #include "lam_config.h" -#include "lam/types.h" +#include "types.h" #include "mca/mca.h" /* diff --git a/src/mca/pcm/base/base.h b/src/mca/pcm/base/base.h index 0224b36dd5..0bc9d7a994 100644 --- a/src/mca/pcm/base/base.h +++ b/src/mca/pcm/base/base.h @@ -8,9 +8,9 @@ #include "lam_config.h" -#include "lam/types.h" +#include "types.h" #include "mca/mca.h" -#include "mca/lam/pcm/pcm.h" +#include "mca/pcm/pcm.h" /* diff --git a/src/mca/pcm/base/pcm_base_close.c b/src/mca/pcm/base/pcm_base_close.c index 2aec8509f0..070d8cfcec 100644 --- a/src/mca/pcm/base/pcm_base_close.c +++ b/src/mca/pcm/base/pcm_base_close.c @@ -6,10 +6,10 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/pcm/pcm.h" +#include "mca/base/base.h" +#include "mca/pcm/pcm.h" int mca_pcm_base_close(void) diff --git a/src/mca/pcm/base/pcm_base_open.c b/src/mca/pcm/base/pcm_base_open.c index 9da9423ca2..6454320294 100644 --- a/src/mca/pcm/base/pcm_base_open.c +++ b/src/mca/pcm/base/pcm_base_open.c @@ -5,8 +5,8 @@ #include "lam_config.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/pcm/pcm.h" +#include "mca/base/base.h" +#include "mca/pcm/pcm.h" /* @@ -15,7 +15,7 @@ * module's public mca_base_module_t struct. */ -#include "mca/lam/pcm/base/static-modules.h" +#include "mca/pcm/base/static-modules.h" /* diff --git a/src/mca/pcm/base/pcm_base_select.c b/src/mca/pcm/base/pcm_base_select.c index ea1c04ec48..bc3ca9b678 100644 --- a/src/mca/pcm/base/pcm_base_select.c +++ b/src/mca/pcm/base/pcm_base_select.c @@ -6,11 +6,11 @@ #include -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" +#include "runtime/runtime.h" +#include "util/output.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/pcm/pcm.h" +#include "mca/base/base.h" +#include "mca/pcm/pcm.h" /** diff --git a/src/mca/pcm/cofs/src/pcm_cofs.c b/src/mca/pcm/cofs/src/pcm_cofs.c index b7c37b8562..fa1baae762 100644 --- a/src/mca/pcm/cofs/src/pcm_cofs.c +++ b/src/mca/pcm/cofs/src/pcm_cofs.c @@ -6,9 +6,9 @@ #include "lam_config.h" -#include "mca/lam/pcm/pcm.h" -#include "mca/lam/pcm/cofs/src/pcm_cofs.h" -#include "lam/types.h" +#include "mca/pcm/pcm.h" +#include "mca/pcm/cofs/src/pcm_cofs.h" +#include "types.h" #include #include diff --git a/src/mca/pcm/cofs/src/pcm_cofs.h b/src/mca/pcm/cofs/src/pcm_cofs.h index 78cda7ebb7..a7fda118cd 100644 --- a/src/mca/pcm/cofs/src/pcm_cofs.h +++ b/src/mca/pcm/cofs/src/pcm_cofs.h @@ -5,8 +5,8 @@ */ #include "lam_config.h" -#include "mca/lam/pcm/pcm.h" -#include "lam/types.h" +#include "mca/pcm/pcm.h" +#include "types.h" /* * Module open / close diff --git a/src/mca/pcm/cofs/src/pcm_cofs_module.c b/src/mca/pcm/cofs/src/pcm_cofs_module.c index 1b54782f72..6e772812a6 100644 --- a/src/mca/pcm/cofs/src/pcm_cofs_module.c +++ b/src/mca/pcm/cofs/src/pcm_cofs_module.c @@ -6,11 +6,11 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/types.h" +#include "constants.h" +#include "types.h" #include "mca/mca.h" -#include "mca/lam/pcm/pcm.h" -#include "mca/lam/pcm/cofs/src/pcm_cofs.h" +#include "mca/pcm/pcm.h" +#include "mca/pcm/cofs/src/pcm_cofs.h" #include #include @@ -71,7 +71,7 @@ int mca_pcm_cofs_open(void) { /* JMS/BWB: Register MCA params in here -- see - src/mca/lam/base/mca_base_param.h */ + src/mca/base/mca_base_param.h */ return LAM_SUCCESS; } @@ -97,7 +97,7 @@ mca_pcm_cofs_init(int *priority, bool *allow_multi_user_threads, *have_hidden_threads = false; /* BWB - remove printfs once things settle down some... */ - /* JMS: Look in src/mca/lam/base/mca_base_param.h */ + /* JMS: Look in src/mca/base/mca_base_param.h */ test_ret = getenv("MCA_common_lam_cofs_my_vpid"); if (test_ret == NULL) { printf("COFS PCM will not be running because MCA_common_lam_cofs_my_vpid not set\n"); diff --git a/src/mca/pcm/pcm.h b/src/mca/pcm/pcm.h index 3c5003096c..9a6d81d57b 100644 --- a/src/mca/pcm/pcm.h +++ b/src/mca/pcm/pcm.h @@ -19,7 +19,7 @@ * daemons will always provide the complete pcm interface. * * Like the other LAM run-time interfaces, the pcm interface is - * implemented through mca modules (lam/pcm). For details on the + * implemented through mca modules (pcm). For details on the * capabilities of a particular module, please see the individual * module's documentation. * @@ -57,7 +57,7 @@ #include "lam_config.h" #include "mca/mca.h" -#include "lam/types.h" +#include "types.h" #include diff --git a/src/mca/pcm/rsh/src/pcm_rsh.c b/src/mca/pcm/rsh/src/pcm_rsh.c index af68f36f3c..588eb13fc2 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh.c +++ b/src/mca/pcm/rsh/src/pcm_rsh.c @@ -6,10 +6,10 @@ #include "lam_config.h" -#include "mca/lam/pcm/pcm.h" -#include "mca/lam/pcm/rsh/src/pcm_rsh.h" -#include "lam/mem/malloc.h" -#include "lam/types.h" +#include "mca/pcm/pcm.h" +#include "mca/pcm/rsh/src/pcm_rsh.h" +#include "mem/malloc.h" +#include "types.h" #include #include diff --git a/src/mca/pcm/rsh/src/pcm_rsh.h b/src/mca/pcm/rsh/src/pcm_rsh.h index bdd7e53d8e..803f5c96c3 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh.h +++ b/src/mca/pcm/rsh/src/pcm_rsh.h @@ -5,8 +5,8 @@ */ #include "lam_config.h" -#include "mca/lam/pcm/pcm.h" -#include "lam/types.h" +#include "mca/pcm/pcm.h" +#include "types.h" #include diff --git a/src/mca/pcm/rsh/src/pcm_rsh_module.c b/src/mca/pcm/rsh/src/pcm_rsh_module.c index 1f16c60c04..a7253d0064 100644 --- a/src/mca/pcm/rsh/src/pcm_rsh_module.c +++ b/src/mca/pcm/rsh/src/pcm_rsh_module.c @@ -6,14 +6,14 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/types.h" -#include "lam/mem/malloc.h" -#include "lam/lfc/lam_list.h" +#include "constants.h" +#include "types.h" +#include "mem/malloc.h" +#include "lfc/lam_list.h" #include "mca/mca.h" -#include "mca/lam/base/mca_base_param.h" -#include "mca/lam/pcm/pcm.h" -#include "mca/lam/pcm/rsh/src/pcm_rsh.h" +#include "mca/base/mca_base_param.h" +#include "mca/pcm/pcm.h" +#include "mca/pcm/rsh/src/pcm_rsh.h" #include #include diff --git a/src/mca/pml/base/base.h b/src/mca/pml/base/base.h index a1f1562f57..25d89ece7c 100644 --- a/src/mca/pml/base/base.h +++ b/src/mca/pml/base/base.h @@ -8,7 +8,7 @@ #include "lam_config.h" #include "mca/mca.h" -#include "mca/mpi/pml/pml.h" +#include "mca/pml/pml.h" /* diff --git a/src/mca/pml/base/pml_base_close.c b/src/mca/pml/base/pml_base_close.c index 4230f36552..ae88979b7a 100644 --- a/src/mca/pml/base/pml_base_close.c +++ b/src/mca/pml/base/pml_base_close.c @@ -6,11 +6,11 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/base.h" +#include "mca/base/base.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/base.h" int mca_pml_base_close(void) diff --git a/src/mca/pml/base/pml_base_open.c b/src/mca/pml/base/pml_base_open.c index d412191507..a22efe9af6 100644 --- a/src/mca/pml/base/pml_base_open.c +++ b/src/mca/pml/base/pml_base_open.c @@ -7,9 +7,9 @@ #include #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/base.h" +#include "mca/base/base.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/base.h" /* @@ -18,7 +18,7 @@ * module's public mca_base_module_t struct. */ -#include "mca/mpi/pml/base/static-modules.h" +#include "mca/pml/base/static-modules.h" /* diff --git a/src/mca/pml/base/pml_base_request.c b/src/mca/pml/base/pml_base_request.c index 2db0df7ebc..1207c9e3f0 100644 --- a/src/mca/pml/base/pml_base_request.c +++ b/src/mca/pml/base/pml_base_request.c @@ -3,7 +3,7 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include "mca/mpi/pml/base/pml_base_request.h" +#include "mca/pml/base/pml_base_request.h" lam_class_t mca_pml_base_request_t_class = { "mca_pml_base_request_t", diff --git a/src/mca/pml/base/pml_base_request.h b/src/mca/pml/base/pml_base_request.h index c9c39a3c05..467fe9cd66 100644 --- a/src/mca/pml/base/pml_base_request.h +++ b/src/mca/pml/base/pml_base_request.h @@ -6,10 +6,10 @@ #ifndef MCA_PML_BASE_REQUEST_H #define MCA_PML_BASE_REQUEST_H -#include "lam/mem/free_list.h" -#include "mpi/request/request.h" -#include "mpi/datatype/datatype.h" -#include "mpi/communicator/communicator.h" +#include "mem/free_list.h" +#include "request/request.h" +#include "datatype/datatype.h" +#include "communicator/communicator.h" extern lam_class_t mca_pml_base_request_t_class; diff --git a/src/mca/pml/base/pml_base_select.c b/src/mca/pml/base/pml_base_select.c index 15c602a901..5bbd443d5c 100644 --- a/src/mca/pml/base/pml_base_select.c +++ b/src/mca/pml/base/pml_base_select.c @@ -4,12 +4,12 @@ #include "lam_config.h" -#include "lam/lfc/lam_list.h" -#include "lam/runtime/runtime.h" +#include "lfc/lam_list.h" +#include "runtime/runtime.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/base.h" +#include "mca/base/base.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/base.h" typedef struct opened_module_t { diff --git a/src/mca/pml/pml.h b/src/mca/pml/pml.h index 3588416fb0..2fac996c89 100644 --- a/src/mca/pml/pml.h +++ b/src/mca/pml/pml.h @@ -6,11 +6,11 @@ #define MCA_PML_H #include "lam_config.h" -#include "lam/lam.h" -#include "lam/lfc/lam_list.h" -#include "mpi/communicator/communicator.h" -#include "mpi/datatype/datatype.h" -#include "mpi/request/request.h" +#include "lam.h" +#include "lfc/lam_list.h" +#include "communicator/communicator.h" +#include "datatype/datatype.h" +#include "request/request.h" #include "mca/mca.h" #include "mpi.h" /* needed for MPI_ANY_TAG */ diff --git a/src/mca/pml/teg/src/pml_ptl_array.h b/src/mca/pml/teg/src/pml_ptl_array.h index 7cf0c4959d..f03f192ee3 100644 --- a/src/mca/pml/teg/src/pml_ptl_array.h +++ b/src/mca/pml/teg/src/pml_ptl_array.h @@ -5,8 +5,8 @@ #ifndef LAM_PTL_ARRAY_H #define LAM_PTL_ARRAY_H -#include "lam/util/output.h" -#include "mca/mpi/ptl/ptl.h" +#include "util/output.h" +#include "mca/ptl/ptl.h" extern lam_class_t mca_pml_teg_ptl_array_t_class; diff --git a/src/mca/pml/teg/src/pml_teg.c b/src/mca/pml/teg/src/pml_teg.c index 41970b7062..064f30ef48 100644 --- a/src/mca/pml/teg/src/pml_teg.c +++ b/src/mca/pml/teg/src/pml_teg.c @@ -3,13 +3,13 @@ */ #include -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" -#include "mca/mpi/ptl/base/ptl_base_comm.h" -#include "mca/mpi/ptl/base/ptl_base_header.h" -#include "mca/mpi/ptl/base/ptl_base_recvfrag.h" -#include "mca/mpi/ptl/base/ptl_base_sendfrag.h" +#include "mca/pml/pml.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" +#include "mca/ptl/base/ptl_base_comm.h" +#include "mca/ptl/base/ptl_base_header.h" +#include "mca/ptl/base/ptl_base_recvfrag.h" +#include "mca/ptl/base/ptl_base_sendfrag.h" #include "pml_teg.h" #include "pml_teg_proc.h" #include "pml_teg_recvreq.h" diff --git a/src/mca/pml/teg/src/pml_teg.h b/src/mca/pml/teg/src/pml_teg.h index ae0b6e64b0..78739458d6 100644 --- a/src/mca/pml/teg/src/pml_teg.h +++ b/src/mca/pml/teg/src/pml_teg.h @@ -10,14 +10,14 @@ #ifndef MCA_PML_TEG_H #define MCA_PML_TEG_H -#include "lam/threads/thread.h" -#include "lam/threads/condition.h" -#include "lam/mem/free_list.h" -#include "lam/util/cmd_line.h" -#include "mpi/request/request.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/pml_base_request.h" -#include "mca/mpi/ptl/ptl.h" +#include "threads/thread.h" +#include "threads/condition.h" +#include "mem/free_list.h" +#include "util/cmd_line.h" +#include "request/request.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/pml_base_request.h" +#include "mca/ptl/ptl.h" /** diff --git a/src/mca/pml/teg/src/pml_teg_module.c b/src/mca/pml/teg/src/pml_teg_module.c index 62629d5b30..f4a39f4908 100644 --- a/src/mca/pml/teg/src/pml_teg_module.c +++ b/src/mca/pml/teg/src/pml_teg_module.c @@ -2,13 +2,13 @@ * $HEADER$ */ -#include "lam/event/event.h" +#include "event/event.h" #include "mpi.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/lam/base/mca_base_param.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" -#include "mca/mpi/ptl/base/ptl_base_recvreq.h" +#include "mca/pml/pml.h" +#include "mca/ptl/ptl.h" +#include "mca/base/mca_base_param.h" +#include "mca/ptl/base/ptl_base_sendreq.h" +#include "mca/ptl/base/ptl_base_recvreq.h" #include "pml_teg.h" #include "pml_teg_proc.h" diff --git a/src/mca/pml/teg/src/pml_teg_proc.c b/src/mca/pml/teg/src/pml_teg_proc.c index 2836c7d307..72445ad31f 100644 --- a/src/mca/pml/teg/src/pml_teg_proc.c +++ b/src/mca/pml/teg/src/pml_teg_proc.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "lam/atomic.h" +#include "atomic.h" #include "pml_teg.h" #include "pml_teg_proc.h" #include "pml_ptl_array.h" diff --git a/src/mca/pml/teg/src/pml_teg_proc.h b/src/mca/pml/teg/src/pml_teg_proc.h index d7b4eefa43..8b388d7852 100644 --- a/src/mca/pml/teg/src/pml_teg_proc.h +++ b/src/mca/pml/teg/src/pml_teg_proc.h @@ -5,10 +5,10 @@ #ifndef MCA_PML_PROC_H #define MCA_PML_PROC_H -#include "lam/threads/mutex.h" -#include "mpi/communicator/communicator.h" -#include "mpi/group/group.h" -#include "mpi/proc/proc.h" +#include "threads/mutex.h" +#include "communicator/communicator.h" +#include "group/group.h" +#include "proc/proc.h" #include "pml_ptl_array.h" /* diff --git a/src/mca/pml/teg/src/pml_teg_recvreq.c b/src/mca/pml/teg/src/pml_teg_recvreq.c index c2a1733a5d..6135d139d1 100644 --- a/src/mca/pml/teg/src/pml_teg_recvreq.c +++ b/src/mca/pml/teg/src/pml_teg_recvreq.c @@ -1,4 +1,4 @@ -#include "mca/mpi/ptl/base/ptl_base_comm.h" +#include "mca/ptl/base/ptl_base_comm.h" #include "pml_teg_recvreq.h" diff --git a/src/mca/pml/teg/src/pml_teg_recvreq.h b/src/mca/pml/teg/src/pml_teg_recvreq.h index 7eb5679abb..7a1a6070d7 100644 --- a/src/mca/pml/teg/src/pml_teg_recvreq.h +++ b/src/mca/pml/teg/src/pml_teg_recvreq.h @@ -7,8 +7,8 @@ #include "pml_teg.h" #include "pml_teg_proc.h" -#include "mca/mpi/ptl/base/ptl_base_recvreq.h" -#include "mca/mpi/ptl/base/ptl_base_recvfrag.h" +#include "mca/ptl/base/ptl_base_recvreq.h" +#include "mca/ptl/base/ptl_base_recvfrag.h" /* diff --git a/src/mca/pml/teg/src/pml_teg_sendreq.c b/src/mca/pml/teg/src/pml_teg_sendreq.c index 2e28a14a8d..91291ea948 100644 --- a/src/mca/pml/teg/src/pml_teg_sendreq.c +++ b/src/mca/pml/teg/src/pml_teg_sendreq.c @@ -3,8 +3,8 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include "lam/constants.h" -#include "mca/mpi/ptl/ptl.h" +#include "constants.h" +#include "mca/ptl/ptl.h" #include "pml_teg.h" #include "pml_teg_proc.h" #include "pml_teg_sendreq.h" diff --git a/src/mca/pml/teg/src/pml_teg_sendreq.h b/src/mca/pml/teg/src/pml_teg_sendreq.h index 81a9e079f1..120a1eb13e 100644 --- a/src/mca/pml/teg/src/pml_teg_sendreq.h +++ b/src/mca/pml/teg/src/pml_teg_sendreq.h @@ -6,9 +6,9 @@ #define LAM_PML_TEG_SEND_REQUEST_H #include "pml_teg_proc.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" -#include "mca/mpi/ptl/base/ptl_base_sendfrag.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_sendreq.h" +#include "mca/ptl/base/ptl_base_sendfrag.h" void mca_pml_teg_send_request_schedule(mca_ptl_base_send_request_t* req); diff --git a/src/mca/pml/teg/src/pml_teg_wait.c b/src/mca/pml/teg/src/pml_teg_wait.c index 022859637e..6a6a9ccff0 100644 --- a/src/mca/pml/teg/src/pml_teg_wait.c +++ b/src/mca/pml/teg/src/pml_teg_wait.c @@ -1,6 +1,6 @@ #include "pml_teg.h" -#include "mca/mpi/ptl/base/ptl_base_comm.h" -#include "mca/mpi/pml/base/pml_base_request.h" +#include "mca/ptl/base/ptl_base_comm.h" +#include "mca/pml/base/pml_base_request.h" diff --git a/src/mca/ptl/base/base.h b/src/mca/ptl/base/base.h index b9733851e0..881827f227 100644 --- a/src/mca/ptl/base/base.h +++ b/src/mca/ptl/base/base.h @@ -7,9 +7,9 @@ #include "lam_config.h" -#include "lam/lfc/lam_list.h" +#include "lfc/lam_list.h" #include "mca/mca.h" -#include "mca/mpi/ptl/ptl.h" +#include "mca/ptl/ptl.h" struct mca_ptl_base_selected_module_t { diff --git a/src/mca/ptl/base/ptl_base_close.c b/src/mca/ptl/base/ptl_base_close.c index 988130876a..5686031c3a 100644 --- a/src/mca/ptl/base/ptl_base_close.c +++ b/src/mca/ptl/base/ptl_base_close.c @@ -6,11 +6,11 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" +#include "mca/base/base.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" int mca_ptl_base_close(void) diff --git a/src/mca/ptl/base/ptl_base_comm.h b/src/mca/ptl/base/ptl_base_comm.h index ae301e039d..b79271d59a 100644 --- a/src/mca/ptl/base/ptl_base_comm.h +++ b/src/mca/ptl/base/ptl_base_comm.h @@ -1,10 +1,10 @@ #ifndef MCA_PML_COMM_H #define MCA_PML_COMM_H -#include "lam/threads/mutex.h" -#include "lam/threads/condition.h" -#include "mca/mpi/ptl/ptl.h" -#include "lam/lfc/lam_list.h" +#include "threads/mutex.h" +#include "threads/condition.h" +#include "mca/ptl/ptl.h" +#include "lfc/lam_list.h" /* * Structure associated w/ lam_communicator_t that contains data diff --git a/src/mca/ptl/base/ptl_base_fragment.c b/src/mca/ptl/base/ptl_base_fragment.c index fbc5197acd..2ed837df57 100644 --- a/src/mca/ptl/base/ptl_base_fragment.c +++ b/src/mca/ptl/base/ptl_base_fragment.c @@ -3,8 +3,8 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include "lam/lfc/lam_list.h" -#include "mca/mpi/ptl/base/ptl_base_fragment.h" +#include "lfc/lam_list.h" +#include "mca/ptl/base/ptl_base_fragment.h" static void mca_ptl_base_frag_construct(mca_ptl_base_frag_t* frag); static void mca_ptl_base_frag_destruct(mca_ptl_base_frag_t* frag); diff --git a/src/mca/ptl/base/ptl_base_fragment.h b/src/mca/ptl/base/ptl_base_fragment.h index c529ba7956..99ec041a8a 100644 --- a/src/mca/ptl/base/ptl_base_fragment.h +++ b/src/mca/ptl/base/ptl_base_fragment.h @@ -6,9 +6,9 @@ #ifndef MCA_PML_BASE_FRAGMENT_H #define MCA_PML_BASE_FRAGMENT_H -#include "lam/lfc/lam_list.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_header.h" +#include "lfc/lam_list.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_header.h" extern lam_class_t mca_ptl_base_frag_t_class; diff --git a/src/mca/ptl/base/ptl_base_header.h b/src/mca/ptl/base/ptl_base_header.h index 1df311025f..7dac91e2eb 100644 --- a/src/mca/ptl/base/ptl_base_header.h +++ b/src/mca/ptl/base/ptl_base_header.h @@ -5,7 +5,7 @@ #ifndef MCA_PTL_BASE_HEADER_H #define MCA_PTL_BASE_HEADER_H -#include "mca/mpi/ptl/ptl.h" +#include "mca/ptl/ptl.h" #define MCA_PTL_HDR_TYPE_MATCH 0 diff --git a/src/mca/ptl/base/ptl_base_match.c b/src/mca/ptl/base/ptl_base_match.c index a7fce738bd..919c5c5ab7 100644 --- a/src/mca/ptl/base/ptl_base_match.c +++ b/src/mca/ptl/base/ptl_base_match.c @@ -6,16 +6,16 @@ #include -#include "lam/lfc/lam_list.h" -#include "lam/threads/mutex.h" -#include "lam/constants.h" -#include "mpi/communicator/communicator.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_comm.h" -#include "mca/mpi/ptl/base/ptl_base_recvfrag.h" -#include "mca/mpi/ptl/base/ptl_base_header.h" -#include "mca/mpi/ptl/base/ptl_base_match.h" +#include "lfc/lam_list.h" +#include "threads/mutex.h" +#include "constants.h" +#include "communicator/communicator.h" +#include "mca/pml/pml.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_comm.h" +#include "mca/ptl/base/ptl_base_recvfrag.h" +#include "mca/ptl/base/ptl_base_header.h" +#include "mca/ptl/base/ptl_base_match.h" /* diff --git a/src/mca/ptl/base/ptl_base_open.c b/src/mca/ptl/base/ptl_base_open.c index 0fa2dee0ca..b5a6527767 100644 --- a/src/mca/ptl/base/ptl_base_open.c +++ b/src/mca/ptl/base/ptl_base_open.c @@ -7,9 +7,9 @@ #include #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" +#include "mca/base/base.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" /* @@ -18,7 +18,7 @@ * module's public mca_base_module_t struct. */ -#include "mca/mpi/ptl/base/static-modules.h" +#include "mca/ptl/base/static-modules.h" /* diff --git a/src/mca/ptl/base/ptl_base_recvfrag.c b/src/mca/ptl/base/ptl_base_recvfrag.c index 56aef8e9cf..6fa070bcdb 100644 --- a/src/mca/ptl/base/ptl_base_recvfrag.c +++ b/src/mca/ptl/base/ptl_base_recvfrag.c @@ -3,9 +3,9 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_recvfrag.h" -#include "mca/mpi/ptl/base/ptl_base_match.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_recvfrag.h" +#include "mca/ptl/base/ptl_base_match.h" static void mca_ptl_base_recv_frag_construct(mca_ptl_base_recv_frag_t* frag); static void mca_ptl_base_recv_frag_destruct(mca_ptl_base_recv_frag_t* frag); diff --git a/src/mca/ptl/base/ptl_base_recvfrag.h b/src/mca/ptl/base/ptl_base_recvfrag.h index 3fa41b8e37..a3ac539ba5 100644 --- a/src/mca/ptl/base/ptl_base_recvfrag.h +++ b/src/mca/ptl/base/ptl_base_recvfrag.h @@ -6,10 +6,10 @@ #ifndef MCA_PTL_BASE_RECVFRAG_H #define MCA_PTL_BASE_RECVFRAG_H -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_fragment.h" -#include "mca/mpi/ptl/base/ptl_base_recvreq.h" -#include "mca/mpi/ptl/base/ptl_base_match.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_fragment.h" +#include "mca/ptl/base/ptl_base_recvreq.h" +#include "mca/ptl/base/ptl_base_match.h" extern lam_class_t mca_ptl_base_recv_frag_t_class; diff --git a/src/mca/ptl/base/ptl_base_recvreq.c b/src/mca/ptl/base/ptl_base_recvreq.c index bd96655e2a..085cc6185f 100644 --- a/src/mca/ptl/base/ptl_base_recvreq.c +++ b/src/mca/ptl/base/ptl_base_recvreq.c @@ -3,10 +3,10 @@ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ -#include "lam/types.h" -#include "mca/mpi/ptl/base/ptl_base_comm.h" -#include "mca/mpi/ptl/base/ptl_base_recvreq.h" -#include "mca/mpi/ptl/base/ptl_base_recvfrag.h" +#include "types.h" +#include "mca/ptl/base/ptl_base_comm.h" +#include "mca/ptl/base/ptl_base_recvreq.h" +#include "mca/ptl/base/ptl_base_recvfrag.h" static void mca_ptl_base_recv_request_construct(mca_ptl_base_recv_request_t*); diff --git a/src/mca/ptl/base/ptl_base_recvreq.h b/src/mca/ptl/base/ptl_base_recvreq.h index dae649768a..2e197bbf70 100644 --- a/src/mca/ptl/base/ptl_base_recvreq.h +++ b/src/mca/ptl/base/ptl_base_recvreq.h @@ -5,8 +5,8 @@ #ifndef MCA_PML_BASE_RECV_REQUEST_H #define MCA_PML_BASE_RECV_REQUEST_H -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/pml/base/pml_base_request.h" +#include "mca/ptl/ptl.h" +#include "mca/pml/base/pml_base_request.h" extern lam_class_t mca_ptl_base_recv_request_t_class;; struct mca_ptl_base_recv_frag_t; diff --git a/src/mca/ptl/base/ptl_base_select.c b/src/mca/ptl/base/ptl_base_select.c index 375b999e9c..6943dc42f5 100644 --- a/src/mca/ptl/base/ptl_base_select.c +++ b/src/mca/ptl/base/ptl_base_select.c @@ -4,11 +4,11 @@ #include "lam_config.h" -#include "lam/runtime/runtime.h" +#include "runtime/runtime.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" +#include "mca/base/base.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" /** diff --git a/src/mca/ptl/base/ptl_base_sendfrag.c b/src/mca/ptl/base/ptl_base_sendfrag.c index 1409571408..1395bd57de 100644 --- a/src/mca/ptl/base/ptl_base_sendfrag.c +++ b/src/mca/ptl/base/ptl_base_sendfrag.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "mca/mpi/ptl/base/ptl_base_sendfrag.h" +#include "mca/ptl/base/ptl_base_sendfrag.h" static void mca_ptl_base_send_frag_construct(mca_ptl_base_send_frag_t* frag); static void mca_ptl_base_send_frag_destruct(mca_ptl_base_send_frag_t* frag); diff --git a/src/mca/ptl/base/ptl_base_sendfrag.h b/src/mca/ptl/base/ptl_base_sendfrag.h index a92b340ea1..d5454ff0c5 100644 --- a/src/mca/ptl/base/ptl_base_sendfrag.h +++ b/src/mca/ptl/base/ptl_base_sendfrag.h @@ -4,8 +4,8 @@ #ifndef MCA_PTL_BASE_SEND_FRAG_H #define MCA_PTL_BASE_SEND_FRAG_H -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_fragment.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_fragment.h" extern lam_class_t mca_ptl_base_send_frag_t_class; diff --git a/src/mca/ptl/base/ptl_base_sendreq.c b/src/mca/ptl/base/ptl_base_sendreq.c index 945fe0be6d..557282d8be 100644 --- a/src/mca/ptl/base/ptl_base_sendreq.c +++ b/src/mca/ptl/base/ptl_base_sendreq.c @@ -1,8 +1,8 @@ /* * $HEADER$ */ -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" -#include "mca/mpi/ptl/base/ptl_base_sendfrag.h" +#include "mca/ptl/base/ptl_base_sendreq.h" +#include "mca/ptl/base/ptl_base_sendfrag.h" static void mca_ptl_base_send_request_construct(mca_ptl_base_send_request_t* req); static void mca_ptl_base_send_request_destruct(mca_ptl_base_send_request_t* req); diff --git a/src/mca/ptl/base/ptl_base_sendreq.h b/src/mca/ptl/base/ptl_base_sendreq.h index 86bbc10e17..c9ac31b0a3 100644 --- a/src/mca/ptl/base/ptl_base_sendreq.h +++ b/src/mca/ptl/base/ptl_base_sendreq.h @@ -7,9 +7,9 @@ #include "lam_config.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/pml/base/pml_base_request.h" -#include "mca/mpi/ptl/base/ptl_base_comm.h" +#include "mca/ptl/ptl.h" +#include "mca/pml/base/pml_base_request.h" +#include "mca/ptl/base/ptl_base_comm.h" extern lam_class_t mca_ptl_base_send_request_t_class; diff --git a/src/mca/ptl/ptl.h b/src/mca/ptl/ptl.h index bdfd619196..fc1a190b3c 100644 --- a/src/mca/ptl/ptl.h +++ b/src/mca/ptl/ptl.h @@ -8,10 +8,10 @@ #define MCA_PTL_H #include "mca/mca.h" -#include "lam/lam.h" -#include "lam/lfc/lam_list.h" -#include "mpi/proc/proc.h" -#include "mca/mpi/pml/pml.h" +#include "lam.h" +#include "lfc/lam_list.h" +#include "proc/proc.h" +#include "mca/pml/pml.h" /* diff --git a/src/mca/ptl/tcp/src/ptl_tcp.c b/src/mca/ptl/tcp/src/ptl_tcp.c index f497047804..a781aa406c 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.c +++ b/src/mca/ptl/tcp/src/ptl_tcp.c @@ -2,16 +2,16 @@ * $HEADER$ */ -#include "lam/util/output.h" -#include "lam/util/if.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_header.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" -#include "mca/mpi/ptl/base/ptl_base_sendfrag.h" -#include "mca/mpi/ptl/base/ptl_base_recvreq.h" -#include "mca/mpi/ptl/base/ptl_base_recvfrag.h" -#include "mca/lam/base/mca_base_module_exchange.h" +#include "util/output.h" +#include "util/if.h" +#include "mca/pml/pml.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_header.h" +#include "mca/ptl/base/ptl_base_sendreq.h" +#include "mca/ptl/base/ptl_base_sendfrag.h" +#include "mca/ptl/base/ptl_base_recvreq.h" +#include "mca/ptl/base/ptl_base_recvfrag.h" +#include "mca/base/mca_base_module_exchange.h" #include "ptl_tcp.h" #include "ptl_tcp_addr.h" #include "ptl_tcp_peer.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp.h b/src/mca/ptl/tcp/src/ptl_tcp.h index cce2f81da1..787ab122bd 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.h +++ b/src/mca/ptl/tcp/src/ptl_tcp.h @@ -9,10 +9,10 @@ #include #include #include -#include "lam/mem/free_list.h" -#include "lam/event/event.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/ptl/ptl.h" +#include "mem/free_list.h" +#include "event/event.h" +#include "mca/pml/pml.h" +#include "mca/ptl/ptl.h" /* diff --git a/src/mca/ptl/tcp/src/ptl_tcp_module.c b/src/mca/ptl/tcp/src/ptl_tcp_module.c index c946cbdd12..7ebb52a781 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_module.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_module.c @@ -9,16 +9,16 @@ #include #include -#include "lam/constants.h" -#include "lam/event/event.h" -#include "lam/util/if.h" -#include "lam/util/argv.h" -#include "lam/util/output.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" -#include "mca/lam/base/mca_base_param.h" -#include "mca/lam/base/mca_base_module_exchange.h" +#include "constants.h" +#include "event/event.h" +#include "util/if.h" +#include "util/argv.h" +#include "util/output.h" +#include "mca/pml/pml.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_sendreq.h" +#include "mca/base/mca_base_param.h" +#include "mca/base/mca_base_module_exchange.h" #include "ptl_tcp.h" #include "ptl_tcp_addr.h" #include "ptl_tcp_proc.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_peer.c b/src/mca/ptl/tcp/src/ptl_tcp_peer.c index 9ebf47fff3..7bbf047948 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_peer.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_peer.c @@ -6,8 +6,8 @@ #include #include #include -#include "lam/types.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" +#include "types.h" +#include "mca/ptl/base/ptl_base_sendreq.h" #include "ptl_tcp.h" #include "ptl_tcp_addr.h" #include "ptl_tcp_peer.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_peer.h b/src/mca/ptl/tcp/src/ptl_tcp_peer.h index 4723b5b4ea..1079cf591f 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_peer.h +++ b/src/mca/ptl/tcp/src/ptl_tcp_peer.h @@ -9,10 +9,10 @@ #include #include #include -#include "lam/lfc/lam_list.h" -#include "lam/event/event.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/ptl/ptl.h" +#include "lfc/lam_list.h" +#include "event/event.h" +#include "mca/pml/pml.h" +#include "mca/ptl/ptl.h" #include "ptl_tcp_recvfrag.h" #include "ptl_tcp_sendfrag.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_proc.c b/src/mca/ptl/tcp/src/ptl_tcp_proc.c index f9a30f5274..df8e324124 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_proc.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_proc.c @@ -1,9 +1,9 @@ /* * $HEADER$ */ -#include "lam/atomic.h" -#include "lam/lfc/lam_hash_table.h" -#include "mca/lam/base/mca_base_module_exchange.h" +#include "atomic.h" +#include "lfc/lam_hash_table.h" +#include "mca/base/mca_base_module_exchange.h" #include "ptl_tcp.h" #include "ptl_tcp_addr.h" #include "ptl_tcp_peer.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_proc.h b/src/mca/ptl/tcp/src/ptl_tcp_proc.h index bfec38755d..f1b2a17ecd 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_proc.h +++ b/src/mca/ptl/tcp/src/ptl_tcp_proc.h @@ -9,8 +9,8 @@ #include #include #include -#include "lam/lfc/lam_object.h" -#include "mpi/proc/proc.h" +#include "lfc/lam_object.h" +#include "proc/proc.h" #include "ptl_tcp.h" #include "ptl_tcp_peer.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c b/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c index cd3f479896..347b12669a 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.c @@ -4,7 +4,7 @@ #include #include #include -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" +#include "mca/ptl/base/ptl_base_sendreq.h" #include "ptl_tcp.h" #include "ptl_tcp_peer.h" #include "ptl_tcp_recvfrag.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.h b/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.h index a4a4c4262d..2e4065a463 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.h +++ b/src/mca/ptl/tcp/src/ptl_tcp_recvfrag.h @@ -9,8 +9,8 @@ #include #include #include -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/ptl_base_recvfrag.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/ptl_base_recvfrag.h" #include "ptl_tcp.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c index 7cfbcac20e..e4338a5b0c 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.c @@ -4,8 +4,8 @@ #include #include #include -#include "lam/types.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" +#include "types.h" +#include "mca/ptl/base/ptl_base_sendreq.h" #include "ptl_tcp.h" #include "ptl_tcp_peer.h" #include "ptl_tcp_sendfrag.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h index 7f0ea07f62..275fa8592d 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h +++ b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h @@ -10,8 +10,8 @@ #include #include #include "lam_config.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" -#include "mca/mpi/ptl/base/ptl_base_sendfrag.h" +#include "mca/ptl/base/ptl_base_sendreq.h" +#include "mca/ptl/base/ptl_base_sendfrag.h" #include "ptl_tcp.h" #include "ptl_tcp_recvfrag.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c b/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c index 9b9ff0b0a2..34ea02d962 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_sendreq.c @@ -4,8 +4,8 @@ #include #include #include -#include "lam/types.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" +#include "types.h" +#include "mca/ptl/base/ptl_base_sendreq.h" #include "ptl_tcp.h" #include "ptl_tcp_sendreq.h" diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendreq.h b/src/mca/ptl/tcp/src/ptl_tcp_sendreq.h index f72bb7acf4..b2bc15be78 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_sendreq.h +++ b/src/mca/ptl/tcp/src/ptl_tcp_sendreq.h @@ -10,7 +10,7 @@ #include #include #include "lam_config.h" -#include "mca/mpi/ptl/base/ptl_base_sendreq.h" +#include "mca/ptl/base/ptl_base_sendreq.h" #include "ptl_tcp_sendfrag.h" diff --git a/src/mca/registry/base/base.h b/src/mca/registry/base/base.h index 17026c1cd9..7ea3888c4a 100644 --- a/src/mca/registry/base/base.h +++ b/src/mca/registry/base/base.h @@ -9,7 +9,7 @@ #include "lam_config.h" #include "mca/mca.h" -#include "mca/lam/registry/registry.h" +#include "mca/registry/registry.h" /* * Global functions for MCA overall collective open and close diff --git a/src/mca/registry/base/registry_base_close.c b/src/mca/registry/base/registry_base_close.c index 2b9193c291..b0a01e02cf 100644 --- a/src/mca/registry/base/registry_base_close.c +++ b/src/mca/registry/base/registry_base_close.c @@ -6,11 +6,11 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/registry/registry.h" -#include "mca/lam/registry/base/base.h" +#include "mca/base/base.h" +#include "mca/registry/registry.h" +#include "mca/registry/base/base.h" int mca_registry_base_close(void) diff --git a/src/mca/registry/base/registry_base_open.c b/src/mca/registry/base/registry_base_open.c index 4acdc2fa01..bcd7f5fbb5 100644 --- a/src/mca/registry/base/registry_base_open.c +++ b/src/mca/registry/base/registry_base_open.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/registry/registry.h" -#include "mca/lam/registry/base/base.h" +#include "mca/base/base.h" +#include "mca/registry/registry.h" +#include "mca/registry/base/base.h" /* @@ -16,7 +16,7 @@ * module's public mca_base_module_t struct. */ -#include "mca/lam/registry/base/static-modules.h" +#include "mca/registry/base/static-modules.h" /* diff --git a/src/mca/registry/base/registry_base_select.c b/src/mca/registry/base/registry_base_select.c index cf2781e474..7ebd1175ef 100644 --- a/src/mca/registry/base/registry_base_select.c +++ b/src/mca/registry/base/registry_base_select.c @@ -6,12 +6,12 @@ #include -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" +#include "runtime/runtime.h" +#include "util/output.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/lam/registry/registry.h" -#include "mca/lam/registry/base/base.h" +#include "mca/base/base.h" +#include "mca/registry/registry.h" +#include "mca/registry/base/base.h" /** diff --git a/src/mca/registry/cofs/src/registry_cofs.c b/src/mca/registry/cofs/src/registry_cofs.c index a73eba6cc7..c2526bec6c 100644 --- a/src/mca/registry/cofs/src/registry_cofs.c +++ b/src/mca/registry/cofs/src/registry_cofs.c @@ -6,9 +6,9 @@ #include "lam_config.h" -#include "mca/lam/registry/registry.h" -#include "mca/lam/registry/cofs/src/registry_cofs.h" -#include "lam/types.h" +#include "mca/registry/registry.h" +#include "mca/registry/cofs/src/registry_cofs.h" +#include "types.h" #include #include diff --git a/src/mca/registry/cofs/src/registry_cofs.h b/src/mca/registry/cofs/src/registry_cofs.h index 578efb62b6..2c2db12778 100644 --- a/src/mca/registry/cofs/src/registry_cofs.h +++ b/src/mca/registry/cofs/src/registry_cofs.h @@ -5,8 +5,8 @@ */ #include "lam_config.h" -#include "mca/lam/registry/registry.h" -#include "lam/types.h" +#include "mca/registry/registry.h" +#include "types.h" /* * Module open / close diff --git a/src/mca/registry/cofs/src/registry_cofs_module.c b/src/mca/registry/cofs/src/registry_cofs_module.c index c797996596..f8f7c8d361 100644 --- a/src/mca/registry/cofs/src/registry_cofs_module.c +++ b/src/mca/registry/cofs/src/registry_cofs_module.c @@ -6,11 +6,11 @@ #include "lam_config.h" -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/registry/registry.h" -#include "mca/lam/registry/cofs/src/registry_cofs.h" -#include "lam/types.h" +#include "mca/registry/registry.h" +#include "mca/registry/cofs/src/registry_cofs.h" +#include "types.h" #include #include diff --git a/src/mca/topo/base/base.h b/src/mca/topo/base/base.h index bb59612876..6c9020a63e 100644 --- a/src/mca/topo/base/base.h +++ b/src/mca/topo/base/base.h @@ -8,7 +8,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mca/mpi/topo/topo.h" +#include "mca/topo/topo.h" /* * All stuff goes in here diff --git a/src/mca/topo/base/topo_base_close.c b/src/mca/topo/base/topo_base_close.c index 14321dbce1..b62dd2ebf9 100644 --- a/src/mca/topo/base/topo_base_close.c +++ b/src/mca/topo/base/topo_base_close.c @@ -5,11 +5,11 @@ #include -#include "lam/constants.h" +#include "constants.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "mca/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" int mca_topo_base_close(void) { extern lam_list_t mca_topo_base_modules_available; diff --git a/src/mca/topo/base/topo_base_open.c b/src/mca/topo/base/topo_base_open.c index 434b50da4b..1c7086e76f 100644 --- a/src/mca/topo/base/topo_base_open.c +++ b/src/mca/topo/base/topo_base_open.c @@ -6,15 +6,15 @@ #include #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/topo/base/base.h" +#include "mca/base/base.h" +#include "mca/topo/base/base.h" /* * The static-module.h is generated by the configure script. It contains * statements and the definition of an array of pointers to each module's * public mca_base_module_t struct. */ -#include "mca/mpi/topo/base/static-modules.h" +#include "mca/topo/base/static-modules.h" /* * Global variables diff --git a/src/mca/topo/base/topo_base_select.c b/src/mca/topo/base/topo_base_select.c index d8e4b110af..7e3620830c 100644 --- a/src/mca/topo/base/topo_base_select.c +++ b/src/mca/topo/base/topo_base_select.c @@ -5,12 +5,12 @@ #include "lam_config.h" #include "mca/mca.h" -#include "lam/lfc/lam_list.h" -#include "lam/runtime/runtime.h" +#include "lfc/lam_list.h" +#include "runtime/runtime.h" #include "mca/mca.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/topo/topo.h" -#include "mca/mpi/topo/base/base.h" +#include "mca/base/base.h" +#include "mca/topo/topo.h" +#include "mca/topo/base/base.h" /* diff --git a/src/mca/topo/topo.h b/src/mca/topo/topo.h index d93a66799f..93e8090044 100644 --- a/src/mca/topo/topo.h +++ b/src/mca/topo/topo.h @@ -9,8 +9,8 @@ #include "mpi.h" #include "mca/mca.h" -#include "mca/mpi/base/base.h" -#include "mpi/communicator/communicator.h" +#include "mca/base/base.h" +#include "communicator/communicator.h" /* * ****************************************************************** diff --git a/src/mca/topo/unity/src/cart_map.c b/src/mca/topo/unity/src/cart_map.c index 24f5e9d253..db48e911fc 100644 --- a/src/mca/topo/unity/src/cart_map.c +++ b/src/mca/topo/unity/src/cart_map.c @@ -1,7 +1,7 @@ /* * $HEADER$ */ -#include "mca/mpi/topo/unity/topo_unity.h" +#include "mca/topo/unity/topo_unity.h" /* * function - mca_topo_unity_cart_map diff --git a/src/mca/topo/unity/src/graph_map.c b/src/mca/topo/unity/src/graph_map.c index 9466b44a2f..4d5ff2cda4 100644 --- a/src/mca/topo/unity/src/graph_map.c +++ b/src/mca/topo/unity/src/graph_map.c @@ -1,7 +1,7 @@ /* * $HEADER$ */ -#include "mca/mpi/topo/unity/topo_unity.h" +#include "mca/topo/unity/topo_unity.h" /* * function - mca_topo_unity_graph_map diff --git a/src/mca/topo/unity/src/topo_unity.c b/src/mca/topo/unity/src/topo_unity.c index b777fb26ed..ea90b43882 100644 --- a/src/mca/topo/unity/src/topo_unity.c +++ b/src/mca/topo/unity/src/topo_unity.c @@ -1,7 +1,7 @@ /* * $HEADER$ */ -#include "mca/mpi/topo/unity/topo_unity.h" +#include "mca/topo/unity/topo_unity.h" /* * Init on the communicator. This function is called once the diff --git a/src/mca/topo/unity/src/topo_unity.h b/src/mca/topo/unity/src/topo_unity.h index df79ec6309..bbd2ff2405 100644 --- a/src/mca/topo/unity/src/topo_unity.h +++ b/src/mca/topo/unity/src/topo_unity.h @@ -9,11 +9,11 @@ #ifndef MCA_TOPO_UNTIY_H #define MCA_TOPO_UNTIY_H -#include "lam/threads/condition.h" -#include "lam/mem/free_list.h" -#include "lam/util/cmd_line.h" -#include "mpi/request/request.h" -#include "mca/mpi/topo/topo.h" +#include "threads/condition.h" +#include "mem/free_list.h" +#include "util/cmd_line.h" +#include "request/request.h" +#include "mca/topo/topo.h" /* * This structure is the interface to the MCA world. It contains the diff --git a/src/mca/topo/unity/src/topo_unity_module.c b/src/mca/topo/unity/src/topo_unity_module.c index 0d9a7a25aa..1355d7b10e 100644 --- a/src/mca/topo/unity/src/topo_unity_module.c +++ b/src/mca/topo/unity/src/topo_unity_module.c @@ -8,7 +8,7 @@ * modules just to query their version and parameters */ -#include "mca/mpi/topo/unity/topo_unity,h" +#include "mca/topo/unity/topo_unity,h" /* * Public string showing the topo unity module version number diff --git a/src/mem/allocator.c b/src/mem/allocator.c index 630dfc83a0..38ba09f865 100644 --- a/src/mem/allocator.c +++ b/src/mem/allocator.c @@ -2,8 +2,8 @@ * $HEADER$ */ -#include "lam/mem/allocator.h" -#include "lam/mem/sharedmem_util.h" +#include "mem/allocator.h" +#include "mem/sharedmem_util.h" void *lam_allocator_malloc(lam_allocator_t *allocator, size_t chunk_size); void lam_allocator_default_free(lam_allocator_t *allocator, void *base_ptr); diff --git a/src/mem/allocator.h b/src/mem/allocator.h index 75ed747b83..61f5e86483 100644 --- a/src/mem/allocator.h +++ b/src/mem/allocator.h @@ -5,7 +5,7 @@ #ifndef LAM_ALLOCATOR_H #define LAM_ALLOCATOR_H -#include "lam/lfc/lam_object.h" +#include "lfc/lam_object.h" /* * This class is used to provide a generic and flexible way for the diff --git a/src/mem/free_list.c b/src/mem/free_list.c index 83967a91f7..062e3c7175 100644 --- a/src/mem/free_list.c +++ b/src/mem/free_list.c @@ -2,7 +2,7 @@ * $HEADER$ */ #include "lam_config.h" -#include "lam/mem/free_list.h" +#include "mem/free_list.h" static void lam_free_list_construct(lam_free_list_t* fl); diff --git a/src/mem/free_list.h b/src/mem/free_list.h index 161e745d78..fb35b54cb1 100644 --- a/src/mem/free_list.h +++ b/src/mem/free_list.h @@ -6,10 +6,10 @@ #define LAM_FREE_LIST_H #include "lam_config.h" -#include "lam/lfc/lam_list.h" -#include "lam/constants.h" -#include "lam/mem/seg_list.h" -#include "lam/mem/mem_pool.h" +#include "lfc/lam_list.h" +#include "constants.h" +#include "mem/seg_list.h" +#include "mem/mem_pool.h" extern lam_class_t lam_free_list_t_class; diff --git a/src/mem/free_lists.c b/src/mem/free_lists.c index 06b0ae4033..3e66fa07b7 100644 --- a/src/mem/free_lists.c +++ b/src/mem/free_lists.c @@ -3,12 +3,12 @@ */ #include "lam_config.h" -#include "lam/mem/free_lists.h" -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" -#include "lam/os/numa.h" -#include "lam/os/lam_system.h" -#include "lam/mem/mem_globals.h" +#include "mem/free_lists.h" +#include "runtime/runtime.h" +#include "util/output.h" +#include "os/numa.h" +#include "os/lam_system.h" +#include "mem/mem_globals.h" #ifndef ROB_HASNT_FINISHED_THIS_YET #define ROB_HASNT_FINISHED_THIS_YET 0 diff --git a/src/mem/free_lists.h b/src/mem/free_lists.h index 30a731de4d..ddddc4b48a 100644 --- a/src/mem/free_lists.h +++ b/src/mem/free_lists.h @@ -6,10 +6,10 @@ #define LAM_FREE_LISTS_H #include "lam_config.h" -#include "lam/lfc/lam_list.h" -#include "lam/threads/mutex.h" -#include "lam/mem/seg_list.h" -#include "lam/mem/mem_pool.h" +#include "lfc/lam_list.h" +#include "threads/mutex.h" +#include "mem/seg_list.h" +#include "mem/mem_pool.h" /* * Memory affinity is almost certainly an int everywhere, but let's diff --git a/src/mem/malloc.c b/src/mem/malloc.c index 644b5153f9..0e31c706d4 100644 --- a/src/mem/malloc.c +++ b/src/mem/malloc.c @@ -6,8 +6,8 @@ #include -#include "lam/mem/malloc.h" -#include "lam/util/output.h" +#include "mem/malloc.h" +#include "util/output.h" /* diff --git a/src/mem/mem_globals.c b/src/mem/mem_globals.c index 153a444eeb..9081ff2d7b 100644 --- a/src/mem/mem_globals.c +++ b/src/mem/mem_globals.c @@ -4,9 +4,9 @@ #include -#include "lam/constants.h" -#include "lam/lfc/lam_object.h" -#include "lam/mem/mem_globals.h" +#include "constants.h" +#include "lfc/lam_object.h" +#include "mem/mem_globals.h" lam_fixed_mpool_t lam_shmem_pools; lam_fixed_mpool_t lam_per_proc_shmem_pools; diff --git a/src/mem/mem_globals.h b/src/mem/mem_globals.h index c0934259ce..c5005792b8 100644 --- a/src/mem/mem_globals.h +++ b/src/mem/mem_globals.h @@ -5,7 +5,7 @@ #ifndef MEM_GLOBALS_H #define MEM_GLOBALS_H -#include "lam/mem/mem_pool.h" +#include "mem/mem_pool.h" /* shared memory pool for use before fork. should be initialized during prefork init. diff --git a/src/mem/mem_pool.c b/src/mem/mem_pool.c index 8b7979a7b3..d7781044c8 100644 --- a/src/mem/mem_pool.c +++ b/src/mem/mem_pool.c @@ -8,12 +8,12 @@ #include #include -#include "lam/constants.h" -#include "lam/runtime/runtime.h" -#include "lam/mem/mem_pool.h" -#include "lam/mem/sharedmem_util.h" -#include "lam/util/output.h" -#include "lam/os/numa.h" +#include "constants.h" +#include "runtime/runtime.h" +#include "mem/mem_pool.h" +#include "mem/sharedmem_util.h" +#include "util/output.h" +#include "os/numa.h" lam_class_t lam_mem_pool_t_class = { "lam_mem_pool_t", diff --git a/src/mem/mem_pool.h b/src/mem/mem_pool.h index 29619500ba..6aa73d09f0 100644 --- a/src/mem/mem_pool.h +++ b/src/mem/mem_pool.h @@ -5,10 +5,10 @@ #ifndef LAM_MEMORY_POOL_H #define LAM_MEMORY_POOL_H -#include "lam/types.h" -#include "lam/lfc/lam_object.h" -#include "lam/mem/allocator.h" -#include "lam/threads/mutex.h" +#include "types.h" +#include "lfc/lam_object.h" +#include "mem/allocator.h" +#include "threads/mutex.h" #define ALLOCELEMENT_FLAG_UNUSABLE (0) #define ALLOCELEMENT_FLAG_AVAILABLE (1) diff --git a/src/mem/seg_list.c b/src/mem/seg_list.c index dfe840b423..a69a1b487f 100644 --- a/src/mem/seg_list.c +++ b/src/mem/seg_list.c @@ -2,8 +2,8 @@ * $HEADER$ */ -#include "lam/mem/seg_list.h" -#include "lam/lfc/lam_list.h" +#include "mem/seg_list.h" +#include "lfc/lam_list.h" /* * Public variable diff --git a/src/mem/seg_list.h b/src/mem/seg_list.h index 1b8715d107..1e6a8edc32 100644 --- a/src/mem/seg_list.h +++ b/src/mem/seg_list.h @@ -6,8 +6,8 @@ #define SEG_LIST_H #include "lam_config.h" -#include "lam/lfc/lam_list.h" -#include "lam/threads/mutex.h" +#include "lfc/lam_list.h" +#include "threads/mutex.h" struct lam_seg_list_t { diff --git a/src/mem/sharedmem_util.c b/src/mem/sharedmem_util.c index 53f1cd62c7..75f4bfd105 100644 --- a/src/mem/sharedmem_util.c +++ b/src/mem/sharedmem_util.c @@ -12,8 +12,8 @@ #include #include -#include "lam/mem/sharedmem_util.h" -#include "lam/util/output.h" +#include "mem/sharedmem_util.h" +#include "util/output.h" void *lam_zero_alloc(size_t len, int mem_prot, int mem_flags) diff --git a/src/mpi/c/abort.c b/src/mpi/c/abort.c index 1fd4f5507f..75f846ef0a 100644 --- a/src/mpi/c/abort.c +++ b/src/mpi/c/abort.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Abort = PMPI_Abort diff --git a/src/mpi/c/accumulate.c b/src/mpi/c/accumulate.c index 56226fab3d..4b95a4d289 100644 --- a/src/mpi/c/accumulate.c +++ b/src/mpi/c/accumulate.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Accumulate = PMPI_Accumulate diff --git a/src/mpi/c/add_error_class.c b/src/mpi/c/add_error_class.c index ba3ce256e9..c534cd68c7 100644 --- a/src/mpi/c/add_error_class.c +++ b/src/mpi/c/add_error_class.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Add_error_class = PMPI_Add_error_class diff --git a/src/mpi/c/add_error_code.c b/src/mpi/c/add_error_code.c index e63a0d77d2..dc95dfd3e9 100644 --- a/src/mpi/c/add_error_code.c +++ b/src/mpi/c/add_error_code.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Add_error_code = PMPI_Add_error_code diff --git a/src/mpi/c/add_error_string.c b/src/mpi/c/add_error_string.c index 5770f38c06..e3814a08bd 100644 --- a/src/mpi/c/add_error_string.c +++ b/src/mpi/c/add_error_string.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Add_error_string = PMPI_Add_error_string diff --git a/src/mpi/c/address.c b/src/mpi/c/address.c index 532e9e6216..5511bf18b8 100644 --- a/src/mpi/c/address.c +++ b/src/mpi/c/address.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Address = PMPI_Address diff --git a/src/mpi/c/allgather.c b/src/mpi/c/allgather.c index 5cb1c199cc..340eca3ce5 100644 --- a/src/mpi/c/allgather.c +++ b/src/mpi/c/allgather.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Allgather = PMPI_Allgather diff --git a/src/mpi/c/allgatherv.c b/src/mpi/c/allgatherv.c index becd2712c0..d84080a7a5 100644 --- a/src/mpi/c/allgatherv.c +++ b/src/mpi/c/allgatherv.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Allgatherv = PMPI_Allgatherv diff --git a/src/mpi/c/alloc_mem.c b/src/mpi/c/alloc_mem.c index 61512f2ede..6000651cde 100644 --- a/src/mpi/c/alloc_mem.c +++ b/src/mpi/c/alloc_mem.c @@ -7,7 +7,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Alloc_mem = PMPI_Alloc_mem diff --git a/src/mpi/c/allreduce.c b/src/mpi/c/allreduce.c index 033a77398f..78da3f2331 100644 --- a/src/mpi/c/allreduce.c +++ b/src/mpi/c/allreduce.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Allreduce = PMPI_Allreduce diff --git a/src/mpi/c/alltoall.c b/src/mpi/c/alltoall.c index ff6e4c35bd..831e0a78c3 100644 --- a/src/mpi/c/alltoall.c +++ b/src/mpi/c/alltoall.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Alltoall = PMPI_Alltoall diff --git a/src/mpi/c/alltoallv.c b/src/mpi/c/alltoallv.c index 34c2f9ae3c..f55b54c160 100644 --- a/src/mpi/c/alltoallv.c +++ b/src/mpi/c/alltoallv.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Alltoallv = PMPI_Alltoallv diff --git a/src/mpi/c/alltoallw.c b/src/mpi/c/alltoallw.c index 3faf9c00a9..a164ed0ad4 100644 --- a/src/mpi/c/alltoallw.c +++ b/src/mpi/c/alltoallw.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Alltoallw = PMPI_Alltoallw diff --git a/src/mpi/c/attr_delete.c b/src/mpi/c/attr_delete.c index 8f9ecf6855..368a03a662 100644 --- a/src/mpi/c/attr_delete.c +++ b/src/mpi/c/attr_delete.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Attr_delete = PMPI_Attr_delete diff --git a/src/mpi/c/attr_get.c b/src/mpi/c/attr_get.c index 7aa69fd394..7683d5c309 100644 --- a/src/mpi/c/attr_get.c +++ b/src/mpi/c/attr_get.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Attr_get = PMPI_Attr_get diff --git a/src/mpi/c/attr_put.c b/src/mpi/c/attr_put.c index e8a8f336d9..e55130b387 100644 --- a/src/mpi/c/attr_put.c +++ b/src/mpi/c/attr_put.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Attr_put = PMPI_Attr_put diff --git a/src/mpi/c/barrier.c b/src/mpi/c/barrier.c index 74344357bb..128bcc3c8f 100644 --- a/src/mpi/c/barrier.c +++ b/src/mpi/c/barrier.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Barrier = PMPI_Barrier diff --git a/src/mpi/c/bcast.c b/src/mpi/c/bcast.c index 4260bc5d6a..43cd419ed9 100644 --- a/src/mpi/c/bcast.c +++ b/src/mpi/c/bcast.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Bcast = PMPI_Bcast diff --git a/src/mpi/c/bindings.h b/src/mpi/c/bindings.h index 2db41b7063..9b486997c7 100644 --- a/src/mpi/c/bindings.h +++ b/src/mpi/c/bindings.h @@ -15,7 +15,7 @@ header file. */ #if LAM_PROFILING_DEFINES -#include "mpi/interface/c/profile/defines.h" +#include "mpi/c/profile/defines.h" #endif /* This variable is actually in src/mpi/runtime/lam_mpi_init.c, but it diff --git a/src/mpi/c/bsend.c b/src/mpi/c/bsend.c index d6f63536b4..aaf74d07d6 100644 --- a/src/mpi/c/bsend.c +++ b/src/mpi/c/bsend.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/bsend_init.c b/src/mpi/c/bsend_init.c index c46f910167..bf48fd4367 100644 --- a/src/mpi/c/bsend_init.c +++ b/src/mpi/c/bsend_init.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Bsend_init = PMPI_Bsend_init diff --git a/src/mpi/c/buffer_attach.c b/src/mpi/c/buffer_attach.c index f77c7972f0..b425af4919 100644 --- a/src/mpi/c/buffer_attach.c +++ b/src/mpi/c/buffer_attach.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Buffer_attach = PMPI_Buffer_attach diff --git a/src/mpi/c/buffer_detach.c b/src/mpi/c/buffer_detach.c index 8623d4ea47..91bdf658b8 100644 --- a/src/mpi/c/buffer_detach.c +++ b/src/mpi/c/buffer_detach.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Buffer_detach = PMPI_Buffer_detach diff --git a/src/mpi/c/cancel.c b/src/mpi/c/cancel.c index c8a7004fd2..8edd069841 100644 --- a/src/mpi/c/cancel.c +++ b/src/mpi/c/cancel.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cancel = PMPI_Cancel diff --git a/src/mpi/c/cart_coords.c b/src/mpi/c/cart_coords.c index 74f7398cb9..6e15bd51a1 100644 --- a/src/mpi/c/cart_coords.c +++ b/src/mpi/c/cart_coords.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cart_coords = PMPI_Cart_coords diff --git a/src/mpi/c/cart_create.c b/src/mpi/c/cart_create.c index 2bfd7e4606..a48d13e0d6 100644 --- a/src/mpi/c/cart_create.c +++ b/src/mpi/c/cart_create.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cart_create = PMPI_Cart_create diff --git a/src/mpi/c/cart_get.c b/src/mpi/c/cart_get.c index da3c380701..7cbbc04389 100644 --- a/src/mpi/c/cart_get.c +++ b/src/mpi/c/cart_get.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cart_get = PMPI_Cart_get diff --git a/src/mpi/c/cart_map.c b/src/mpi/c/cart_map.c index d8ca892931..f3207891a8 100644 --- a/src/mpi/c/cart_map.c +++ b/src/mpi/c/cart_map.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cart_map = PMPI_Cart_map diff --git a/src/mpi/c/cart_rank.c b/src/mpi/c/cart_rank.c index e7aae8b162..60a04d2dca 100644 --- a/src/mpi/c/cart_rank.c +++ b/src/mpi/c/cart_rank.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cart_rank = PMPI_Cart_rank diff --git a/src/mpi/c/cart_shift.c b/src/mpi/c/cart_shift.c index 51ec731dc4..2799fde916 100644 --- a/src/mpi/c/cart_shift.c +++ b/src/mpi/c/cart_shift.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cart_shift = PMPI_Cart_shift diff --git a/src/mpi/c/cart_sub.c b/src/mpi/c/cart_sub.c index 2bf8a2f9cd..9839ad00b2 100644 --- a/src/mpi/c/cart_sub.c +++ b/src/mpi/c/cart_sub.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cart_sub = PMPI_Cart_sub diff --git a/src/mpi/c/cartdim_get.c b/src/mpi/c/cartdim_get.c index 3fea36adaa..d200bb62c1 100644 --- a/src/mpi/c/cartdim_get.c +++ b/src/mpi/c/cartdim_get.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Cartdim_get = PMPI_Cartdim_get diff --git a/src/mpi/c/close_port.c b/src/mpi/c/close_port.c index 0c8f672c52..89e5968fbc 100644 --- a/src/mpi/c/close_port.c +++ b/src/mpi/c/close_port.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Close_port = PMPI_Close_port diff --git a/src/mpi/c/comm_accept.c b/src/mpi/c/comm_accept.c index e1f3fb8273..7a2500399b 100644 --- a/src/mpi/c/comm_accept.c +++ b/src/mpi/c/comm_accept.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_accept = PMPI_Comm_accept diff --git a/src/mpi/c/comm_c2f.c b/src/mpi/c/comm_c2f.c index 819a5a1f89..8bdbb8d405 100644 --- a/src/mpi/c/comm_c2f.c +++ b/src/mpi/c/comm_c2f.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_c2f = PMPI_Comm_c2f diff --git a/src/mpi/c/comm_call_errhandler.c b/src/mpi/c/comm_call_errhandler.c index 7c8739daf7..3fc2644a12 100644 --- a/src/mpi/c/comm_call_errhandler.c +++ b/src/mpi/c/comm_call_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_call_errhandler = PMPI_Comm_call_errhandler diff --git a/src/mpi/c/comm_compare.c b/src/mpi/c/comm_compare.c index a298c158a4..61bb8bc9dd 100644 --- a/src/mpi/c/comm_compare.c +++ b/src/mpi/c/comm_compare.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_compare = PMPI_Comm_compare diff --git a/src/mpi/c/comm_connect.c b/src/mpi/c/comm_connect.c index ebab22dc3a..5bf9ec2abf 100644 --- a/src/mpi/c/comm_connect.c +++ b/src/mpi/c/comm_connect.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_connect = PMPI_Comm_connect diff --git a/src/mpi/c/comm_create.c b/src/mpi/c/comm_create.c index 858671c804..3a54c75821 100644 --- a/src/mpi/c/comm_create.c +++ b/src/mpi/c/comm_create.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_create = PMPI_Comm_create diff --git a/src/mpi/c/comm_create_errhandler.c b/src/mpi/c/comm_create_errhandler.c index b3dc77cf58..b67f82a8de 100644 --- a/src/mpi/c/comm_create_errhandler.c +++ b/src/mpi/c/comm_create_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_create_errhandler = PMPI_Comm_create_errhandler diff --git a/src/mpi/c/comm_create_keyval.c b/src/mpi/c/comm_create_keyval.c index ddaa38a4ed..7d1b4ec08b 100644 --- a/src/mpi/c/comm_create_keyval.c +++ b/src/mpi/c/comm_create_keyval.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Create_keyval = PMPI_Create_keyval diff --git a/src/mpi/c/comm_delete_attr.c b/src/mpi/c/comm_delete_attr.c index 242c0da30e..30ef18cde2 100644 --- a/src/mpi/c/comm_delete_attr.c +++ b/src/mpi/c/comm_delete_attr.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_delete_attr = PMPI_Comm_delete_attr diff --git a/src/mpi/c/comm_disconnect.c b/src/mpi/c/comm_disconnect.c index b1a2befd16..fc7c663ce0 100644 --- a/src/mpi/c/comm_disconnect.c +++ b/src/mpi/c/comm_disconnect.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_disconnect = PMPI_Comm_disconnect diff --git a/src/mpi/c/comm_dup.c b/src/mpi/c/comm_dup.c index f381f2920c..70eaa5a620 100644 --- a/src/mpi/c/comm_dup.c +++ b/src/mpi/c/comm_dup.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_dup = PMPI_Comm_dup diff --git a/src/mpi/c/comm_f2c.c b/src/mpi/c/comm_f2c.c index d512e873ac..954ab92bc6 100644 --- a/src/mpi/c/comm_f2c.c +++ b/src/mpi/c/comm_f2c.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_f2c = PMPI_Comm_f2c diff --git a/src/mpi/c/comm_free.c b/src/mpi/c/comm_free.c index 85f9f23727..2ecba560db 100644 --- a/src/mpi/c/comm_free.c +++ b/src/mpi/c/comm_free.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_free = PMPI_Comm_free diff --git a/src/mpi/c/comm_free_keyval.c b/src/mpi/c/comm_free_keyval.c index f26e48dcc3..e40277b17f 100644 --- a/src/mpi/c/comm_free_keyval.c +++ b/src/mpi/c/comm_free_keyval.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_free_keyval = PMPI_Comm_free_keyval diff --git a/src/mpi/c/comm_get_attr.c b/src/mpi/c/comm_get_attr.c index 6e58fea5d5..36a65f9af3 100644 --- a/src/mpi/c/comm_get_attr.c +++ b/src/mpi/c/comm_get_attr.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_get_attr = PMPI_Comm_get_attr diff --git a/src/mpi/c/comm_get_errhandler.c b/src/mpi/c/comm_get_errhandler.c index c0196a25af..fd631a5fb9 100644 --- a/src/mpi/c/comm_get_errhandler.c +++ b/src/mpi/c/comm_get_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_get_errhandler = PMPI_Comm_get_errhandler diff --git a/src/mpi/c/comm_get_name.c b/src/mpi/c/comm_get_name.c index 6867be9b4a..f9fd5c69ad 100644 --- a/src/mpi/c/comm_get_name.c +++ b/src/mpi/c/comm_get_name.c @@ -6,11 +6,11 @@ #include -#include "lam/util/strncpy.h" -#include "lam/totalview.h" +#include "util/strncpy.h" +#include "totalview.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/communicator/communicator.h" +#include "mpi/c/bindings.h" +#include "communicator/communicator.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_get_name = PMPI_Comm_get_name diff --git a/src/mpi/c/comm_get_parent.c b/src/mpi/c/comm_get_parent.c index 72559ff466..73842e0e49 100644 --- a/src/mpi/c/comm_get_parent.c +++ b/src/mpi/c/comm_get_parent.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_get_parent = PMPI_Comm_get_parent diff --git a/src/mpi/c/comm_group.c b/src/mpi/c/comm_group.c index 7d2d275233..4b053f7d51 100644 --- a/src/mpi/c/comm_group.c +++ b/src/mpi/c/comm_group.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_group = PMPI_Comm_group diff --git a/src/mpi/c/comm_join.c b/src/mpi/c/comm_join.c index 696dfae219..64c329270c 100644 --- a/src/mpi/c/comm_join.c +++ b/src/mpi/c/comm_join.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_join = PMPI_Comm_join diff --git a/src/mpi/c/comm_rank.c b/src/mpi/c/comm_rank.c index c55b57f2b8..3e792795a8 100644 --- a/src/mpi/c/comm_rank.c +++ b/src/mpi/c/comm_rank.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/communicator/communicator.h" +#include "mpi/c/bindings.h" +#include "communicator/communicator.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_rank = PMPI_Comm_rank diff --git a/src/mpi/c/comm_remote_group.c b/src/mpi/c/comm_remote_group.c index 1e124e568c..78602a5c51 100644 --- a/src/mpi/c/comm_remote_group.c +++ b/src/mpi/c/comm_remote_group.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_remote_group = PMPI_Comm_remote_group diff --git a/src/mpi/c/comm_remote_size.c b/src/mpi/c/comm_remote_size.c index 4c7ca39402..bae449b859 100644 --- a/src/mpi/c/comm_remote_size.c +++ b/src/mpi/c/comm_remote_size.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_remote_size = PMPI_Comm_remote_size diff --git a/src/mpi/c/comm_set_attribute.c b/src/mpi/c/comm_set_attribute.c index 1b0eee4554..9b103e1d61 100644 --- a/src/mpi/c/comm_set_attribute.c +++ b/src/mpi/c/comm_set_attribute.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_set_attribute = PMPI_Comm_set_attribute diff --git a/src/mpi/c/comm_set_errhandler.c b/src/mpi/c/comm_set_errhandler.c index c0a46171f5..0b565ab889 100644 --- a/src/mpi/c/comm_set_errhandler.c +++ b/src/mpi/c/comm_set_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_set_errhandler = PMPI_Comm_set_errhandler diff --git a/src/mpi/c/comm_set_name.c b/src/mpi/c/comm_set_name.c index d3284ff597..21fe69aba2 100644 --- a/src/mpi/c/comm_set_name.c +++ b/src/mpi/c/comm_set_name.c @@ -6,11 +6,11 @@ #include -#include "lam/util/strncpy.h" -#include "lam/totalview.h" +#include "util/strncpy.h" +#include "totalview.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/communicator/communicator.h" +#include "mpi/c/bindings.h" +#include "communicator/communicator.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_set_name = PMPI_Comm_set_name diff --git a/src/mpi/c/comm_size.c b/src/mpi/c/comm_size.c index 6e1af18004..127ea93fc0 100644 --- a/src/mpi/c/comm_size.c +++ b/src/mpi/c/comm_size.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/communicator/communicator.h" +#include "mpi/c/bindings.h" +#include "communicator/communicator.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_size = PMPI_Comm_size diff --git a/src/mpi/c/comm_spawn.c b/src/mpi/c/comm_spawn.c index 7e5f3ff792..31e99f0351 100644 --- a/src/mpi/c/comm_spawn.c +++ b/src/mpi/c/comm_spawn.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_spawn = PMPI_Comm_spawn diff --git a/src/mpi/c/comm_spawn_multiple.c b/src/mpi/c/comm_spawn_multiple.c index 555d04f804..5d871a2f81 100644 --- a/src/mpi/c/comm_spawn_multiple.c +++ b/src/mpi/c/comm_spawn_multiple.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_spawn_multiple = PMPI_Comm_spawn_multiple diff --git a/src/mpi/c/comm_split.c b/src/mpi/c/comm_split.c index f4ae149e56..43d66cf306 100644 --- a/src/mpi/c/comm_split.c +++ b/src/mpi/c/comm_split.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_split = PMPI_Comm_split diff --git a/src/mpi/c/comm_test_inter.c b/src/mpi/c/comm_test_inter.c index d8ef718d71..4d4c8a385a 100644 --- a/src/mpi/c/comm_test_inter.c +++ b/src/mpi/c/comm_test_inter.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Comm_test_inter = PMPI_Comm_test_inter diff --git a/src/mpi/c/dims_create.c b/src/mpi/c/dims_create.c index aaaab3c8c2..2cab19a2f5 100644 --- a/src/mpi/c/dims_create.c +++ b/src/mpi/c/dims_create.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Dims_create = PMPI_Dims_create diff --git a/src/mpi/c/errhandler_c2f.c b/src/mpi/c/errhandler_c2f.c index 7e931b2e02..c0c21683a3 100644 --- a/src/mpi/c/errhandler_c2f.c +++ b/src/mpi/c/errhandler_c2f.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Errhandler_c2f = PMPI_Errhandler_c2f diff --git a/src/mpi/c/errhandler_create.c b/src/mpi/c/errhandler_create.c index b7daa078a2..f88321c84c 100644 --- a/src/mpi/c/errhandler_create.c +++ b/src/mpi/c/errhandler_create.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Errhandler_create = PMPI_Errhandler_create diff --git a/src/mpi/c/errhandler_f2c.c b/src/mpi/c/errhandler_f2c.c index f88825b834..4da2986ce1 100644 --- a/src/mpi/c/errhandler_f2c.c +++ b/src/mpi/c/errhandler_f2c.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Errhandler_f2c = PMPI_Errhandler_f2c diff --git a/src/mpi/c/errhandler_free.c b/src/mpi/c/errhandler_free.c index 5759768a97..4cef71fc0f 100644 --- a/src/mpi/c/errhandler_free.c +++ b/src/mpi/c/errhandler_free.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Errhandler_free = PMPI_Errhandler_free diff --git a/src/mpi/c/errhandler_get.c b/src/mpi/c/errhandler_get.c index 764db91673..6485283e4d 100644 --- a/src/mpi/c/errhandler_get.c +++ b/src/mpi/c/errhandler_get.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Errhandler_get = PMPI_Errhandler_get diff --git a/src/mpi/c/errhandler_set.c b/src/mpi/c/errhandler_set.c index c0fefc0ba3..2f6159a24f 100644 --- a/src/mpi/c/errhandler_set.c +++ b/src/mpi/c/errhandler_set.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Errhandler_set = PMPI_Errhandler_set diff --git a/src/mpi/c/error_class.c b/src/mpi/c/error_class.c index ce39e1b6ec..574b65e681 100644 --- a/src/mpi/c/error_class.c +++ b/src/mpi/c/error_class.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Error_class = PMPI_Error_class diff --git a/src/mpi/c/error_string.c b/src/mpi/c/error_string.c index 927a0afd04..03b0e65837 100644 --- a/src/mpi/c/error_string.c +++ b/src/mpi/c/error_string.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Error_string = PMPI_Error_string diff --git a/src/mpi/c/exscan.c b/src/mpi/c/exscan.c index 2bc1bcbdf0..cff632c66e 100644 --- a/src/mpi/c/exscan.c +++ b/src/mpi/c/exscan.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Exscan = PMPI_Exscan diff --git a/src/mpi/c/file_c2f.c b/src/mpi/c/file_c2f.c index 247ceda2fc..d87f1aa5a8 100644 --- a/src/mpi/c/file_c2f.c +++ b/src/mpi/c/file_c2f.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_c2f = PMPI_File_c2f diff --git a/src/mpi/c/file_call_errhandler.c b/src/mpi/c/file_call_errhandler.c index 8d93962ff4..fa823e3462 100644 --- a/src/mpi/c/file_call_errhandler.c +++ b/src/mpi/c/file_call_errhandler.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_call_errhandler = PMPI_File_call_errhandler diff --git a/src/mpi/c/file_close.c b/src/mpi/c/file_close.c index 7d32637e91..2db680f885 100644 --- a/src/mpi/c/file_close.c +++ b/src/mpi/c/file_close.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_close = PMPI_File_close diff --git a/src/mpi/c/file_create_errhandler.c b/src/mpi/c/file_create_errhandler.c index f54ed480b2..0499b6c594 100644 --- a/src/mpi/c/file_create_errhandler.c +++ b/src/mpi/c/file_create_errhandler.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_create_errhandler = PMPI_File_create_errhandler diff --git a/src/mpi/c/file_delete.c b/src/mpi/c/file_delete.c index 581bbdec63..ce33a4aeea 100644 --- a/src/mpi/c/file_delete.c +++ b/src/mpi/c/file_delete.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_delete = PMPI_File_delete diff --git a/src/mpi/c/file_f2c.c b/src/mpi/c/file_f2c.c index 0e820b0b43..da63aa33e8 100644 --- a/src/mpi/c/file_f2c.c +++ b/src/mpi/c/file_f2c.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_f2c = PMPI_File_f2c diff --git a/src/mpi/c/file_get_amode.c b/src/mpi/c/file_get_amode.c index 0c8ceac87d..816d645f4a 100644 --- a/src/mpi/c/file_get_amode.c +++ b/src/mpi/c/file_get_amode.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_amode = PMPI_File_get_amode diff --git a/src/mpi/c/file_get_atomicity.c b/src/mpi/c/file_get_atomicity.c index 3cfab454ef..17253ca08d 100644 --- a/src/mpi/c/file_get_atomicity.c +++ b/src/mpi/c/file_get_atomicity.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_atomicity = PMPI_File_get_atomicity diff --git a/src/mpi/c/file_get_byte_offset.c b/src/mpi/c/file_get_byte_offset.c index e7c80d4cfa..982d7d8ca5 100644 --- a/src/mpi/c/file_get_byte_offset.c +++ b/src/mpi/c/file_get_byte_offset.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_byte_offset = PMPI_File_get_byte_offset diff --git a/src/mpi/c/file_get_errhandler.c b/src/mpi/c/file_get_errhandler.c index f35831c7f3..e22df7e527 100644 --- a/src/mpi/c/file_get_errhandler.c +++ b/src/mpi/c/file_get_errhandler.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_errhandler = PMPI_File_get_errhandler diff --git a/src/mpi/c/file_get_group.c b/src/mpi/c/file_get_group.c index 3ae6c2dacd..9bdfcf6fe5 100644 --- a/src/mpi/c/file_get_group.c +++ b/src/mpi/c/file_get_group.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_group = PMPI_File_get_group diff --git a/src/mpi/c/file_get_info.c b/src/mpi/c/file_get_info.c index 9094760359..5824a844e0 100644 --- a/src/mpi/c/file_get_info.c +++ b/src/mpi/c/file_get_info.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_info = PMPI_File_get_info diff --git a/src/mpi/c/file_get_position.c b/src/mpi/c/file_get_position.c index d78313eb3d..c01bcaa652 100644 --- a/src/mpi/c/file_get_position.c +++ b/src/mpi/c/file_get_position.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_position = PMPI_File_get_position diff --git a/src/mpi/c/file_get_position_shared.c b/src/mpi/c/file_get_position_shared.c index a0a4486308..10daab004e 100644 --- a/src/mpi/c/file_get_position_shared.c +++ b/src/mpi/c/file_get_position_shared.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_position_shared = PMPI_File_get_position_shared diff --git a/src/mpi/c/file_get_size.c b/src/mpi/c/file_get_size.c index 1719e7a151..5c9dd5ed9f 100644 --- a/src/mpi/c/file_get_size.c +++ b/src/mpi/c/file_get_size.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_size = PMPI_File_get_size diff --git a/src/mpi/c/file_get_type_extent.c b/src/mpi/c/file_get_type_extent.c index d6a169004d..f706eb8554 100644 --- a/src/mpi/c/file_get_type_extent.c +++ b/src/mpi/c/file_get_type_extent.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_type_extent = PMPI_File_get_type_extent diff --git a/src/mpi/c/file_get_view.c b/src/mpi/c/file_get_view.c index 63f6634294..f929521a15 100644 --- a/src/mpi/c/file_get_view.c +++ b/src/mpi/c/file_get_view.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_get_view = PMPI_File_get_view diff --git a/src/mpi/c/file_iread.c b/src/mpi/c/file_iread.c index e355cd6281..7bbf065c3b 100644 --- a/src/mpi/c/file_iread.c +++ b/src/mpi/c/file_iread.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_iread = PMPI_File_iread diff --git a/src/mpi/c/file_iread_at.c b/src/mpi/c/file_iread_at.c index e00e652a81..ea6f801392 100644 --- a/src/mpi/c/file_iread_at.c +++ b/src/mpi/c/file_iread_at.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_iread_at = PMPI_File_iread_at diff --git a/src/mpi/c/file_iread_shared.c b/src/mpi/c/file_iread_shared.c index 3777df6442..1de628ed73 100644 --- a/src/mpi/c/file_iread_shared.c +++ b/src/mpi/c/file_iread_shared.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_iread_shared = PMPI_File_iread_shared diff --git a/src/mpi/c/file_iwrite.c b/src/mpi/c/file_iwrite.c index aa1ac252ae..474d089989 100644 --- a/src/mpi/c/file_iwrite.c +++ b/src/mpi/c/file_iwrite.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_iwrite = PMPI_File_iwrite diff --git a/src/mpi/c/file_iwrite_at.c b/src/mpi/c/file_iwrite_at.c index f2759f5b33..539435a5a7 100644 --- a/src/mpi/c/file_iwrite_at.c +++ b/src/mpi/c/file_iwrite_at.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_iwrite_at = PMPI_File_iwrite_at diff --git a/src/mpi/c/file_iwrite_shared.c b/src/mpi/c/file_iwrite_shared.c index 302860e186..f684f76aeb 100644 --- a/src/mpi/c/file_iwrite_shared.c +++ b/src/mpi/c/file_iwrite_shared.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_iwrite_shared = PMPI_File_iwrite_shared diff --git a/src/mpi/c/file_open.c b/src/mpi/c/file_open.c index c1a1ac3b63..75d359e8d6 100644 --- a/src/mpi/c/file_open.c +++ b/src/mpi/c/file_open.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_open = PMPI_File_open diff --git a/src/mpi/c/file_preallocate.c b/src/mpi/c/file_preallocate.c index bca3ad96b3..029a4b556d 100644 --- a/src/mpi/c/file_preallocate.c +++ b/src/mpi/c/file_preallocate.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_preallocate = PMPI_File_preallocate diff --git a/src/mpi/c/file_read.c b/src/mpi/c/file_read.c index eff33deb67..f8fa537d45 100644 --- a/src/mpi/c/file_read.c +++ b/src/mpi/c/file_read.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read = PMPI_File_read diff --git a/src/mpi/c/file_read_all.c b/src/mpi/c/file_read_all.c index 2d0da2ce25..a705d9937e 100644 --- a/src/mpi/c/file_read_all.c +++ b/src/mpi/c/file_read_all.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_all = PMPI_File_read_all diff --git a/src/mpi/c/file_read_all_begin.c b/src/mpi/c/file_read_all_begin.c index 28575fbd69..3bf30c01b2 100644 --- a/src/mpi/c/file_read_all_begin.c +++ b/src/mpi/c/file_read_all_begin.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_all_begin = PMPI_File_read_all_begin diff --git a/src/mpi/c/file_read_all_end.c b/src/mpi/c/file_read_all_end.c index 60ad42ba1a..ca94c2ff60 100644 --- a/src/mpi/c/file_read_all_end.c +++ b/src/mpi/c/file_read_all_end.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_all_end = PMPI_File_read_all_end diff --git a/src/mpi/c/file_read_at.c b/src/mpi/c/file_read_at.c index 473806058c..c6998e4a6a 100644 --- a/src/mpi/c/file_read_at.c +++ b/src/mpi/c/file_read_at.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_at = PMPI_File_read_at diff --git a/src/mpi/c/file_read_at_all.c b/src/mpi/c/file_read_at_all.c index 66311d641d..aff95fa811 100644 --- a/src/mpi/c/file_read_at_all.c +++ b/src/mpi/c/file_read_at_all.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_at_all = PMPI_File_read_at_all diff --git a/src/mpi/c/file_read_at_all_begin.c b/src/mpi/c/file_read_at_all_begin.c index 9a7fb7a70c..926124aa7c 100644 --- a/src/mpi/c/file_read_at_all_begin.c +++ b/src/mpi/c/file_read_at_all_begin.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_at_all_begin = PMPI_File_read_at_all_begin diff --git a/src/mpi/c/file_read_at_all_end.c b/src/mpi/c/file_read_at_all_end.c index ddd761d3f1..20b71fcf61 100644 --- a/src/mpi/c/file_read_at_all_end.c +++ b/src/mpi/c/file_read_at_all_end.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_at_all_end = PMPI_File_read_at_all_end diff --git a/src/mpi/c/file_read_ordered.c b/src/mpi/c/file_read_ordered.c index 03592fb8c3..5432a3058a 100644 --- a/src/mpi/c/file_read_ordered.c +++ b/src/mpi/c/file_read_ordered.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_ordered = PMPI_File_read_ordered diff --git a/src/mpi/c/file_read_ordered_begin.c b/src/mpi/c/file_read_ordered_begin.c index 7e9ea7b621..48e5d646a6 100644 --- a/src/mpi/c/file_read_ordered_begin.c +++ b/src/mpi/c/file_read_ordered_begin.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_ordered_begin = PMPI_File_read_ordered_begin diff --git a/src/mpi/c/file_read_ordered_end.c b/src/mpi/c/file_read_ordered_end.c index 33ef632a07..c58eeecccd 100644 --- a/src/mpi/c/file_read_ordered_end.c +++ b/src/mpi/c/file_read_ordered_end.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_ordered_end = PMPI_File_read_ordered_end diff --git a/src/mpi/c/file_read_shared.c b/src/mpi/c/file_read_shared.c index 635acc2ce7..72bd289997 100644 --- a/src/mpi/c/file_read_shared.c +++ b/src/mpi/c/file_read_shared.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_read_shared = PMPI_File_read_shared diff --git a/src/mpi/c/file_seek.c b/src/mpi/c/file_seek.c index a0c94c3ba5..65f0328662 100644 --- a/src/mpi/c/file_seek.c +++ b/src/mpi/c/file_seek.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_seek = PMPI_File_seek diff --git a/src/mpi/c/file_seek_shared.c b/src/mpi/c/file_seek_shared.c index e7e46b6ec2..f0f93b3c89 100644 --- a/src/mpi/c/file_seek_shared.c +++ b/src/mpi/c/file_seek_shared.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_seek_shared = PMPI_File_seek_shared diff --git a/src/mpi/c/file_set_atomicity.c b/src/mpi/c/file_set_atomicity.c index 4aaac4f0ae..01512e66ea 100644 --- a/src/mpi/c/file_set_atomicity.c +++ b/src/mpi/c/file_set_atomicity.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_set_atomicity = PMPI_File_set_atomicity diff --git a/src/mpi/c/file_set_errhandler.c b/src/mpi/c/file_set_errhandler.c index d3a9d84f22..09e4302222 100644 --- a/src/mpi/c/file_set_errhandler.c +++ b/src/mpi/c/file_set_errhandler.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_set_errhandler = PMPI_File_set_errhandler diff --git a/src/mpi/c/file_set_info.c b/src/mpi/c/file_set_info.c index 383a523083..117f5b7f00 100644 --- a/src/mpi/c/file_set_info.c +++ b/src/mpi/c/file_set_info.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_set_info = PMPI_File_set_info diff --git a/src/mpi/c/file_set_size.c b/src/mpi/c/file_set_size.c index 2233f55899..4688786ee1 100644 --- a/src/mpi/c/file_set_size.c +++ b/src/mpi/c/file_set_size.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_set_size = PMPI_File_set_size diff --git a/src/mpi/c/file_set_view.c b/src/mpi/c/file_set_view.c index ecab3a32b2..c4c25390a1 100644 --- a/src/mpi/c/file_set_view.c +++ b/src/mpi/c/file_set_view.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_set_view = PMPI_File_set_view diff --git a/src/mpi/c/file_sync.c b/src/mpi/c/file_sync.c index 26a7d9f82d..1f1d727a3a 100644 --- a/src/mpi/c/file_sync.c +++ b/src/mpi/c/file_sync.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_sync = PMPI_File_sync diff --git a/src/mpi/c/file_write.c b/src/mpi/c/file_write.c index f975a5e377..5dac106d61 100644 --- a/src/mpi/c/file_write.c +++ b/src/mpi/c/file_write.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write = PMPI_File_write diff --git a/src/mpi/c/file_write_all.c b/src/mpi/c/file_write_all.c index 2401907365..76c2c312fd 100644 --- a/src/mpi/c/file_write_all.c +++ b/src/mpi/c/file_write_all.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_all = PMPI_File_write_all diff --git a/src/mpi/c/file_write_all_begin.c b/src/mpi/c/file_write_all_begin.c index 21d933bdf6..070ef76def 100644 --- a/src/mpi/c/file_write_all_begin.c +++ b/src/mpi/c/file_write_all_begin.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_all_begin = PMPI_File_write_all_begin diff --git a/src/mpi/c/file_write_all_end.c b/src/mpi/c/file_write_all_end.c index a6c85b5da7..8f12c5f385 100644 --- a/src/mpi/c/file_write_all_end.c +++ b/src/mpi/c/file_write_all_end.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_all_end = PMPI_File_write_all_end diff --git a/src/mpi/c/file_write_at.c b/src/mpi/c/file_write_at.c index 1592e0bdf3..51a9766dd3 100644 --- a/src/mpi/c/file_write_at.c +++ b/src/mpi/c/file_write_at.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_at = PMPI_File_write_at diff --git a/src/mpi/c/file_write_at_all.c b/src/mpi/c/file_write_at_all.c index e45b35ba6d..11287c51e8 100644 --- a/src/mpi/c/file_write_at_all.c +++ b/src/mpi/c/file_write_at_all.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_at_all = PMPI_File_write_at_all diff --git a/src/mpi/c/file_write_at_all_begin.c b/src/mpi/c/file_write_at_all_begin.c index 03bdb63a6f..4a53883bce 100644 --- a/src/mpi/c/file_write_at_all_begin.c +++ b/src/mpi/c/file_write_at_all_begin.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_at_all_begin = PMPI_File_write_at_all_begin diff --git a/src/mpi/c/file_write_at_all_end.c b/src/mpi/c/file_write_at_all_end.c index 4ff6abc227..0ba0d819f4 100644 --- a/src/mpi/c/file_write_at_all_end.c +++ b/src/mpi/c/file_write_at_all_end.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_at_all_end = PMPI_File_write_at_all_end diff --git a/src/mpi/c/file_write_ordered.c b/src/mpi/c/file_write_ordered.c index fefd91fdf8..7b49cf10ed 100644 --- a/src/mpi/c/file_write_ordered.c +++ b/src/mpi/c/file_write_ordered.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_ordered = PMPI_File_write_ordered diff --git a/src/mpi/c/file_write_ordered_begin.c b/src/mpi/c/file_write_ordered_begin.c index 381f0d45f6..abdd26bb09 100644 --- a/src/mpi/c/file_write_ordered_begin.c +++ b/src/mpi/c/file_write_ordered_begin.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_ordered_begin = PMPI_File_write_ordered_begin diff --git a/src/mpi/c/file_write_ordered_end.c b/src/mpi/c/file_write_ordered_end.c index e28eb53b74..5c8fa4112e 100644 --- a/src/mpi/c/file_write_ordered_end.c +++ b/src/mpi/c/file_write_ordered_end.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_ordered_end = PMPI_File_write_ordered_end diff --git a/src/mpi/c/file_write_shared.c b/src/mpi/c/file_write_shared.c index 032daefe01..dae425b287 100644 --- a/src/mpi/c/file_write_shared.c +++ b/src/mpi/c/file_write_shared.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_File_write_shared = PMPI_File_write_shared diff --git a/src/mpi/c/finalize.c b/src/mpi/c/finalize.c index 981e890783..a949c35ff9 100644 --- a/src/mpi/c/finalize.c +++ b/src/mpi/c/finalize.c @@ -5,8 +5,8 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "runtime/runtime.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Finalize = PMPI_Finalize diff --git a/src/mpi/c/finalized.c b/src/mpi/c/finalized.c index 850d225867..039bf57ab9 100644 --- a/src/mpi/c/finalized.c +++ b/src/mpi/c/finalized.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Finalized = PMPI_Finalized diff --git a/src/mpi/c/free_mem.c b/src/mpi/c/free_mem.c index dd13d458b8..29a0db667b 100644 --- a/src/mpi/c/free_mem.c +++ b/src/mpi/c/free_mem.c @@ -7,7 +7,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Free_mem = PMPI_Free_mem diff --git a/src/mpi/c/gather.c b/src/mpi/c/gather.c index 8ae303b56d..43e8fcb367 100644 --- a/src/mpi/c/gather.c +++ b/src/mpi/c/gather.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Gather = PMPI_Gather diff --git a/src/mpi/c/gatherv.c b/src/mpi/c/gatherv.c index 6f341ca872..e5082a9e5c 100644 --- a/src/mpi/c/gatherv.c +++ b/src/mpi/c/gatherv.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Gatherv = PMPI_Gatherv diff --git a/src/mpi/c/get.c b/src/mpi/c/get.c index ba8774281f..5c0dc7fd72 100644 --- a/src/mpi/c/get.c +++ b/src/mpi/c/get.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Get = PMPI_Get diff --git a/src/mpi/c/get_address.c b/src/mpi/c/get_address.c index ead715b6fe..377aa31a00 100644 --- a/src/mpi/c/get_address.c +++ b/src/mpi/c/get_address.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Get_address = PMPI_Get_address diff --git a/src/mpi/c/get_count.c b/src/mpi/c/get_count.c index 9c0d9a4877..44ef868c01 100644 --- a/src/mpi/c/get_count.c +++ b/src/mpi/c/get_count.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Get_count = PMPI_Get_count diff --git a/src/mpi/c/get_elements.c b/src/mpi/c/get_elements.c index 4728691ec9..2259430c5d 100644 --- a/src/mpi/c/get_elements.c +++ b/src/mpi/c/get_elements.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Get_elements = PMPI_Get_elements diff --git a/src/mpi/c/get_processor_name.c b/src/mpi/c/get_processor_name.c index 022eb7e207..2181e94bde 100644 --- a/src/mpi/c/get_processor_name.c +++ b/src/mpi/c/get_processor_name.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Get_processor_name = PMPI_Get_processor_name diff --git a/src/mpi/c/get_version.c b/src/mpi/c/get_version.c index 77f634f12e..afa0c1cc8b 100644 --- a/src/mpi/c/get_version.c +++ b/src/mpi/c/get_version.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Get_version = PMPI_Get_version diff --git a/src/mpi/c/graph_create.c b/src/mpi/c/graph_create.c index bb1d6680ea..5b624dc0ab 100644 --- a/src/mpi/c/graph_create.c +++ b/src/mpi/c/graph_create.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Graph_create = PMPI_Graph_create diff --git a/src/mpi/c/graph_get.c b/src/mpi/c/graph_get.c index 2872ddf330..5de8194d72 100644 --- a/src/mpi/c/graph_get.c +++ b/src/mpi/c/graph_get.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Graph_get = PMPI_Graph_get diff --git a/src/mpi/c/graph_map.c b/src/mpi/c/graph_map.c index a93c14ed91..a3252005d6 100644 --- a/src/mpi/c/graph_map.c +++ b/src/mpi/c/graph_map.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Graph_map = PMPI_Graph_map diff --git a/src/mpi/c/graph_neighbors.c b/src/mpi/c/graph_neighbors.c index 17b87d0e57..692e15fda6 100644 --- a/src/mpi/c/graph_neighbors.c +++ b/src/mpi/c/graph_neighbors.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Graph_neighbors = PMPI_Graph_neighbors diff --git a/src/mpi/c/graph_neighbors_count.c b/src/mpi/c/graph_neighbors_count.c index 14ca35b5b0..7d5446bce2 100644 --- a/src/mpi/c/graph_neighbors_count.c +++ b/src/mpi/c/graph_neighbors_count.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Graph_neighbors_count = PMPI_Graph_neighbors_count diff --git a/src/mpi/c/graphdims_get.c b/src/mpi/c/graphdims_get.c index 5dcc204234..c1cbde07b2 100644 --- a/src/mpi/c/graphdims_get.c +++ b/src/mpi/c/graphdims_get.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Graphdims_get = PMPI_Graphdims_get diff --git a/src/mpi/c/grequest_complete.c b/src/mpi/c/grequest_complete.c index 5dd23906e1..37dd78c167 100644 --- a/src/mpi/c/grequest_complete.c +++ b/src/mpi/c/grequest_complete.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Grequest_complete = PMPI_Grequest_complete diff --git a/src/mpi/c/grequest_start.c b/src/mpi/c/grequest_start.c index c811a7b1ec..5be2c1250e 100644 --- a/src/mpi/c/grequest_start.c +++ b/src/mpi/c/grequest_start.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Grequest_start = PMPI_Grequest_start diff --git a/src/mpi/c/group_c2f.c b/src/mpi/c/group_c2f.c index 5b6a2e8deb..a5b13c87a2 100644 --- a/src/mpi/c/group_c2f.c +++ b/src/mpi/c/group_c2f.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_c2f = PMPI_Group_c2f diff --git a/src/mpi/c/group_compare.c b/src/mpi/c/group_compare.c index 63b12779e6..7a6247e731 100644 --- a/src/mpi/c/group_compare.c +++ b/src/mpi/c/group_compare.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_compare = PMPI_Group_compare diff --git a/src/mpi/c/group_difference.c b/src/mpi/c/group_difference.c index 2f2185f71e..d6075a8dbf 100644 --- a/src/mpi/c/group_difference.c +++ b/src/mpi/c/group_difference.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_difference = PMPI_Group_difference diff --git a/src/mpi/c/group_excl.c b/src/mpi/c/group_excl.c index c2c72310f6..9e449b893c 100644 --- a/src/mpi/c/group_excl.c +++ b/src/mpi/c/group_excl.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_excl = PMPI_Group_excl diff --git a/src/mpi/c/group_f2c.c b/src/mpi/c/group_f2c.c index 411d1d037d..5a08826c3e 100644 --- a/src/mpi/c/group_f2c.c +++ b/src/mpi/c/group_f2c.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_f2c = PMPI_Group_f2c diff --git a/src/mpi/c/group_free.c b/src/mpi/c/group_free.c index f57a0884d5..14ab6035c2 100644 --- a/src/mpi/c/group_free.c +++ b/src/mpi/c/group_free.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_free = PMPI_Group_free diff --git a/src/mpi/c/group_incl.c b/src/mpi/c/group_incl.c index 617cdd5e80..7712625882 100644 --- a/src/mpi/c/group_incl.c +++ b/src/mpi/c/group_incl.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_incl = PMPI_Group_incl diff --git a/src/mpi/c/group_intersection.c b/src/mpi/c/group_intersection.c index 5d2640b2ea..b856a42e91 100644 --- a/src/mpi/c/group_intersection.c +++ b/src/mpi/c/group_intersection.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_intersection = PMPI_Group_intersection diff --git a/src/mpi/c/group_range_excl.c b/src/mpi/c/group_range_excl.c index 098e2c6151..918ba7002c 100644 --- a/src/mpi/c/group_range_excl.c +++ b/src/mpi/c/group_range_excl.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_range_excl = PMPI_Group_range_excl diff --git a/src/mpi/c/group_range_incl.c b/src/mpi/c/group_range_incl.c index 535e0c7aa0..a3dff0a9e8 100644 --- a/src/mpi/c/group_range_incl.c +++ b/src/mpi/c/group_range_incl.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_range_incl = PMPI_Group_range_incl diff --git a/src/mpi/c/group_rank.c b/src/mpi/c/group_rank.c index 030100da25..48e60f8dc5 100644 --- a/src/mpi/c/group_rank.c +++ b/src/mpi/c/group_rank.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_rank = PMPI_Group_rank diff --git a/src/mpi/c/group_size.c b/src/mpi/c/group_size.c index 51796d69ae..96c2773b05 100644 --- a/src/mpi/c/group_size.c +++ b/src/mpi/c/group_size.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_size = PMPI_Group_size diff --git a/src/mpi/c/group_translate_ranks.c b/src/mpi/c/group_translate_ranks.c index b57bce115c..a8f4018367 100644 --- a/src/mpi/c/group_translate_ranks.c +++ b/src/mpi/c/group_translate_ranks.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_translate_ranks = PMPI_Group_translate_ranks diff --git a/src/mpi/c/group_union.c b/src/mpi/c/group_union.c index 882331c9ae..428c4702ac 100644 --- a/src/mpi/c/group_union.c +++ b/src/mpi/c/group_union.c @@ -5,8 +5,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/group/group.h" +#include "mpi/c/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Group_union = PMPI_Group_union diff --git a/src/mpi/c/ibsend.c b/src/mpi/c/ibsend.c index 562942bbb6..a549b81666 100644 --- a/src/mpi/c/ibsend.c +++ b/src/mpi/c/ibsend.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Ibsend = PMPI_Ibsend diff --git a/src/mpi/c/info_c2f.c b/src/mpi/c/info_c2f.c index bb5e3e4eb4..43298a3bc0 100644 --- a/src/mpi/c/info_c2f.c +++ b/src/mpi/c/info_c2f.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Info_c2f = PMPI_Info_c2f diff --git a/src/mpi/c/info_create.c b/src/mpi/c/info_create.c index 00548bd628..9139f8b75c 100644 --- a/src/mpi/c/info_create.c +++ b/src/mpi/c/info_create.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Info_create = PMPI_Info_create diff --git a/src/mpi/c/info_delete.c b/src/mpi/c/info_delete.c index 286ca00581..93c03c5b3b 100644 --- a/src/mpi/c/info_delete.c +++ b/src/mpi/c/info_delete.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #include #include diff --git a/src/mpi/c/info_dup.c b/src/mpi/c/info_dup.c index 8316419963..2bd6b001a5 100644 --- a/src/mpi/c/info_dup.c +++ b/src/mpi/c/info_dup.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Info_dup = PMPI_Info_dup diff --git a/src/mpi/c/info_f2c.c b/src/mpi/c/info_f2c.c index f64d1c507f..fbcd4aee67 100644 --- a/src/mpi/c/info_f2c.c +++ b/src/mpi/c/info_f2c.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Info_f2c = PMPI_Info_f2c diff --git a/src/mpi/c/info_free.c b/src/mpi/c/info_free.c index 3fac3818de..d004c6afcd 100644 --- a/src/mpi/c/info_free.c +++ b/src/mpi/c/info_free.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Info_free = PMPI_Info_free diff --git a/src/mpi/c/info_get.c b/src/mpi/c/info_get.c index c6fe2e3bba..d3678994d4 100644 --- a/src/mpi/c/info_get.c +++ b/src/mpi/c/info_get.c @@ -5,10 +5,10 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" -#include "lam/util/strncpy.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" +#include "util/strncpy.h" #include #include diff --git a/src/mpi/c/info_get_nkeys.c b/src/mpi/c/info_get_nkeys.c index 052ae03b8a..b5deb30ce0 100644 --- a/src/mpi/c/info_get_nkeys.c +++ b/src/mpi/c/info_get_nkeys.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Info_get_nkeys = PMPI_Info_get_nkeys diff --git a/src/mpi/c/info_get_nthkey.c b/src/mpi/c/info_get_nthkey.c index 4e62d48a89..e914485143 100644 --- a/src/mpi/c/info_get_nthkey.c +++ b/src/mpi/c/info_get_nthkey.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #include #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/info_get_valuelen.c b/src/mpi/c/info_get_valuelen.c index 93ae0a9767..f53c481119 100644 --- a/src/mpi/c/info_get_valuelen.c +++ b/src/mpi/c/info_get_valuelen.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #include #include diff --git a/src/mpi/c/info_set.c b/src/mpi/c/info_set.c index 6bb00339c7..4755e3c7fb 100644 --- a/src/mpi/c/info_set.c +++ b/src/mpi/c/info_set.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "lam/lfc/lam_list.h" -#include "mpi/info/info.h" +#include "mpi/c/bindings.h" +#include "lfc/lam_list.h" +#include "info/info.h" #include #include diff --git a/src/mpi/c/init.c b/src/mpi/c/init.c index 34e7e110a3..8624751e5b 100644 --- a/src/mpi/c/init.c +++ b/src/mpi/c/init.c @@ -7,8 +7,8 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" -#include "mpi/runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "runtime/runtime.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Init = PMPI_Init diff --git a/src/mpi/c/init_thread.c b/src/mpi/c/init_thread.c index 77a8f0b36b..39979d2556 100644 --- a/src/mpi/c/init_thread.c +++ b/src/mpi/c/init_thread.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Init_thread = PMPI_Init_thread diff --git a/src/mpi/c/initialized.c b/src/mpi/c/initialized.c index ace8da9b5e..22612a46f6 100644 --- a/src/mpi/c/initialized.c +++ b/src/mpi/c/initialized.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Initialized = PMPI_Initialized diff --git a/src/mpi/c/intercomm_create.c b/src/mpi/c/intercomm_create.c index 92a6732f43..ddb221850f 100644 --- a/src/mpi/c/intercomm_create.c +++ b/src/mpi/c/intercomm_create.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Intercomm_create = PMPI_Intercomm_create diff --git a/src/mpi/c/intercomm_merge.c b/src/mpi/c/intercomm_merge.c index 5fa1bf8b56..ca2aa7417f 100644 --- a/src/mpi/c/intercomm_merge.c +++ b/src/mpi/c/intercomm_merge.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Intercomm_merge = PMPI_Intercomm_merge diff --git a/src/mpi/c/iprobe.c b/src/mpi/c/iprobe.c index dc4b9d445e..ff50590451 100644 --- a/src/mpi/c/iprobe.c +++ b/src/mpi/c/iprobe.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Iprobe = PMPI_Iprobe diff --git a/src/mpi/c/irecv.c b/src/mpi/c/irecv.c index 57c17cfbfe..5aec85c8de 100644 --- a/src/mpi/c/irecv.c +++ b/src/mpi/c/irecv.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/irsend.c b/src/mpi/c/irsend.c index 966bc9423c..e1d93ff9d3 100644 --- a/src/mpi/c/irsend.c +++ b/src/mpi/c/irsend.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Irsend = PMPI_Irsend diff --git a/src/mpi/c/is_thread_main.c b/src/mpi/c/is_thread_main.c index d8f2d8a992..f6fb8664da 100644 --- a/src/mpi/c/is_thread_main.c +++ b/src/mpi/c/is_thread_main.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Is_thread_main = PMPI_Is_thread_main diff --git a/src/mpi/c/isend.c b/src/mpi/c/isend.c index d568736455..0901bb293f 100644 --- a/src/mpi/c/isend.c +++ b/src/mpi/c/isend.c @@ -5,9 +5,9 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/issend.c b/src/mpi/c/issend.c index 66c7ce6102..dfb835d729 100644 --- a/src/mpi/c/issend.c +++ b/src/mpi/c/issend.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Issend = PMPI_Issend diff --git a/src/mpi/c/keyval_create.c b/src/mpi/c/keyval_create.c index ab8ea4c1c2..43d087d01c 100644 --- a/src/mpi/c/keyval_create.c +++ b/src/mpi/c/keyval_create.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Keyval_create = PMPI_Keyval_create diff --git a/src/mpi/c/keyval_free.c b/src/mpi/c/keyval_free.c index dc116394a8..47405e1975 100644 --- a/src/mpi/c/keyval_free.c +++ b/src/mpi/c/keyval_free.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Keyval_free = PMPI_Keyval_free diff --git a/src/mpi/c/lookup_name.c b/src/mpi/c/lookup_name.c index 65128569cc..061dd33ff8 100644 --- a/src/mpi/c/lookup_name.c +++ b/src/mpi/c/lookup_name.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Lookup_name = PMPI_Lookup_name diff --git a/src/mpi/c/op_c2f.c b/src/mpi/c/op_c2f.c index d1dad54b39..9a88594c41 100644 --- a/src/mpi/c/op_c2f.c +++ b/src/mpi/c/op_c2f.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Op_c2f = PMPI_Op_c2f diff --git a/src/mpi/c/op_create.c b/src/mpi/c/op_create.c index fd5a8bb9fd..3f8960634c 100644 --- a/src/mpi/c/op_create.c +++ b/src/mpi/c/op_create.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Op_create = PMPI_Op_create diff --git a/src/mpi/c/op_f2c.c b/src/mpi/c/op_f2c.c index 7836836afe..050f918909 100644 --- a/src/mpi/c/op_f2c.c +++ b/src/mpi/c/op_f2c.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Op_f2c = PMPI_Op_f2c diff --git a/src/mpi/c/op_free.c b/src/mpi/c/op_free.c index 4fd5b07c3b..8a12a0bd90 100644 --- a/src/mpi/c/op_free.c +++ b/src/mpi/c/op_free.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Op_free = PMPI_Op_free diff --git a/src/mpi/c/open_port.c b/src/mpi/c/open_port.c index 2b278df626..9e9b2381ff 100644 --- a/src/mpi/c/open_port.c +++ b/src/mpi/c/open_port.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Open_port = PMPI_Open_port diff --git a/src/mpi/c/pack.c b/src/mpi/c/pack.c index 1f5d78609d..967a011cbf 100644 --- a/src/mpi/c/pack.c +++ b/src/mpi/c/pack.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Pack = PMPI_Pack diff --git a/src/mpi/c/pack_external.c b/src/mpi/c/pack_external.c index af698846a4..a84d9698ab 100644 --- a/src/mpi/c/pack_external.c +++ b/src/mpi/c/pack_external.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Pack_external = PMPI_Pack_external diff --git a/src/mpi/c/pack_external_size.c b/src/mpi/c/pack_external_size.c index 2433dd5e7d..f52260e53c 100644 --- a/src/mpi/c/pack_external_size.c +++ b/src/mpi/c/pack_external_size.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Pack_external_size = PMPI_Pack_external_size diff --git a/src/mpi/c/pack_size.c b/src/mpi/c/pack_size.c index 733d8a76b1..197beae6d3 100644 --- a/src/mpi/c/pack_size.c +++ b/src/mpi/c/pack_size.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Pack_size = PMPI_Pack_size diff --git a/src/mpi/c/pcontrol.c b/src/mpi/c/pcontrol.c index d0bf65bb71..97c24e5b3f 100644 --- a/src/mpi/c/pcontrol.c +++ b/src/mpi/c/pcontrol.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Pcontrol = PMPI_Pcontrol diff --git a/src/mpi/c/probe.c b/src/mpi/c/probe.c index 23c04f6a48..41ef57fc4c 100644 --- a/src/mpi/c/probe.c +++ b/src/mpi/c/probe.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Probe = PMPI_Probe diff --git a/src/mpi/c/publish_name.c b/src/mpi/c/publish_name.c index 435296289f..1aa4d95b36 100644 --- a/src/mpi/c/publish_name.c +++ b/src/mpi/c/publish_name.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Publish_name = PMPI_Publish_name diff --git a/src/mpi/c/put.c b/src/mpi/c/put.c index 0d70ffb32a..2d4198e336 100644 --- a/src/mpi/c/put.c +++ b/src/mpi/c/put.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Put = PMPI_Put diff --git a/src/mpi/c/query_thread.c b/src/mpi/c/query_thread.c index 9d4a0c2b3f..91fc9d9ffc 100644 --- a/src/mpi/c/query_thread.c +++ b/src/mpi/c/query_thread.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Query_thread = PMPI_Query_thread diff --git a/src/mpi/c/recv.c b/src/mpi/c/recv.c index cad629f31b..143be7faaf 100644 --- a/src/mpi/c/recv.c +++ b/src/mpi/c/recv.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/recv_init.c b/src/mpi/c/recv_init.c index 17c9ae648b..119e384dc9 100644 --- a/src/mpi/c/recv_init.c +++ b/src/mpi/c/recv_init.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Recv_init = PMPI_Recv_init diff --git a/src/mpi/c/reduce.c b/src/mpi/c/reduce.c index 57ee04a235..24d92d00e6 100644 --- a/src/mpi/c/reduce.c +++ b/src/mpi/c/reduce.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Reduce = PMPI_Reduce diff --git a/src/mpi/c/reduce_scatter.c b/src/mpi/c/reduce_scatter.c index 74fe4f730d..08a076d50d 100644 --- a/src/mpi/c/reduce_scatter.c +++ b/src/mpi/c/reduce_scatter.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Reduce_scatter = PMPI_Reduce_scatter diff --git a/src/mpi/c/register_datarep.c b/src/mpi/c/register_datarep.c index 9218ca3784..b9adcdfcdf 100644 --- a/src/mpi/c/register_datarep.c +++ b/src/mpi/c/register_datarep.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Register_datarep = PMPI_Register_datarep diff --git a/src/mpi/c/request_c2f.c b/src/mpi/c/request_c2f.c index 4df139256c..05b3fae48c 100644 --- a/src/mpi/c/request_c2f.c +++ b/src/mpi/c/request_c2f.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Request_c2f = PMPI_Request_c2f diff --git a/src/mpi/c/request_f2c.c b/src/mpi/c/request_f2c.c index ecf69e1699..336b3fd46a 100644 --- a/src/mpi/c/request_f2c.c +++ b/src/mpi/c/request_f2c.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Request_f2c = PMPI_Request_f2c diff --git a/src/mpi/c/request_free.c b/src/mpi/c/request_free.c index 66c8067d22..60e76d748c 100644 --- a/src/mpi/c/request_free.c +++ b/src/mpi/c/request_free.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Request_free = PMPI_Request_free diff --git a/src/mpi/c/request_get_status.c b/src/mpi/c/request_get_status.c index 2a7e753e5f..096b31cc26 100644 --- a/src/mpi/c/request_get_status.c +++ b/src/mpi/c/request_get_status.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Request_get_status = PMPI_Request_get_status diff --git a/src/mpi/c/rsend.c b/src/mpi/c/rsend.c index 1a591730cd..2e8172b303 100644 --- a/src/mpi/c/rsend.c +++ b/src/mpi/c/rsend.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/rsend_init.c b/src/mpi/c/rsend_init.c index 77a6eb1fd7..c2b4052f7b 100644 --- a/src/mpi/c/rsend_init.c +++ b/src/mpi/c/rsend_init.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Rsend_init = PMPI_Rsend_init diff --git a/src/mpi/c/scan.c b/src/mpi/c/scan.c index 4297674cc5..7a3b0a8ce6 100644 --- a/src/mpi/c/scan.c +++ b/src/mpi/c/scan.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Scan = PMPI_Scan diff --git a/src/mpi/c/scatter.c b/src/mpi/c/scatter.c index 68baf7ffe1..7bba5d5b29 100644 --- a/src/mpi/c/scatter.c +++ b/src/mpi/c/scatter.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Scatter = PMPI_Scatter diff --git a/src/mpi/c/scatterv.c b/src/mpi/c/scatterv.c index bd161fae64..98432cf71c 100644 --- a/src/mpi/c/scatterv.c +++ b/src/mpi/c/scatterv.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Scatterv = PMPI_Scatterv diff --git a/src/mpi/c/send.c b/src/mpi/c/send.c index f9c9460fcc..0aa887d4c6 100644 --- a/src/mpi/c/send.c +++ b/src/mpi/c/send.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/send_init.c b/src/mpi/c/send_init.c index 36129a78ec..cf785074e4 100644 --- a/src/mpi/c/send_init.c +++ b/src/mpi/c/send_init.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Send_init = PMPI_Send_init diff --git a/src/mpi/c/sendrecv.c b/src/mpi/c/sendrecv.c index 07b380d9f0..3b6b4d5160 100644 --- a/src/mpi/c/sendrecv.c +++ b/src/mpi/c/sendrecv.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Sendrecv = PMPI_Sendrecv diff --git a/src/mpi/c/sendrecv_replace.c b/src/mpi/c/sendrecv_replace.c index a6ca58636b..e3268788ad 100644 --- a/src/mpi/c/sendrecv_replace.c +++ b/src/mpi/c/sendrecv_replace.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Sendrecv_replace = PMPI_Sendrecv_replace diff --git a/src/mpi/c/ssend.c b/src/mpi/c/ssend.c index 5068b187b0..470b7e5d35 100644 --- a/src/mpi/c/ssend.c +++ b/src/mpi/c/ssend.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/ssend_init.c b/src/mpi/c/ssend_init.c index cd0894599f..f05ce83c21 100644 --- a/src/mpi/c/ssend_init.c +++ b/src/mpi/c/ssend_init.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Ssend_init = PMPI_Ssend_init diff --git a/src/mpi/c/start.c b/src/mpi/c/start.c index df2a76a01f..14ac3db83f 100644 --- a/src/mpi/c/start.c +++ b/src/mpi/c/start.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/startall.c b/src/mpi/c/startall.c index 58d14b988a..4f06e2a06b 100644 --- a/src/mpi/c/startall.c +++ b/src/mpi/c/startall.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Startall = PMPI_Startall diff --git a/src/mpi/c/status_c2f.c b/src/mpi/c/status_c2f.c index 8dc2fd9077..e20063692f 100644 --- a/src/mpi/c/status_c2f.c +++ b/src/mpi/c/status_c2f.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Status_c2f = PMPI_Status_c2f diff --git a/src/mpi/c/status_f2c.c b/src/mpi/c/status_f2c.c index 285f635813..0a26187938 100644 --- a/src/mpi/c/status_f2c.c +++ b/src/mpi/c/status_f2c.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Status_f2c = PMPI_Status_f2c diff --git a/src/mpi/c/status_set_cancelled.c b/src/mpi/c/status_set_cancelled.c index 5d92958c6a..c47041cbf0 100644 --- a/src/mpi/c/status_set_cancelled.c +++ b/src/mpi/c/status_set_cancelled.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Status_set_cancelled = PMPI_Status_set_cancelled diff --git a/src/mpi/c/status_set_elements.c b/src/mpi/c/status_set_elements.c index a9d1fef916..512ba0aeed 100644 --- a/src/mpi/c/status_set_elements.c +++ b/src/mpi/c/status_set_elements.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Status_set_elements = PMPI_Status_set_elements diff --git a/src/mpi/c/test.c b/src/mpi/c/test.c index f8297d9a88..47a881b35b 100644 --- a/src/mpi/c/test.c +++ b/src/mpi/c/test.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES diff --git a/src/mpi/c/test_cancelled.c b/src/mpi/c/test_cancelled.c index 32bd1d0de3..d2536ddd15 100644 --- a/src/mpi/c/test_cancelled.c +++ b/src/mpi/c/test_cancelled.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Test_cancelled = PMPI_Test_cancelled diff --git a/src/mpi/c/testall.c b/src/mpi/c/testall.c index 7778c75a2d..536149432e 100644 --- a/src/mpi/c/testall.c +++ b/src/mpi/c/testall.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Testall = PMPI_Testall diff --git a/src/mpi/c/testany.c b/src/mpi/c/testany.c index 88405e0c21..1351491f55 100644 --- a/src/mpi/c/testany.c +++ b/src/mpi/c/testany.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Testany = PMPI_Testany diff --git a/src/mpi/c/testsome.c b/src/mpi/c/testsome.c index 0181dd904e..90911368d9 100644 --- a/src/mpi/c/testsome.c +++ b/src/mpi/c/testsome.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Testsome = PMPI_Testsome diff --git a/src/mpi/c/topo_test.c b/src/mpi/c/topo_test.c index e71b6fbb21..7f51ac47ed 100644 --- a/src/mpi/c/topo_test.c +++ b/src/mpi/c/topo_test.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Topo_test = PMPI_Topo_test diff --git a/src/mpi/c/type_c2f.c b/src/mpi/c/type_c2f.c index 304dcf1e5c..c2eb4bbc1b 100644 --- a/src/mpi/c/type_c2f.c +++ b/src/mpi/c/type_c2f.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_c2f = PMPI_Type_c2f diff --git a/src/mpi/c/type_commit.c b/src/mpi/c/type_commit.c index f2034b9e3c..5d704e6370 100644 --- a/src/mpi/c/type_commit.c +++ b/src/mpi/c/type_commit.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_commit = PMPI_Type_commit diff --git a/src/mpi/c/type_contiguous.c b/src/mpi/c/type_contiguous.c index 19b9b8ea54..76d81d9691 100644 --- a/src/mpi/c/type_contiguous.c +++ b/src/mpi/c/type_contiguous.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_contiguous = PMPI_Type_contiguous diff --git a/src/mpi/c/type_create_darray.c b/src/mpi/c/type_create_darray.c index 2294966e5a..b176da43bf 100644 --- a/src/mpi/c/type_create_darray.c +++ b/src/mpi/c/type_create_darray.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_darray = PMPI_Type_create_darray diff --git a/src/mpi/c/type_create_f90_complex.c b/src/mpi/c/type_create_f90_complex.c index 14e0c41fa8..b261dcd34c 100644 --- a/src/mpi/c/type_create_f90_complex.c +++ b/src/mpi/c/type_create_f90_complex.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_f90_complex = PMPI_Type_create_f90_complex diff --git a/src/mpi/c/type_create_f90_integer.c b/src/mpi/c/type_create_f90_integer.c index a04545fcb0..8660ba9a9a 100644 --- a/src/mpi/c/type_create_f90_integer.c +++ b/src/mpi/c/type_create_f90_integer.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_f90_integer = PMPI_Type_create_f90_integer diff --git a/src/mpi/c/type_create_f90_real.c b/src/mpi/c/type_create_f90_real.c index 9145d7bca6..6880211fe0 100644 --- a/src/mpi/c/type_create_f90_real.c +++ b/src/mpi/c/type_create_f90_real.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_f90_real = PMPI_Type_create_f90_real diff --git a/src/mpi/c/type_create_hindexed.c b/src/mpi/c/type_create_hindexed.c index cfae98a407..29f9ab99a4 100644 --- a/src/mpi/c/type_create_hindexed.c +++ b/src/mpi/c/type_create_hindexed.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_hindexed = PMPI_Type_create_hindexed diff --git a/src/mpi/c/type_create_hvector.c b/src/mpi/c/type_create_hvector.c index 72de86f181..cf1a7cad88 100644 --- a/src/mpi/c/type_create_hvector.c +++ b/src/mpi/c/type_create_hvector.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_hvector = PMPI_Type_create_hvector diff --git a/src/mpi/c/type_create_indexed_block.c b/src/mpi/c/type_create_indexed_block.c index 3437edb145..125c556b1d 100644 --- a/src/mpi/c/type_create_indexed_block.c +++ b/src/mpi/c/type_create_indexed_block.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_indexed_block = PMPI_Type_indexed_block diff --git a/src/mpi/c/type_create_keyval.c b/src/mpi/c/type_create_keyval.c index 982747883f..481aac8144 100644 --- a/src/mpi/c/type_create_keyval.c +++ b/src/mpi/c/type_create_keyval.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_keyval = PMPI_Type_create_keyval diff --git a/src/mpi/c/type_create_resized.c b/src/mpi/c/type_create_resized.c index 07a275ea36..03ad25bfcf 100644 --- a/src/mpi/c/type_create_resized.c +++ b/src/mpi/c/type_create_resized.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_resized = PMPI_Type_create_resized diff --git a/src/mpi/c/type_create_struct.c b/src/mpi/c/type_create_struct.c index 9a63317ffe..a36c93fc4f 100644 --- a/src/mpi/c/type_create_struct.c +++ b/src/mpi/c/type_create_struct.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_struct = PMPI_Type_create_struct diff --git a/src/mpi/c/type_create_subarray.c b/src/mpi/c/type_create_subarray.c index ce95b722e6..421fb854d2 100644 --- a/src/mpi/c/type_create_subarray.c +++ b/src/mpi/c/type_create_subarray.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_create_subarray = PMPI_Type_create_subarray diff --git a/src/mpi/c/type_delete_attr.c b/src/mpi/c/type_delete_attr.c index 6eee76467f..bf0fd78e69 100644 --- a/src/mpi/c/type_delete_attr.c +++ b/src/mpi/c/type_delete_attr.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_delete_attr = PMPI_Type_delete_attr diff --git a/src/mpi/c/type_dup.c b/src/mpi/c/type_dup.c index 9eb680d96e..f5c41772ee 100644 --- a/src/mpi/c/type_dup.c +++ b/src/mpi/c/type_dup.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_dup = PMPI_Type_dup diff --git a/src/mpi/c/type_extent.c b/src/mpi/c/type_extent.c index 44790c0aad..bc8a401085 100644 --- a/src/mpi/c/type_extent.c +++ b/src/mpi/c/type_extent.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_extent = PMPI_Type_extent diff --git a/src/mpi/c/type_f2c.c b/src/mpi/c/type_f2c.c index be9dbb70bc..a5b84c25ac 100644 --- a/src/mpi/c/type_f2c.c +++ b/src/mpi/c/type_f2c.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_f2c = PMPI_Type_f2c diff --git a/src/mpi/c/type_free.c b/src/mpi/c/type_free.c index 357e74acfa..4420a14f15 100644 --- a/src/mpi/c/type_free.c +++ b/src/mpi/c/type_free.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_free = PMPI_Type_free diff --git a/src/mpi/c/type_free_keyval.c b/src/mpi/c/type_free_keyval.c index 947ea94bbb..194d80a86d 100644 --- a/src/mpi/c/type_free_keyval.c +++ b/src/mpi/c/type_free_keyval.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_free_keyval = PMPI_Type_free_keyval diff --git a/src/mpi/c/type_get_attr.c b/src/mpi/c/type_get_attr.c index f603911211..c2e3bf92d4 100644 --- a/src/mpi/c/type_get_attr.c +++ b/src/mpi/c/type_get_attr.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_get_attr = PMPI_Type_get_attr diff --git a/src/mpi/c/type_get_contents.c b/src/mpi/c/type_get_contents.c index 679aee818a..276b63f5e5 100644 --- a/src/mpi/c/type_get_contents.c +++ b/src/mpi/c/type_get_contents.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_get_contents = PMPI_Type_get_contents diff --git a/src/mpi/c/type_get_envelope.c b/src/mpi/c/type_get_envelope.c index dd1a899c19..4662091b45 100644 --- a/src/mpi/c/type_get_envelope.c +++ b/src/mpi/c/type_get_envelope.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_get_envelope = PMPI_Type_get_envelope diff --git a/src/mpi/c/type_get_extent.c b/src/mpi/c/type_get_extent.c index 86d88db427..17615ac852 100644 --- a/src/mpi/c/type_get_extent.c +++ b/src/mpi/c/type_get_extent.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_get_extent = PMPI_Type_get_extent diff --git a/src/mpi/c/type_get_name.c b/src/mpi/c/type_get_name.c index 2ee45408f5..8f908e9953 100644 --- a/src/mpi/c/type_get_name.c +++ b/src/mpi/c/type_get_name.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_get_name = PMPI_Type_get_name diff --git a/src/mpi/c/type_get_true_extent.c b/src/mpi/c/type_get_true_extent.c index b8c275d8f2..76afa32950 100644 --- a/src/mpi/c/type_get_true_extent.c +++ b/src/mpi/c/type_get_true_extent.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_get_true_extent = PMPI_Type_get_true_extent diff --git a/src/mpi/c/type_hindexed.c b/src/mpi/c/type_hindexed.c index 3f0a06bc0d..215b1455ec 100644 --- a/src/mpi/c/type_hindexed.c +++ b/src/mpi/c/type_hindexed.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_hindexed = PMPI_Type_hindexed diff --git a/src/mpi/c/type_hvector.c b/src/mpi/c/type_hvector.c index 1d7a029c27..7331920b01 100644 --- a/src/mpi/c/type_hvector.c +++ b/src/mpi/c/type_hvector.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_hvector = PMPI_Type_hvector diff --git a/src/mpi/c/type_indexed.c b/src/mpi/c/type_indexed.c index e7787cb69d..5d788ea45f 100644 --- a/src/mpi/c/type_indexed.c +++ b/src/mpi/c/type_indexed.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_indexed = PMPI_Type_indexed diff --git a/src/mpi/c/type_lb.c b/src/mpi/c/type_lb.c index 957e814419..e9cc838f21 100644 --- a/src/mpi/c/type_lb.c +++ b/src/mpi/c/type_lb.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_lb = PMPI_Type_lb diff --git a/src/mpi/c/type_match_size.c b/src/mpi/c/type_match_size.c index 43c94fedb5..22195d5e37 100644 --- a/src/mpi/c/type_match_size.c +++ b/src/mpi/c/type_match_size.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_match_size = PMPI_Type_match_size diff --git a/src/mpi/c/type_set_attr.c b/src/mpi/c/type_set_attr.c index bcefeebef2..16cf28a20e 100644 --- a/src/mpi/c/type_set_attr.c +++ b/src/mpi/c/type_set_attr.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_get_attr = PMPI_Type_get_attr diff --git a/src/mpi/c/type_set_name.c b/src/mpi/c/type_set_name.c index 3006fbae82..f2377f0c0e 100644 --- a/src/mpi/c/type_set_name.c +++ b/src/mpi/c/type_set_name.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_set_name = PMPI_Type_set_name diff --git a/src/mpi/c/type_size.c b/src/mpi/c/type_size.c index 52c090be28..5def3ab560 100644 --- a/src/mpi/c/type_size.c +++ b/src/mpi/c/type_size.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_size = PMPI_Type_size diff --git a/src/mpi/c/type_struct.c b/src/mpi/c/type_struct.c index dbccd3402f..a9d03d6271 100644 --- a/src/mpi/c/type_struct.c +++ b/src/mpi/c/type_struct.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_struct = PMPI_Type_struct diff --git a/src/mpi/c/type_ub.c b/src/mpi/c/type_ub.c index 219ef6bea1..1ca077521e 100644 --- a/src/mpi/c/type_ub.c +++ b/src/mpi/c/type_ub.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_ub = PMPI_Type_ub diff --git a/src/mpi/c/type_vector.c b/src/mpi/c/type_vector.c index d82b281033..14be4c405b 100644 --- a/src/mpi/c/type_vector.c +++ b/src/mpi/c/type_vector.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Type_vector = PMPI_Type_vector diff --git a/src/mpi/c/unpack.c b/src/mpi/c/unpack.c index ae1466ee22..8bc6b4314f 100644 --- a/src/mpi/c/unpack.c +++ b/src/mpi/c/unpack.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Unpack = PMPI_Unpack diff --git a/src/mpi/c/unpack_external.c b/src/mpi/c/unpack_external.c index c30a05a91d..c46a8e5403 100644 --- a/src/mpi/c/unpack_external.c +++ b/src/mpi/c/unpack_external.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Unpack_external = PMPI_Unpack_external diff --git a/src/mpi/c/unpublish_name.c b/src/mpi/c/unpublish_name.c index 3a3a1664ca..1d1871a10f 100644 --- a/src/mpi/c/unpublish_name.c +++ b/src/mpi/c/unpublish_name.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Unpublish_name = PMPI_Unpublish_name diff --git a/src/mpi/c/wait.c b/src/mpi/c/wait.c index 5bc0751059..5df47b306c 100644 --- a/src/mpi/c/wait.c +++ b/src/mpi/c/wait.c @@ -5,9 +5,9 @@ #include #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/interface/c/bindings.h" -#include "mca/mpi/pml/pml.h" +#include "runtime/runtime.h" +#include "mpi/c/bindings.h" +#include "mca/pml/pml.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Wait = PMPI_Wait diff --git a/src/mpi/c/waitall.c b/src/mpi/c/waitall.c index b841556c68..379f766fb1 100644 --- a/src/mpi/c/waitall.c +++ b/src/mpi/c/waitall.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Waitall = PMPI_Waitall diff --git a/src/mpi/c/waitany.c b/src/mpi/c/waitany.c index 372348dab2..6194f7aaae 100644 --- a/src/mpi/c/waitany.c +++ b/src/mpi/c/waitany.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Waitany = PMPI_Waitany diff --git a/src/mpi/c/waitsome.c b/src/mpi/c/waitsome.c index 3e191bde20..61d534884e 100644 --- a/src/mpi/c/waitsome.c +++ b/src/mpi/c/waitsome.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Waitsome = PMPI_Waitsome diff --git a/src/mpi/c/win_c2f.c b/src/mpi/c/win_c2f.c index 5178a46736..b9f5bede8f 100644 --- a/src/mpi/c/win_c2f.c +++ b/src/mpi/c/win_c2f.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_c2f = PMPI_Win_c2f diff --git a/src/mpi/c/win_call_errhandler.c b/src/mpi/c/win_call_errhandler.c index f26d742b2a..e6a869f46f 100644 --- a/src/mpi/c/win_call_errhandler.c +++ b/src/mpi/c/win_call_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_call_errhandler = PMPI_Win_call_errhandler diff --git a/src/mpi/c/win_complete.c b/src/mpi/c/win_complete.c index ac3f219186..c57d608074 100644 --- a/src/mpi/c/win_complete.c +++ b/src/mpi/c/win_complete.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_complete = PMPI_Win_complete diff --git a/src/mpi/c/win_create.c b/src/mpi/c/win_create.c index 467ac3c04a..858bb87b6c 100644 --- a/src/mpi/c/win_create.c +++ b/src/mpi/c/win_create.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_create = PMPI_Win_create diff --git a/src/mpi/c/win_create_errhandler.c b/src/mpi/c/win_create_errhandler.c index ee2d207235..85ee5029e7 100644 --- a/src/mpi/c/win_create_errhandler.c +++ b/src/mpi/c/win_create_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_create_errhandler = PMPI_Win_create_errhandler diff --git a/src/mpi/c/win_create_keyval.c b/src/mpi/c/win_create_keyval.c index f88e2e2d90..c845b6dcbb 100644 --- a/src/mpi/c/win_create_keyval.c +++ b/src/mpi/c/win_create_keyval.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_create_keyval = PMPI_Win_create_keyval diff --git a/src/mpi/c/win_delete_attr.c b/src/mpi/c/win_delete_attr.c index 0ab3bdb8cf..a864ca2bdf 100644 --- a/src/mpi/c/win_delete_attr.c +++ b/src/mpi/c/win_delete_attr.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_delete_attr = PMPI_Win_delete_attr diff --git a/src/mpi/c/win_f2c.c b/src/mpi/c/win_f2c.c index 37ea1aa737..58686cbe0c 100644 --- a/src/mpi/c/win_f2c.c +++ b/src/mpi/c/win_f2c.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_f2c = PMPI_Win_f2c diff --git a/src/mpi/c/win_fence.c b/src/mpi/c/win_fence.c index 36c8b64adc..9c47965f4d 100644 --- a/src/mpi/c/win_fence.c +++ b/src/mpi/c/win_fence.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_fence = PMPI_Win_fence diff --git a/src/mpi/c/win_free.c b/src/mpi/c/win_free.c index 7a5dba3e43..72cf295aa2 100644 --- a/src/mpi/c/win_free.c +++ b/src/mpi/c/win_free.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_free = PMPI_Win_free diff --git a/src/mpi/c/win_free_keyval.c b/src/mpi/c/win_free_keyval.c index 282e46b897..9e8181ec29 100644 --- a/src/mpi/c/win_free_keyval.c +++ b/src/mpi/c/win_free_keyval.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_free_keyval = PMPI_free_keyval diff --git a/src/mpi/c/win_get_attr.c b/src/mpi/c/win_get_attr.c index b7ccd3f6ab..017b6a1c4b 100644 --- a/src/mpi/c/win_get_attr.c +++ b/src/mpi/c/win_get_attr.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_get_attr = PMPI_Win_get_attr diff --git a/src/mpi/c/win_get_errhandler.c b/src/mpi/c/win_get_errhandler.c index 9f45b62b78..39a0397cc9 100644 --- a/src/mpi/c/win_get_errhandler.c +++ b/src/mpi/c/win_get_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_get_errhandler = PMPI_Win_get_errhandler diff --git a/src/mpi/c/win_get_group.c b/src/mpi/c/win_get_group.c index 7243e3cbfc..dcd45db981 100644 --- a/src/mpi/c/win_get_group.c +++ b/src/mpi/c/win_get_group.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_get_group = PMPI_Win_get_group diff --git a/src/mpi/c/win_get_name.c b/src/mpi/c/win_get_name.c index 6f49b6ee0f..835a26feec 100644 --- a/src/mpi/c/win_get_name.c +++ b/src/mpi/c/win_get_name.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_get_name = PMPI_Win_get_name diff --git a/src/mpi/c/win_lock.c b/src/mpi/c/win_lock.c index 451b51eb4a..aaba2840c3 100644 --- a/src/mpi/c/win_lock.c +++ b/src/mpi/c/win_lock.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_lock = PMPI_Win_lock diff --git a/src/mpi/c/win_post.c b/src/mpi/c/win_post.c index a8287279e2..5e2c4ac154 100644 --- a/src/mpi/c/win_post.c +++ b/src/mpi/c/win_post.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_post = PMPI_Win_post diff --git a/src/mpi/c/win_set_attr.c b/src/mpi/c/win_set_attr.c index 68fd86c218..07d0dcda91 100644 --- a/src/mpi/c/win_set_attr.c +++ b/src/mpi/c/win_set_attr.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_set_attr = PMPI_Win_set_attr diff --git a/src/mpi/c/win_set_errhandler.c b/src/mpi/c/win_set_errhandler.c index aa85cf2d89..70f183bcbb 100644 --- a/src/mpi/c/win_set_errhandler.c +++ b/src/mpi/c/win_set_errhandler.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_set_errhandler = PMPI_Win_set_errhandler diff --git a/src/mpi/c/win_set_name.c b/src/mpi/c/win_set_name.c index f5f41a29e5..cbd5cd8775 100644 --- a/src/mpi/c/win_set_name.c +++ b/src/mpi/c/win_set_name.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_set_name = PMPI_Win_set_name diff --git a/src/mpi/c/win_start.c b/src/mpi/c/win_start.c index 8deb71a252..4695defa39 100644 --- a/src/mpi/c/win_start.c +++ b/src/mpi/c/win_start.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_start = PMPI_Win_start diff --git a/src/mpi/c/win_test.c b/src/mpi/c/win_test.c index 636f84a3fa..5c3906b95f 100644 --- a/src/mpi/c/win_test.c +++ b/src/mpi/c/win_test.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_test = PMPI_Win_test diff --git a/src/mpi/c/win_unlock.c b/src/mpi/c/win_unlock.c index 8b5e240f24..129f4a8b8e 100644 --- a/src/mpi/c/win_unlock.c +++ b/src/mpi/c/win_unlock.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_unlock = PMPI_Win_unlock diff --git a/src/mpi/c/win_wait.c b/src/mpi/c/win_wait.c index 721691a304..2a53c14fdb 100644 --- a/src/mpi/c/win_wait.c +++ b/src/mpi/c/win_wait.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Win_wait = PMPI_Win_wait diff --git a/src/mpi/c/wtick.c b/src/mpi/c/wtick.c index 22a5a75a22..648a919cb5 100644 --- a/src/mpi/c/wtick.c +++ b/src/mpi/c/wtick.c @@ -5,7 +5,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Wtick = PMPI_Wtick diff --git a/src/mpi/c/wtime.c b/src/mpi/c/wtime.c index 29cb1036fe..f95f3de496 100644 --- a/src/mpi/c/wtime.c +++ b/src/mpi/c/wtime.c @@ -6,7 +6,7 @@ #include #include "mpi.h" -#include "mpi/interface/c/bindings.h" +#include "mpi/c/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES #pragma weak MPI_Wtime = PMPI_Wtime diff --git a/src/mpi/f77/alloc_mem_f.c b/src/mpi/f77/alloc_mem_f.c index 302c31b16e..8ef07028db 100644 --- a/src/mpi/f77/alloc_mem_f.c +++ b/src/mpi/f77/alloc_mem_f.c @@ -7,7 +7,7 @@ #include #include "mpi.h" -#include "mpi/interface/f77/bindings.h" +#include "mpi/f77/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILE_LAYER #pragma weak PMPI_ALLOC_MEM = mpi_alloc_mem_f diff --git a/src/mpi/f77/bindings.h b/src/mpi/f77/bindings.h index 4a1797224f..c77a34a158 100644 --- a/src/mpi/f77/bindings.h +++ b/src/mpi/f77/bindings.h @@ -33,11 +33,11 @@ * .h files and lower-level includes "src/mpi/interface/f77/profile" .h files */ -#include "mpi/interface/f77/prototypes_mpi.h" -#include "mpi/interface/f77/profile/prototypes_pmpi.h" +#include "mpi/f77/prototypes_mpi.h" +#include "mpi/f77/profile/prototypes_pmpi.h" #if LAM_PROFILE_LAYER && ! LAM_HAVE_WEAK_SYMBOLS -#include "mpi/interface/f77/profile/defines.h" +#include "mpi/f77/profile/defines.h" #endif #endif /* LAM_F77_BINDINGS_H */ diff --git a/src/mpi/f77/comm_get_name_f.c b/src/mpi/f77/comm_get_name_f.c index 2c61f2512a..c4409c98c7 100644 --- a/src/mpi/f77/comm_get_name_f.c +++ b/src/mpi/f77/comm_get_name_f.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/f77/bindings.h" +#include "mpi/f77/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILE_LAYER diff --git a/src/mpi/f77/comm_set_name_f.c b/src/mpi/f77/comm_set_name_f.c index b6e2d77ae0..e7984bdb41 100644 --- a/src/mpi/f77/comm_set_name_f.c +++ b/src/mpi/f77/comm_set_name_f.c @@ -5,7 +5,7 @@ #include "lam_config.h" #include "mpi.h" -#include "mpi/interface/f77/bindings.h" +#include "mpi/f77/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILE_LAYER #pragma weak PMPI_COMM_SET_NAME = mpi_comm_set_name_f diff --git a/src/mpi/f77/finalize_f.c b/src/mpi/f77/finalize_f.c index 7857da1187..ac3808ab57 100644 --- a/src/mpi/f77/finalize_f.c +++ b/src/mpi/f77/finalize_f.c @@ -7,7 +7,7 @@ #include #include "mpi.h" -#include "mpi/interface/f77/bindings.h" +#include "mpi/f77/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILE_LAYER diff --git a/src/mpi/f77/free_mem_f.c b/src/mpi/f77/free_mem_f.c index b822086a2d..a99a8cbb7a 100644 --- a/src/mpi/f77/free_mem_f.c +++ b/src/mpi/f77/free_mem_f.c @@ -7,7 +7,7 @@ #include #include "mpi.h" -#include "mpi/interface/f77/bindings.h" +#include "mpi/f77/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILE_LAYER diff --git a/src/mpi/f77/group_compare_f.c b/src/mpi/f77/group_compare_f.c index 61a59c8154..cfd130258b 100644 --- a/src/mpi/f77/group_compare_f.c +++ b/src/mpi/f77/group_compare_f.c @@ -7,8 +7,8 @@ #include #include "mpi.h" -#include "mpi/interface/f77/bindings.h" -#include "mpi/group/group.h" +#include "mpi/f77/bindings.h" +#include "group/group.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILE_LAYER diff --git a/src/mpi/f77/init_f.c b/src/mpi/f77/init_f.c index 66a18df1a2..9b03d9edd4 100644 --- a/src/mpi/f77/init_f.c +++ b/src/mpi/f77/init_f.c @@ -7,7 +7,7 @@ #include #include "mpi.h" -#include "mpi/interface/f77/bindings.h" +#include "mpi/f77/bindings.h" #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILE_LAYER diff --git a/src/os/atomic.h b/src/os/atomic.h index a16ee741e8..ee5dc749c7 100644 --- a/src/os/atomic.h +++ b/src/os/atomic.h @@ -13,34 +13,34 @@ #ifdef __alpha # ifdef __GNUC__ -# include "lam/os/linux/alpha/atomic.h" +# include "os/linux/alpha/atomic.h" # else -# include "lam/os/tru64/atomic.h" +# include "os/tru64/atomic.h" # endif #endif #if defined (__linux__) && defined (__i386) -#include "lam/os/linux/i686/atomic.h" +#include "os/linux/i686/atomic.h" #endif #ifdef __CYGWIN__ -#include "lam/os/cygwin/atomic.h" +#include "os/cygwin/atomic.h" #endif #ifdef __ia64 -#include "lam/os/linux/ia64/atomic.h" +#include "os/linux/ia64/atomic.h" #endif #ifdef __mips -#include "lam/os/irix/atomic.h" +#include "os/irix/atomic.h" #endif #ifdef __APPLE__ /* check if PowerPC 970 (G5) */ #ifdef __ppc_64__ -#include "lam/os/darwin/ppc_64/atomic.h" +#include "os/darwin/ppc_64/atomic.h" #else -#include "lam/os/darwin/ppc_32/atomic.h" +#include "os/darwin/ppc_32/atomic.h" #endif #endif /* __APPLE__ */ diff --git a/src/os/lam_system.h b/src/os/lam_system.h index e62e9e62ef..a29ebd680d 100644 --- a/src/os/lam_system.h +++ b/src/os/lam_system.h @@ -9,23 +9,23 @@ #if defined (__mips) -#include "lam/os/irix/ulm_os.h" +#include "os/irix/ulm_os.h" #elif defined (__linux__) -#include "lam/os/linux/ulm_os.h" +#include "os/linux/ulm_os.h" #elif defined (__osf__) -#include "lam/os/tru64/ulm_os.h" +#include "os/tru64/ulm_os.h" #elif defined (__APPLE__) -#include "lam/os/darwin/ulm_os.h" +#include "os/darwin/ulm_os.h" #elif defined (__CYGWIN__) -#include "lam/os/cygwin/ulm_os.h" +#include "os/cygwin/ulm_os.h" #else # error diff --git a/src/os/numa.h b/src/os/numa.h index 3818ea8e8f..627a8a127b 100644 --- a/src/os/numa.h +++ b/src/os/numa.h @@ -2,8 +2,8 @@ * $HEADER$ */ -#include "lam/constants.h" -#include "lam/lfc/lam_object.h" +#include "constants.h" +#include "lfc/lam_object.h" typedef int affinity_t; diff --git a/src/proc/proc.c b/src/proc/proc.c index 258bf683c2..243773eab6 100644 --- a/src/proc/proc.c +++ b/src/proc/proc.c @@ -1,8 +1,8 @@ #include -#include "lam/threads/mutex.h" -#include "lam/util/output.h" -#include "mpi/proc/proc.h" -#include "mca/lam/pcm/pcm.h" +#include "threads/mutex.h" +#include "util/output.h" +#include "proc/proc.h" +#include "mca/pcm/pcm.h" static lam_list_t lam_proc_list; diff --git a/src/proc/proc.h b/src/proc/proc.h index f3d5cb4698..b2675b3543 100644 --- a/src/proc/proc.h +++ b/src/proc/proc.h @@ -5,8 +5,8 @@ #ifndef LAM_PROC #define LAM_PROC -#include "lam/types.h" -#include "lam/lfc/lam_list.h" +#include "types.h" +#include "lfc/lam_list.h" extern lam_class_t lam_proc_t_class; diff --git a/src/request/request.c b/src/request/request.c index fa476cac92..bb7a4bddaa 100644 --- a/src/request/request.c +++ b/src/request/request.c @@ -2,7 +2,7 @@ * $HEADER$ */ -#include "mpi/request/request.h" +#include "request/request.h" lam_class_t lam_request_t_class = { "lam_request_t", diff --git a/src/request/request.h b/src/request/request.h index 789437f5aa..0a3146ee70 100644 --- a/src/request/request.h +++ b/src/request/request.h @@ -6,7 +6,7 @@ #define LAM_REQUEST_H #include "mpi.h" -#include "lam/lfc/lam_list.h" +#include "lfc/lam_list.h" extern lam_class_t lam_request_t_class; diff --git a/src/runtime/lam_abort.c b/src/runtime/lam_abort.c index 4827f4909d..55bf392c98 100644 --- a/src/runtime/lam_abort.c +++ b/src/runtime/lam_abort.c @@ -7,9 +7,9 @@ #include #include -#include "lam/constants.h" -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" +#include "constants.h" +#include "runtime/runtime.h" +#include "util/output.h" int lam_abort(int status, char *fmt, ...) diff --git a/src/runtime/lam_finalize.c b/src/runtime/lam_finalize.c index 736e859ba3..3aeae5b7b3 100644 --- a/src/runtime/lam_finalize.c +++ b/src/runtime/lam_finalize.c @@ -4,9 +4,9 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" +#include "constants.h" +#include "runtime/runtime.h" +#include "util/output.h" int lam_finalize(void) { diff --git a/src/runtime/lam_init.c b/src/runtime/lam_init.c index daefc2bbb7..bc0c00313b 100644 --- a/src/runtime/lam_init.c +++ b/src/runtime/lam_init.c @@ -6,11 +6,11 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" -#include "lam/threads/mutex.h" -#include "lam/event/event.h" +#include "constants.h" +#include "runtime/runtime.h" +#include "util/output.h" +#include "threads/mutex.h" +#include "event/event.h" /** * First function that must be called in a LAM process. diff --git a/src/runtime/lam_mpi_finalize.c b/src/runtime/lam_mpi_finalize.c index 4a44e0fd03..344ab10e10 100644 --- a/src/runtime/lam_mpi_finalize.c +++ b/src/runtime/lam_mpi_finalize.c @@ -4,18 +4,18 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/runtime/runtime.h" +#include "constants.h" +#include "runtime/runtime.h" #include "mpi.h" -#include "mpi/group/group.h" -#include "mpi/runtime/runtime.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/base.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "group/group.h" +#include "runtime/runtime.h" +#include "mca/base/base.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" int lam_mpi_finalize(void) diff --git a/src/runtime/lam_mpi_init.c b/src/runtime/lam_mpi_init.c index 5f4b7c656d..6c687b10f4 100644 --- a/src/runtime/lam_mpi_init.c +++ b/src/runtime/lam_mpi_init.c @@ -4,20 +4,20 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/runtime/runtime.h" +#include "constants.h" +#include "runtime/runtime.h" #include "mpi.h" -#include "mpi/runtime/runtime.h" -#include "mpi/communicator/communicator.h" -#include "mpi/group/group.h" -#include "mca/lam/base/base.h" -#include "mca/mpi/base/base.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/base.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "runtime/runtime.h" +#include "communicator/communicator.h" +#include "group/group.h" +#include "mca/base/base.h" +#include "mca/base/base.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" /* @@ -55,7 +55,7 @@ int lam_mpi_init(int argc, char **argv, int requested, int *provided) if (LAM_SUCCESS != (ret = mca_base_open())) { return ret; } - if (LAM_SUCCESS != (ret = mca_mpi_open())) { + if (LAM_SUCCESS != (ret = mca_base_open())) { return ret; } @@ -90,7 +90,7 @@ int lam_mpi_init(int argc, char **argv, int requested, int *provided) final thread level */ if (LAM_SUCCESS != - (ret = mca_mpi_init_select_modules(requested, allow_multi_user_threads, + (ret = mca_base_init_select_modules(requested, allow_multi_user_threads, have_hidden_threads, provided))) { /* JMS show_help */ return ret; diff --git a/src/runtime/lam_rte_finalize.c b/src/runtime/lam_rte_finalize.c index 93e8f602cc..f528aff6c4 100644 --- a/src/runtime/lam_rte_finalize.c +++ b/src/runtime/lam_rte_finalize.c @@ -6,13 +6,13 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" -#include "lam/threads/mutex.h" -#include "mca/lam/pcm/base/base.h" -#include "mca/lam/oob/base/base.h" -#include "mca/lam/registry/base/base.h" +#include "constants.h" +#include "runtime/runtime.h" +#include "util/output.h" +#include "threads/mutex.h" +#include "mca/pcm/base/base.h" +#include "mca/oob/base/base.h" +#include "mca/registry/base/base.h" /** diff --git a/src/runtime/lam_rte_init.c b/src/runtime/lam_rte_init.c index b0c745f09a..7e75782922 100644 --- a/src/runtime/lam_rte_init.c +++ b/src/runtime/lam_rte_init.c @@ -6,13 +6,13 @@ #include "lam_config.h" -#include "lam/constants.h" -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" -#include "lam/threads/mutex.h" -#include "mca/lam/pcm/base/base.h" -#include "mca/lam/oob/base/base.h" -#include "mca/lam/registry/base/base.h" +#include "constants.h" +#include "runtime/runtime.h" +#include "util/output.h" +#include "threads/mutex.h" +#include "mca/pcm/base/base.h" +#include "mca/oob/base/base.h" +#include "mca/registry/base/base.h" /** diff --git a/src/threads/condition.h b/src/threads/condition.h index dd373476ce..e325497b19 100644 --- a/src/threads/condition.h +++ b/src/threads/condition.h @@ -5,7 +5,7 @@ #define LAM_CONDITION_H #include "lam_config.h" -#include "lam/threads/mutex.h" +#include "threads/mutex.h" #if defined(LAM_USE_SPINLOCK) #include "condition_spinlock.h" diff --git a/src/threads/condition_pthread.h b/src/threads/condition_pthread.h index 3ce097fb37..fe04c2eb59 100644 --- a/src/threads/condition_pthread.h +++ b/src/threads/condition_pthread.h @@ -5,7 +5,7 @@ #define LAM_CONDITION_PTHREAD_H #include -#include "lam/threads/mutex.h" +#include "threads/mutex.h" struct lam_condition_t { diff --git a/src/threads/condition_spinlock.h b/src/threads/condition_spinlock.h index b917fd9063..03dbc45d2c 100644 --- a/src/threads/condition_spinlock.h +++ b/src/threads/condition_spinlock.h @@ -4,7 +4,7 @@ #ifndef LAM_CONDITION_SPINLOCK_H #define LAM_CONDITION_SPINLOCK_H -#include "lam/threads/condition.h" +#include "threads/condition.h" struct lam_condition_t { diff --git a/src/threads/condition_spinwait.h b/src/threads/condition_spinwait.h index 979b5fb804..dd848efa71 100644 --- a/src/threads/condition_spinwait.h +++ b/src/threads/condition_spinwait.h @@ -5,7 +5,7 @@ #define LAM_CONDITION_SPINWAIT_H #include -#include "lam/threads/mutex.h" +#include "threads/mutex.h" struct lam_condition_t { diff --git a/src/threads/mutex.c b/src/threads/mutex.c index 0a0b6741bd..c24b576cc4 100644 --- a/src/threads/mutex.c +++ b/src/threads/mutex.c @@ -4,7 +4,7 @@ #include "lam_config.h" -#include "lam/threads/mutex.h" +#include "threads/mutex.h" /* * Default to a safe value diff --git a/src/threads/mutex.h b/src/threads/mutex.h index 42070484d3..9e17abebe5 100644 --- a/src/threads/mutex.h +++ b/src/threads/mutex.h @@ -12,11 +12,11 @@ #if defined(LAM_USE_SPINLOCK) -#include "lam/threads/mutex_spinlock.h" +#include "threads/mutex_spinlock.h" #elif defined(LAM_USE_SPINWAIT) -#include "lam/threads/mutex_spinwait.h" +#include "threads/mutex_spinwait.h" #elif defined(LAM_USE_PTHREADS) -#include "lam/threads/mutex_pthread.h" +#include "threads/mutex_pthread.h" #else #error "concurrency model not configured" #endif diff --git a/src/threads/mutex_pthread.c b/src/threads/mutex_pthread.c index d4ce50300f..c5a4ef5969 100644 --- a/src/threads/mutex_pthread.c +++ b/src/threads/mutex_pthread.c @@ -1,7 +1,7 @@ /* * $HEADER$ */ -#include "lam/threads/mutex.h" +#include "threads/mutex.h" #if defined(LAM_USE_PTHREADS) static void lam_mutex_construct(lam_mutex_t* m) diff --git a/src/threads/mutex_pthread.h b/src/threads/mutex_pthread.h index 7ccbcc8eb0..1e96369b46 100644 --- a/src/threads/mutex_pthread.h +++ b/src/threads/mutex_pthread.h @@ -6,8 +6,8 @@ #define _LAM_MUTEX_PTHREAD_ #include -#include "lam/lfc/lam_object.h" -#include "lam/os/atomic.h" +#include "lfc/lam_object.h" +#include "os/atomic.h" struct lam_mutex_t { diff --git a/src/threads/mutex_spinlock.h b/src/threads/mutex_spinlock.h index 1be18ea699..4a85044b17 100644 --- a/src/threads/mutex_spinlock.h +++ b/src/threads/mutex_spinlock.h @@ -5,8 +5,8 @@ #ifndef LAM_MUTEX_SPINLOCK_ #define LAM_MUTEX_SPINLOCK_ -#include "lam/lfc/lam_object.h" -#include "lam/os/atomic.h" +#include "lfc/lam_object.h" +#include "os/atomic.h" struct lam_mutex_t { diff --git a/src/threads/mutex_spinwait.c b/src/threads/mutex_spinwait.c index cedd0ad5cd..e148abebf8 100644 --- a/src/threads/mutex_spinwait.c +++ b/src/threads/mutex_spinwait.c @@ -1,4 +1,4 @@ -#include "lam/threads/mutex.h" +#include "threads/mutex.h" #if defined(LAM_USE_SPINWAIT) diff --git a/src/threads/mutex_spinwait.h b/src/threads/mutex_spinwait.h index a37eba2c7d..c0397c3a0e 100644 --- a/src/threads/mutex_spinwait.h +++ b/src/threads/mutex_spinwait.h @@ -6,8 +6,8 @@ #define LAM_MUTEX_SPINWAIT_ #include -#include "lam/lfc/lam_object.h" -#include "lam/os/atomic.h" +#include "lfc/lam_object.h" +#include "os/atomic.h" #ifndef MUTEX_SPINWAIT #define MUTEX_SPINWAIT 10000 diff --git a/src/threads/thread.c b/src/threads/thread.c index 1071093829..ac8bc2fe3e 100644 --- a/src/threads/thread.c +++ b/src/threads/thread.c @@ -2,8 +2,8 @@ * $HEADER$ */ -#include "lam/constants.h" -#include "lam/threads/thread.h" +#include "constants.h" +#include "threads/thread.h" static void lam_thread_construct(lam_thread_t* t) diff --git a/src/threads/thread.h b/src/threads/thread.h index 634a511572..420dd05f4f 100644 --- a/src/threads/thread.h +++ b/src/threads/thread.h @@ -6,7 +6,7 @@ #define LAM_THREAD_H #include -#include "lam/lfc/lam_object.h" +#include "lfc/lam_object.h" typedef void* (*lam_thread_fn_t)(lam_object_t*); diff --git a/src/tools/laminfo/laminfo.cc b/src/tools/laminfo/laminfo.cc index 7d0c29d43b..94be3a11e8 100644 --- a/src/tools/laminfo/laminfo.cc +++ b/src/tools/laminfo/laminfo.cc @@ -16,11 +16,11 @@ #include #include -#include "lam/runtime/runtime.h" -#include "lam/util/output.h" -#include "lam/util/cmd_line.h" -#include "mpi/communicator/communicator.h" -#include "mca/lam/base/base.h" +#include "runtime/runtime.h" +#include "util/output.h" +#include "util/cmd_line.h" +#include "communicator/communicator.h" +#include "mca/base/base.h" #include "tools/laminfo/laminfo.h" diff --git a/src/tools/laminfo/laminfo.h b/src/tools/laminfo/laminfo.h index 415e851dda..82e994354d 100644 --- a/src/tools/laminfo/laminfo.h +++ b/src/tools/laminfo/laminfo.h @@ -9,8 +9,8 @@ #include #include -#include "lam/lfc/lam_list.h" -#include "lam/util/cmd_line.h" +#include "lfc/lam_list.h" +#include "util/cmd_line.h" #include "mca/mca.h" diff --git a/src/tools/laminfo/modules.cc b/src/tools/laminfo/modules.cc index 6145cc942c..d41fae7dee 100644 --- a/src/tools/laminfo/modules.cc +++ b/src/tools/laminfo/modules.cc @@ -10,19 +10,19 @@ #include #include -#include "mca/lam/base/base.h" -#include "mca/lam/pcm/pcm.h" -#include "mca/lam/pcm/base/base.h" -#include "mca/lam/oob/oob.h" -#include "mca/lam/oob/base/base.h" -#include "mca/lam/registry/registry.h" -#include "mca/lam/registry/base/base.h" -#include "mca/mpi/pml/pml.h" -#include "mca/mpi/pml/base/base.h" -#include "mca/mpi/ptl/ptl.h" -#include "mca/mpi/ptl/base/base.h" -#include "mca/mpi/coll/coll.h" -#include "mca/mpi/coll/base/base.h" +#include "mca/base/base.h" +#include "mca/pcm/pcm.h" +#include "mca/pcm/base/base.h" +#include "mca/oob/oob.h" +#include "mca/oob/base/base.h" +#include "mca/registry/registry.h" +#include "mca/registry/base/base.h" +#include "mca/pml/pml.h" +#include "mca/pml/base/base.h" +#include "mca/ptl/ptl.h" +#include "mca/ptl/base/base.h" +#include "mca/coll/coll.h" +#include "mca/coll/base/base.h" #include "tools/laminfo/laminfo.h" using namespace std; @@ -75,7 +75,6 @@ void laminfo::open_modules() // Open all modules mca_base_open(); - mca_mpi_open(); module_map["base"] = NULL; mca_pcm_base_open(); diff --git a/src/tools/laminfo/param.cc b/src/tools/laminfo/param.cc index 8921ca19da..7d4456f36d 100644 --- a/src/tools/laminfo/param.cc +++ b/src/tools/laminfo/param.cc @@ -11,8 +11,8 @@ #include #include -#include "lam/lfc/lam_value_array.h" -#include "mca/lam/base/mca_base_param.h" +#include "lfc/lam_value_array.h" +#include "mca/base/mca_base_param.h" #include "tools/laminfo/laminfo.h" using namespace std; @@ -36,7 +36,7 @@ string laminfo::path_sysconfdir = "sysconfdir"; // // External variables // -// This exists in mca/lam/base/mca_base_param.c. It's not extern'ed +// This exists in mca/base/mca_base_param.c. It's not extern'ed // in mca_base_param.h so that no one else will use it. // diff --git a/src/tools/laminfo/version.cc b/src/tools/laminfo/version.cc index b47a0de0e3..aa0ee82417 100644 --- a/src/tools/laminfo/version.cc +++ b/src/tools/laminfo/version.cc @@ -9,7 +9,7 @@ #include -#include "mca/lam/base/base.h" +#include "mca/base/base.h" #include "tools/laminfo/laminfo.h" using namespace std; diff --git a/src/tools/wrappers/wrap.cc b/src/tools/wrappers/wrap.cc index c8118dfd5b..ac094808a6 100644 --- a/src/tools/wrappers/wrap.cc +++ b/src/tools/wrappers/wrap.cc @@ -18,11 +18,11 @@ #include #include -#include "lam/util/path.h" +#include "util/path.h" #include "tools/wrappers/lamwrap.h" -#include "lam/util/argv.h" -#include "lam/util/few.h" -#include "lam/util/path.h" +#include "util/argv.h" +#include "util/few.h" +#include "util/path.h" extern char **environ; diff --git a/src/types.h b/src/types.h index cbf509b9a9..8f3c6ceec4 100644 --- a/src/types.h +++ b/src/types.h @@ -9,7 +9,7 @@ #include #include "lam_config.h" -#include "lam/stdint.h" +#include "stdint.h" /* * Increase FD_SETSIZE diff --git a/src/util/argv.c b/src/util/argv.c index e61d2ec0fb..3510a95e25 100644 --- a/src/util/argv.c +++ b/src/util/argv.c @@ -7,9 +7,9 @@ #include #include -#include "lam/constants.h" -#include "lam/util/argv.h" -#include "lam/util/strncpy.h" +#include "constants.h" +#include "util/argv.h" +#include "util/strncpy.h" #define ARGSIZE 128 diff --git a/src/util/argv.h b/src/util/argv.h index 72f1f0c0fa..3a17b223f5 100644 --- a/src/util/argv.h +++ b/src/util/argv.h @@ -5,7 +5,7 @@ #ifndef LAM_ARGV_H #define LAM_ARGV_H -#include "lam/types.h" +#include "types.h" #ifdef __cplusplus extern "C" { diff --git a/src/util/cmd_line.c b/src/util/cmd_line.c index 68834b7344..7910af756e 100644 --- a/src/util/cmd_line.c +++ b/src/util/cmd_line.c @@ -9,13 +9,13 @@ #include #include -#include "lam/lfc/lam_object.h" -#include "lam/lfc/lam_list.h" -#include "lam/threads/mutex.h" -#include "lam/util/argv.h" -#include "lam/util/cmd_line.h" -#include "lam/util/strncpy.h" -#include "lam/util/output.h" +#include "lfc/lam_object.h" +#include "lfc/lam_list.h" +#include "threads/mutex.h" +#include "util/argv.h" +#include "util/cmd_line.h" +#include "util/strncpy.h" +#include "util/output.h" /* diff --git a/src/util/cmd_line.h b/src/util/cmd_line.h index 0b5f16dc10..26fc7eb97c 100644 --- a/src/util/cmd_line.h +++ b/src/util/cmd_line.h @@ -8,10 +8,10 @@ #define LAM_CMD_LINE_H #include "lam_config.h" -#include "lam/constants.h" -#include "lam/lfc/lam_list.h" -#include "lam/threads/mutex.h" -#include "lam/util/argv.h" +#include "constants.h" +#include "lfc/lam_list.h" +#include "threads/mutex.h" +#include "util/argv.h" /* * Top-level descriptor diff --git a/src/util/few.c b/src/util/few.c index ba11f6888b..628244249a 100644 --- a/src/util/few.c +++ b/src/util/few.c @@ -10,8 +10,8 @@ #include #include -#include "lam/constants.h" -#include "lam/util/few.h" +#include "constants.h" +#include "util/few.h" /** @file **/ diff --git a/src/util/if.c b/src/util/if.c index 4478518c79..70ac49604c 100644 --- a/src/util/if.c +++ b/src/util/if.c @@ -13,11 +13,11 @@ #include #include -#include "lam/constants.h" -#include "lam/lfc/lam_list.h" -#include "lam/util/if.h" -#include "lam/util/output.h" -#include "lam/util/strncpy.h" +#include "constants.h" +#include "lfc/lam_list.h" +#include "util/if.h" +#include "util/output.h" +#include "util/strncpy.h" #ifndef IF_NAMESIZE #define IF_NAMESIZE 32 diff --git a/src/util/output.c b/src/util/output.c index 5093863c8c..ffa68fcf90 100644 --- a/src/util/output.c +++ b/src/util/output.c @@ -16,9 +16,9 @@ #include #include -#include "lam/constants.h" -#include "lam/util/output.h" -#include "lam/threads/mutex.h" +#include "constants.h" +#include "util/output.h" +#include "threads/mutex.h" /* diff --git a/src/util/path.c b/src/util/path.c index a73a92f391..3c9d4b2450 100644 --- a/src/util/path.c +++ b/src/util/path.c @@ -9,8 +9,8 @@ #include #include "lam_config.h" -#include "lam/util/path.h" -#include "lam/util/argv.h" +#include "util/path.h" +#include "util/argv.h" /** * PATH environment variable separator diff --git a/src/util/reactor.c b/src/util/reactor.c index 36a4192a32..76dc4ab064 100644 --- a/src/util/reactor.c +++ b/src/util/reactor.c @@ -9,10 +9,10 @@ #include #include "lam_config.h" -#include "lam/constants.h" -#include "lam/util/reactor.h" -#include "lam/util/output.h" -#include "lam/runtime/runtime.h" +#include "constants.h" +#include "util/reactor.h" +#include "util/output.h" +#include "runtime/runtime.h" const int LAM_REACTOR_NOTIFY_RECV = 1; diff --git a/src/util/reactor.h b/src/util/reactor.h index 7b598dc24c..183cce873f 100644 --- a/src/util/reactor.h +++ b/src/util/reactor.h @@ -5,10 +5,10 @@ #ifndef LAM_REACTOR_H #define LAM_REACTOR_H -#include "lam/types.h" -#include "lam/lfc/lam_list.h" -#include "lam/lfc/lam_hash_table.h" -#include "lam/threads/mutex.h" +#include "types.h" +#include "lfc/lam_list.h" +#include "lfc/lam_hash_table.h" +#include "threads/mutex.h" extern const int LAM_REACTOR_NOTIFY_ALL; extern const int LAM_REACTOR_NOTIFY_RECV; diff --git a/src/util/strncpy.c b/src/util/strncpy.c index f91d46ea6a..0dfeaf2b5b 100644 --- a/src/util/strncpy.c +++ b/src/util/strncpy.c @@ -9,7 +9,7 @@ #include -#include "lam/util/strncpy.h" +#include "util/strncpy.h" /** diff --git a/src/win/win.h b/src/win/win.h index 115812d818..d976b667f8 100644 --- a/src/win/win.h +++ b/src/win/win.h @@ -6,8 +6,8 @@ #define LAM_WIN_H -#include "lam/lfc/lam_object.h" -#include "lam/lfc/lam_hash_table.h" +#include "lfc/lam_object.h" +#include "lfc/lam_hash_table.h" extern lam_class_t lam_win_t_class;