fix compilation error
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 2 Apr 2012 14:49:25 +0000 (09:49 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 2 Apr 2012 14:49:25 +0000 (09:49 -0500)
src/arch/uth-linux-x86_64/conv-mach.h
src/ck-core/mpi-interoperate.C

index 4db1a71ab7326ad32a80990b5b3b88cebfd726ca..4b8f8defca7c438eda13f4f605b4e2f9d55aeab2 100644 (file)
@@ -4,6 +4,7 @@
 #define CMK_AMD64                                          1
 #define CMK_64BIT                                          1
 
 #define CMK_AMD64                                          1
 #define CMK_64BIT                                          1
 
+#undef CMK_CCS_AVAILABLE
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 62e1043e5168f7ccc67bf7d02cc6df1af3595c51..74df0b7032f7cb73de5da664cf7c7712cab31cc9 100644 (file)
@@ -62,12 +62,16 @@ void _libExitHandler(envelope *env)
 }
 
 void CharmLibInit(int peid, int numpes, int argc, char **argv){
 }
 
 void CharmLibInit(int peid, int numpes, int argc, char **argv){
+#if CMK_CONVERSE_MPI
        //note CmiNumNodes and CmiMyNode should just be macros
        _Cmi_numnodes = numpes;
        _Cmi_mynode = peid;
 
        CharmLibInterOperate = 1;
        ConverseInit(argc, argv, (CmiStartFn)_initCharm, 1, 0);
        //note CmiNumNodes and CmiMyNode should just be macros
        _Cmi_numnodes = numpes;
        _Cmi_mynode = peid;
 
        CharmLibInterOperate = 1;
        ConverseInit(argc, argv, (CmiStartFn)_initCharm, 1, 0);
+#else
+        CmiAbort("mpi-interoperate only supports MPI machine layer");
+#endif
 }
 
 #undef CkExit
 }
 
 #undef CkExit