From 4f784daa32b090218ef6bb8848cf277773abb35e Mon Sep 17 00:00:00 2001
From: Phil Miller <mille121@illinois.edu>
Date: Thu, 16 Mar 2017 19:23:04 -0500
Subject: [PATCH] Feature #1298: Build MetisLB and GridMetisLB by default

Change-Id: Ic50f3ca09f11c577033b0c7683c86c8a2178c27d
---
 src/ck-ldb/EveryLB.ci     |  2 ++
 src/ck-ldb/Make.lb        | 12 ++++++++----
 src/ck-ldb/Makefile_lb.sh |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/ck-ldb/EveryLB.ci b/src/ck-ldb/EveryLB.ci
index 10102dc9b1..7061404cbd 100644
--- a/src/ck-ldb/EveryLB.ci
+++ b/src/ck-ldb/EveryLB.ci
@@ -32,6 +32,8 @@ module EveryLB {
   extern module RecBipartLB;
   extern module CommAwareRefineLB;
   extern module AdaptiveLB;
+  extern module MetisLB;
+  extern module GridMetisLB;
 
   initnode void initEveryLB(void);
 };
diff --git a/src/ck-ldb/Make.lb b/src/ck-ldb/Make.lb
index 95548c841b..8c4f4743ca 100644
--- a/src/ck-ldb/Make.lb
+++ b/src/ck-ldb/Make.lb
@@ -51,6 +51,8 @@ ALL_LDBS=\
    RecBipartLB \
    CommAwareRefineLB \
    AdaptiveLB \
+   MetisLB \
+   GridMetisLB \
    manager.o
 
 $(L)/libmoduleDummyLB.a: 
@@ -149,6 +151,9 @@ LBHEADERS += AdaptiveLB.h AdaptiveLB.decl.h
 $(L)/libmoduleMetisLB.a: 
 LBHEADERS += MetisLB.h MetisLB.decl.h
 
+$(L)/libmoduleGridMetisLB.a: 
+LBHEADERS += GridMetisLB.h GridMetisLB.decl.h
+
 $(L)/libmoduleScotchLB.a: 
 LBHEADERS += ScotchLB.h ScotchLB.decl.h
 
@@ -158,9 +163,6 @@ LBHEADERS += TeamLB.h TeamLB.decl.h
 $(L)/libmoduleWSLB.a: 
 LBHEADERS += WSLB.h WSLB.decl.h
 
-$(L)/libmoduleGridMetisLB.a: 
-LBHEADERS += GridMetisLB.h GridMetisLB.decl.h
-
 $(L)/libmoduleTempAwareGreedyLB.a: 
 LBHEADERS += TempAwareGreedyLB.h TempAwareGreedyLB.decl.h
 
@@ -217,10 +219,10 @@ ALL_LB_OBJS=EveryLB.o \
     CommAwareRefineLB.o \
     AdaptiveLB.o \
     MetisLB.o \
+    GridMetisLB.o \
     ScotchLB.o \
     TeamLB.o \
     WSLB.o \
-    GridMetisLB.o \
     TempAwareGreedyLB.o \
     GridHybridSeedLB.o \
     TopoCentLB.o \
@@ -266,6 +268,8 @@ EVERYLB_DEPS=EveryLB.o \
     RecBipartLB.o \
     CommAwareRefineLB.o \
     AdaptiveLB.o \
+    MetisLB.o \
+    GridMetisLB.o \
     manager.o \
     tm_tree.o  \
     tm_timings.o  \
diff --git a/src/ck-ldb/Makefile_lb.sh b/src/ck-ldb/Makefile_lb.sh
index 54e2b2acb7..b0e52b5e8a 100755
--- a/src/ck-ldb/Makefile_lb.sh
+++ b/src/ck-ldb/Makefile_lb.sh
@@ -3,9 +3,9 @@
 #Typical load balancers
 COMMON_LDBS="DummyLB GreedyLB GreedyRefineLB CommLB RandCentLB RefineLB RefineCommLB RotateLB DistributedLB HybridLB ComboCentLB RefineSwapLB NeighborLB OrbLB BlockLB GreedyCommLB NodeLevelLB"
 #Load balancers for more specialized circumstances
-SPECIALIZED_LDBS="GraphPartLB GraphBFTLB GridCommLB GridCommRefineLB HbmLB RefineKLB  TempAwareCommLB TreeMatchLB GreedyAgentLB NeighborCommLB PhasebyArrayLB RecBipartLB CommAwareRefineLB AdaptiveLB"
+SPECIALIZED_LDBS="GraphPartLB GraphBFTLB GridCommLB GridCommRefineLB HbmLB RefineKLB  TempAwareCommLB TreeMatchLB GreedyAgentLB NeighborCommLB PhasebyArrayLB RecBipartLB CommAwareRefineLB AdaptiveLB MetisLB GridMetisLB"
 #Load balanders which have an external dependency, or require some other kind of intervention
-UNCOMMON_LDBS="MetisLB ScotchLB TeamLB WSLB GridMetisLB TempAwareGreedyLB GridHybridSeedLB TopoCentLB GridHybridLB TopoLB RefineTopoLB TempAwareRefineLB"
+UNCOMMON_LDBS="ScotchLB TeamLB WSLB TempAwareGreedyLB GridHybridSeedLB TopoCentLB GridHybridLB TopoLB RefineTopoLB TempAwareRefineLB"
 
 ALL_LDBS="$COMMON_LDBS $SPECIALIZED_LDBS"
 
-- 
2.11.4.GIT