Updating header file names after the great directory reorganization.

This commit was SVN r877.

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 */

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!

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"
 
 
 /* *******************************************************************  */

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;

src/communicator/lam_comm_init.c

@@ -6,9 +6,9 @@
 
 #include <stdio.h>
 #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"
 
 
 /*

src/ctnetwork/ctchannel.c

@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include "lam/ctnetwork/ctchannel.h"
+#include "ctnetwork/ctchannel.h"
 
 #define CHANNEL_CLS(chnl) \
     ((lam_ctchannel_class_t *)(((lam_object_t *) chnl)->obj_class))

src/ctnetwork/ctchannel.h

@@ -9,8 +9,8 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include "lam/lfc/lam_object.h"
-#include "lam/ctnetwork/ctmessage.h"
+#include "lfc/lam_object.h"
+#include "ctnetwork/ctmessage.h"
 
 
 /*

src/ctnetwork/ctclient.c

@@ -2,5 +2,5 @@
  * $HEADER$
  */
 
-#include "lam/ctnetwork/ctclient.h"
+#include "ctnetwork/ctclient.h"
 

src/ctnetwork/ctcontroller.c

@@ -2,5 +2,5 @@
  * $HEADER$
  */
 
-#include "lam/ctnetwork/ctpeer.h"
+#include "ctnetwork/ctpeer.h"
 

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 *,

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 = {

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"
 
 
 /*

src/ctnetwork/ctnode.c

@@ -2,5 +2,5 @@
  * $HEADER$
  */
 
-#include "lam/ctnetwork/ctnode.h"
+#include "ctnetwork/ctnode.h"
 

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"
 
 
 /*

src/ctnetwork/ctpeer.c

@@ -2,5 +2,5 @@
  * $HEADER$
  */
 
-#include "lam/ctnetwork/ctpeer.h"
+#include "ctnetwork/ctpeer.h"
 

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 */

src/datatype/datatype.c

@@ -7,7 +7,7 @@
  */
 
 #include "lam_config.h"
-#include "mpi/datatype/datatype.h"
+#include "datatype/datatype.h"
 
 /*
  * Global variables

src/datatype/datatype.h

@@ -21,11 +21,11 @@
 #include <stdlib.h>
 
 #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"
 

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;

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;

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

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;

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;

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;

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,

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

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 */

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)
 {

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__)

src/info/info.c

@@ -2,7 +2,7 @@
  * $HEADER$
  */
 
-#include "mpi/info/info.h"
+#include "info/info.h"
 
 /*
  * lam_info_t classes

src/info/info.h

@@ -8,9 +8,9 @@
 #include <string.h>
 
 #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"
 
 
 /**

src/lam.h

@@ -9,8 +9,8 @@
 #include <sys/socket.h>
 
 #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 */

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

src/lfc/lam_bitmap.h

@@ -15,9 +15,9 @@
 #include <string.h>
 
 #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

src/lfc/lam_hash_table.c

@@ -6,10 +6,10 @@
 #include <stdlib.h>
 
 #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

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;

src/lfc/lam_list.c

@@ -2,7 +2,7 @@
  * $HEADER$
  */
 
-#include "lam/lfc/lam_list.h"
+#include "lfc/lam_list.h"
 
 /*
  *  List classes

src/lfc/lam_list.h

@@ -6,7 +6,7 @@
 #define LAM_LIST_H
 
 #include <stdio.h>
-#include "lam/lfc/lam_object.h"
+#include "lfc/lam_object.h"
 
 /*
  *

src/lfc/lam_object.c

@@ -10,8 +10,8 @@
 
 #include <stdio.h>
 
-#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

src/lfc/lam_pointer_array.c

@@ -11,9 +11,9 @@
 #include <stdio.h>
 #include <assert.h>
 
-#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 *);

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

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)

src/lfc/lam_value_array.h

@@ -7,11 +7,11 @@
 
 #include <string.h>
 #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
 
 /*

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"
 
 
 /*

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"
 
 
 /*

src/mca/base/mca_base_cmd_line.c

@@ -7,10 +7,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#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"
 
 
 /* 

src/mca/base/mca_base_module_compare.c

@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "mca/mca.h"
-#include "mca/lam/base/base.h"
+#include "mca/base/base.h"
 
 
 /*

src/mca/base/mca_base_module_exchange.c

@@ -4,13 +4,13 @@
 
 #include <string.h>
 #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"
 
 
 

src/mca/base/mca_base_module_exchange.h

@@ -11,7 +11,7 @@
 
 #include <sys/types.h>
 
-#include "mpi/proc/proc.h"
+#include "proc/proc.h"
 #include "mca/mca.h"
 
 

src/mca/base/mca_base_module_find.c

@@ -12,11 +12,11 @@
 /* Ensure to get the right <ltdl.h> */ 
 #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"
 
 
 /*

src/mca/base/mca_base_module_registry.c

@@ -12,10 +12,10 @@
 /* Ensure to get the right <ltdl.h> */ 
 #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"
 
 
 /*

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, 

src/mca/base/mca_base_modules_open.c

@@ -8,12 +8,12 @@
 #include <string.h>
 #include <stdlib.h>
 
-#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 {

src/mca/base/mca_base_open.c

@@ -8,9 +8,9 @@
 #include <string.h>
 #include <syslog.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"
 
 
 /*

src/mca/base/mca_base_param.c

@@ -10,10 +10,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#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).
  */

src/mca/base/mca_lam_param.c

@@ -10,10 +10,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#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).
  */

src/mca/base/mca_mpi_base_open.c

@@ -8,8 +8,8 @@
 #include <string.h>
 #include <syslog.h>
 
-#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", 

src/mca/base/mca_mpi_init_select_modules.c

@@ -6,15 +6,15 @@
 
 #include <stdio.h>
 
-#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)
 {

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);

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)

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"
 
 
 /*

src/mca/coll/base/coll_base_close.c

@@ -6,11 +6,11 @@
 
 #include <stdio.h>
 
-#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)

src/mca/coll/base/coll_base_open.c

@@ -7,9 +7,9 @@
 #include <stdio.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"
 
 
 /*
@@ -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"
 
 
 /*

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, 

src/mca/coll/basic/src/coll_basic.c

@@ -8,8 +8,8 @@
 #include <stdio.h>
 
 #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"
 
 

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"
 
 
 /*

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"
 
 

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"
 
 

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"
 
 

src/mca/coll/basic/src/coll_basic_alltoall.c

@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <errno.h>
 
-#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"
 
 

src/mca/coll/basic/src/coll_basic_alltoallv.c

@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <errno.h>
 
-#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"
 
 

src/mca/coll/basic/src/coll_basic_alltoallw.c

@@ -8,11 +8,11 @@
 #include <stdio.h>
 #include <errno.h>
 
-#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"
 
 

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"
 
 

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"
 
 

src/mca/coll/basic/src/coll_basic_exscan.c

@@ -7,10 +7,10 @@
 
 #include <stdio.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"
 
 

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"
 
 

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"
 
 

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"
 
 /*

src/mca/coll/basic/src/coll_basic_reduce.c

@@ -7,10 +7,10 @@
 
 #include <stdio.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"
 
 

src/mca/coll/basic/src/coll_basic_reduce_scatter.c

@@ -8,10 +8,10 @@
 #include <stdio.h>
 #include <errno.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"
 
 

src/mca/coll/basic/src/coll_basic_scan.c

@@ -7,10 +7,10 @@
 
 #include <stdio.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"
 
 

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"
 
 

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"
 
 

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 */
 

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 <string.h>
 
 int mca_io_romio_File_open(MPI_Comm comm, char *filename, int amode,

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;

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 <string.h>
 
 

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){

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;

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  */

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"
 
 

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

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

src/mca/oob/base/oob_base_close.c

@@ -6,11 +6,11 @@
 
 #include <stdio.h>
 
-#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)

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"
 
 
 /*

src/mca/oob/base/oob_base_select.c

@@ -6,12 +6,12 @@
 
 #include <stdio.h>
 
-#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"
 
 
 /**

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 <stdio.h>
 #include <sys/types.h>

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

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 <stdio.h>
 #include <stdlib.h>

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"
 
 /*