From ebb767b662ff4e778f5e8657979e5f85adad66b9 Mon Sep 17 00:00:00 2001
From: abn <adrien.bruneton@cea.fr>
Date: Wed, 11 May 2016 13:59:02 +0200
Subject: [PATCH] Make PARMETIS and METIS partitioner mutually exclusive.

Otherwise they mix up in certain configurations.
---
 CMakeLists.txt                                | 30 +++++++++++++++----
 .../Test/MEDPARTITIONERTest.hxx               | 18 ++++++-----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a21d11062..6de2652ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,9 +56,17 @@ OPTION(MEDCOUPLING_USE_MPI "(Use MPI containers) - For MED this triggers the bui
 OPTION(MEDCOUPLING_BUILD_TESTS "Build MED tests." ON)
 OPTION(MEDCOUPLING_BUILD_DOC "Build MED doc." ON)
 OPTION(MEDCOUPLING_BUILD_STATIC "Build MEDCoupling library in static mode." OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
+IF(${MEDCOUPLING_USE_MPI})
+  SET(USE_METIS_NOT_PARMETIS OFF)
+ELSE()
+  SET(USE_METIS_NOT_PARMETIS ON)
+ENDIF()
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner."  ${USE_METIS_NOT_PARMETIS}
+        "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON 
+        "MEDCOUPLING_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ${MEDCOUPLING_USE_MPI} 
+        "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
 SET(XDR_DEFAULT_OPTION ON)
 IF(WIN32)
     SET(XDR_DEFAULT_OPTION OFF)
@@ -72,6 +80,10 @@ ELSE()
     SET(BUILD_SHARED_LIBS 1)
 ENDIF()
 
+IF(${MEDCOUPLING_PARTITIONER_PARMETIS} AND ${MEDCOUPLING_PARTITIONER_METIS})
+    MESSAGE(FATAL_ERROR "ParMetis and Metis are mutually exclusive! Make a choice (options MEDCOUPLING_PARTITIONER_METIS and MEDCOUPLING_PARTITIONER_PARMETIS).")
+ENDIF()
+
 #
 # Set list of prerequisites
 # =========================
@@ -90,12 +102,16 @@ IF(NOT MEDCOUPLING_MICROMED)
     IF(MEDCOUPLING_PARTITIONER_METIS)
       FIND_PACKAGE(SalomeMetis)
       SALOME_LOG_OPTIONAL_PACKAGE(Metis MEDCOUPLING_PARTITIONER_METIS)
-      ADD_DEFINITIONS("-DMED_ENABLE_METIS")
+      IF(SalomeMetis_FOUND)
+         ADD_DEFINITIONS("-DMED_ENABLE_METIS")
+      ENDIF()
     ENDIF(MEDCOUPLING_PARTITIONER_METIS)
     IF(MEDCOUPLING_PARTITIONER_SCOTCH)
       FIND_PACKAGE(SalomeScotch)
       SALOME_LOG_OPTIONAL_PACKAGE(Scotch MEDCOUPLING_PARTITIONER_SCOTCH)
-      ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH")
+      IF(SalomeScotch_FOUND)
+        ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH")
+      ENDIF()
     ENDIF(MEDCOUPLING_PARTITIONER_SCOTCH)
   ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
 ENDIF(NOT MEDCOUPLING_MICROMED)
@@ -113,7 +129,9 @@ IF(MEDCOUPLING_USE_MPI)
   IF(MEDCOUPLING_PARTITIONER_PARMETIS)
     FIND_PACKAGE(SalomeParMetis)
     SALOME_LOG_OPTIONAL_PACKAGE(ParMetis MEDCOUPLING_PARTITIONER_PARMETIS)
-    ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")
+    IF (SalomeParMetis_FOUND)
+      ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")
+    ENDIF()
   ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
 ENDIF(MEDCOUPLING_USE_MPI)
 
diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
index a2982379e..f3721c705 100644
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
@@ -57,14 +57,16 @@ class MEDPARTITIONERTEST_EXPORT MEDPARTITIONERTest : public CppUnit::TestFixture
   CPPUNIT_TEST( testScotchSmallSize );
 #endif
 
-#if defined(HAVE_MPI)
-#if defined(MED_ENABLE_PARMETIS)
-  //test with mpi on system
-  CPPUNIT_TEST( testMpirunSmallSize );
-  CPPUNIT_TEST( testMpirunMedianSize );
-  CPPUNIT_TEST( testMpirunHugeSize );
-#endif
-#endif
+// [ABN] TO BE REVISED:
+
+//#if defined(HAVE_MPI)
+//#if defined(MED_ENABLE_PARMETIS)
+//  //test with mpi on system
+//  CPPUNIT_TEST( testMpirunSmallSize );
+//  CPPUNIT_TEST( testMpirunMedianSize );
+//  CPPUNIT_TEST( testMpirunHugeSize );
+//#endif
+//#endif
 
   CPPUNIT_TEST( testCreateBoundaryFaces2D ); // imp 0021756
 
-- 
2.39.2