Remove the gm_config.h file as now the GM defines are in the ompi_config.h.

Add some more header files for the next commit ... stay tuned ...

This commit was SVN r7315.

ompi/mca/ptl/gm/configure.m4

@@ -35,4 +35,7 @@ AC_DEFUN([MCA_ptl_gm_CONFIG],[
     AC_SUBST([ptl_gm_CPPFLAGS])
     AC_SUBST([ptl_gm_LDFLAGS])
     AC_SUBST([ptl_gm_LIBS])
+    # Define it for internal use.
+    AC_DEFINE_UNQUOTED(OMPI_MCA_PTL_GM_CACHE_ENABLE, 0,
+            [Whether we want the internal GM cache to be activated.])
 ])dnl

ompi/mca/ptl/gm/configure.params

@@ -20,5 +20,4 @@
 # Specific to this module
 
 PARAM_INIT_FILE=ptl_gm.c
-PARAM_CONFIG_HEADER_FILE="gm_config.h"
 PARAM_CONFIG_FILES="Makefile"

ompi/mca/ptl/gm/ptl_gm.c

@@ -19,19 +19,19 @@
  */
 
 #include "ompi_config.h"
-#include "gm_config.h"
 #include <string.h>
-#include "class/ompi_bitmap.h"
+#include "ompi/class/ompi_bitmap.h"
 #include "opal/util/output.h"
-#include "util/proc_info.h"
-#include "mca/ns/ns.h"
-#include "mca/ptl/ptl.h"
-#include "mca/ptl/base/ptl_base_header.h"
+#include "orte/util/proc_info.h"
+#include "orte/mca/ns/ns.h"
+#include "ompi/mca/ptl/ptl.h"
+#include "ompi/mca/ptl/base/ptl_base_header.h"
 #include "ptl_gm.h"
 #include "ptl_gm_proc.h"
 #include "ptl_gm_priv.h"
 #include "ptl_gm_peer.h"
 #include "ptl_gm_sendfrag.h"
+#include "ompi/proc/proc.h"
 
 mca_ptl_gm_module_t mca_ptl_gm_module = {
     {

ompi/mca/ptl/gm/ptl_gm.h

@@ -24,7 +24,6 @@
 #define MCA_PTL_GM_H
 
 #include "ompi_config.h"
-#include "gm_config.h"
 #include "class/ompi_free_list.h"
 #include "mca/ptl/ptl.h"
 #include "ptl_gm_priv.h"

ompi/mca/ptl/gm/ptl_gm_priv.h

@@ -17,7 +17,7 @@
  * 
  * $HEADER$
  */
-#include "gm_config.h"
+#include "ompi_config.h"
 #include "gm.h"
 
 struct mca_ptl_gm_send_frag_t;

ompi/mca/ptl/gm/ptl_gm_proc.c

@@ -23,8 +23,10 @@
 #include <string.h>
 
 #include "include/sys/atomic.h"
-#include "class/opal_hash_table.h"
-#include "mca/pml/base/pml_base_module_exchange.h"
+#include "opal/class/opal_hash_table.h"
+#include "ompi/mca/pml/base/pml_base_module_exchange.h"
+#include "ompi/proc/proc.h"
+#include "opal/util/output.h"
 #include "ptl_gm.h"
 #include "ptl_gm_peer.h"
 #include "ptl_gm_proc.h"

ompi/mca/ptl/gm/ptl_gm_proc.h

@@ -24,6 +24,7 @@
 #define MCA_PTL_GM_PROC_H
 
 #include "opal/class/opal_object.h"
+#include "orte/mca/ns/ns_types.h"
 #include "ptl_gm.h"
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {

ompi/mca/ptl/gm/ptl_gm_sendfrag.h

@@ -23,9 +23,10 @@
 #ifndef MCA_PTL_GM_SEND_FRAG_H
 #define MCA_PTL_GM_SEND_FRAG_H
 
-#include "mca/ptl/base/ptl_base_sendreq.h"
-#include "mca/ptl/base/ptl_base_sendfrag.h"
-#include "mca/ptl/base/ptl_base_recvfrag.h"
+#include "ompi/mca/ptl/base/ptl_base_sendreq.h"
+#include "ompi/mca/ptl/base/ptl_base_sendfrag.h"
+#include "ompi/mca/ptl/base/ptl_base_recvfrag.h"
+#include "ompi/communicator/communicator.h"
 
 #define MATCH 0
 #define FRAG 1