workaround for missing metis.h and scotch.h in make depens
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 25 Jul 2011 04:31:01 +0000 (23:31 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 25 Jul 2011 04:31:01 +0000 (23:31 -0500)
src/scripts/Make.depends
src/scripts/Makefile

index 1b528b797b55475c13571a87b0d944418e044255..331e853f3ca33d6e502affc8f81600f12169d8af 100644 (file)
@@ -3,9 +3,7 @@ convcore.o: convcore.c converse.h conv-config.h conv-autoconfig.h \
  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
  persistent.h debug-conv.h sockRoutines.h conv-ccs.h ccs-server.h \
- ckhashtable.h pup.h memory-isomalloc.h converseEvents.h traceCoreAPI.h \
- converseProjections.h traceCoreCommon.h machineEvents.h \
- machineProjections.h quiescence.h cmibacktrace.c
+ ckhashtable.h pup.h memory-isomalloc.h quiescence.h cmibacktrace.c
        $(CHARMC) -c -I. convcore.c
 
 conv-conds.o: conv-conds.c converse.h conv-config.h conv-autoconfig.h \
@@ -1104,12 +1102,6 @@ ckgraph.o: ckgraph.C ckgraph.h BaseLB.h LBDatabase.h lbdb.h converse.h \
  trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h
        $(CHARMC) -c -I. ckgraph.C
 
-graph.o: graph.c converse.h conv-config.h conv-autoconfig.h conv-common.h \
- conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
- conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
- debug-conv.h graph.h
-       $(CHARMC) -c -I. graph.c
-
 LButil.o: LButil.C elements.h converse.h conv-config.h conv-autoconfig.h \
  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
@@ -1334,6 +1326,23 @@ cktiming.o: cktiming.C charm++.h charm.h converse.h conv-config.h \
  cktiming.h
        $(CHARMC) -c -I. cktiming.C
 
+ckbitvector.o: ckbitvector.C charm++.h charm.h converse.h conv-config.h \
+ conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+ queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+ conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+ cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+ debug-conv++.h simd.h CkMarshall.decl.h ckarrayindex.h cksection.h \
+ ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+ ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+ CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+ readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+ LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+ NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ckfutures.h \
+ CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+ waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+ ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h envelope.h
+       $(CHARMC) -c -I. ckbitvector.C
+
 pathHistory.o: pathHistory.C charm++.h charm.h converse.h conv-config.h \
  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
@@ -2118,7 +2127,7 @@ MetisLB.o: MetisLB.C MetisLB.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
  trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h \
- CentralLBMsg.h MetisLB.decl.h ckgraph.h MetisLB.def.h
+ CentralLBMsg.h MetisLB.decl.h ckgraph.h metis.h MetisLB.def.h
        $(CHARMC) -c -I. MetisLB.C
 
 ScotchLB.o: ScotchLB.C ScotchLB.h CentralLB.h BaseLB.h LBDatabase.h \
@@ -2137,7 +2146,8 @@ ScotchLB.o: ScotchLB.C ScotchLB.h CentralLB.h BaseLB.h LBDatabase.h \
  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
  trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
- CentralLB.decl.h CentralLBMsg.h ScotchLB.decl.h ckgraph.h ScotchLB.def.h
+ CentralLB.decl.h CentralLBMsg.h ScotchLB.decl.h ckgraph.h scotch.h \
+ ScotchLB.def.h
        $(CHARMC) -c -I. ScotchLB.C
 
 TeamLB.o: TeamLB.C TeamLB.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
@@ -2156,7 +2166,7 @@ TeamLB.o: TeamLB.C TeamLB.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
  trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h \
- CentralLBMsg.h TeamLB.decl.h ckgraph.h TeamLB.def.h
+ CentralLBMsg.h TeamLB.decl.h ckgraph.h metis.h TeamLB.def.h
        $(CHARMC) -c -I. TeamLB.C
 
 WSLB.o: WSLB.C elements.h converse.h conv-config.h conv-autoconfig.h \
index 0d67335f210b3c8f6228337e890458af828cecad..027f33ae773b2f333c81b032029ee8bbe845e23a 100644 (file)
@@ -193,13 +193,13 @@ CVHEADERS=cpthreads.h converse.h conv-trace.h conv-random.h conv-qd.h \
       ccs-server.h ccs-auth.c ccs-auth.h \
       memory-isomalloc.h debug-conv.h debug-conv++.h conv-autoconfig.h \
       conv-common.h conv-config.sh conv-config.h conv-mach.h conv-mach.sh \
-      blue.h blue-conv.h bgconverse.h \
-       3dgridrouter.h hypercuberouter.h hypercubetopology.h    \
+      blue.h blue-conv.h bgconverse.h cmipool.h \
+      cmidirect.h cmidirectmanytomany.h
+
+CONVCOMHEADERS= 3dgridrouter.h hypercuberouter.h hypercubetopology.h   \
        routerstrategy.h convcomlibstrategy.h  convcomlib.h dummyconversestrategy.h  treerouter.h \
        convcomlibmanager.h graphrouter.h petable.h gridrouter.h router.h \
-       prefixrouter.h pipebroadcastconverse.h pipelinestrategy.h cmipool.h \
-      comlib.h cmidirect.h cmidirectmanytomany.h \
-      controlPoints.h controlPointsf.h arrayRedistributor.h cp_effects.h register.h stats.h
+       prefixrouter.h pipebroadcastconverse.h pipelinestrategy.h
 
 # The .c files are there to be #included by clients whole
 # This is a bit unusual, but makes client linking simpler.
@@ -215,8 +215,9 @@ CKHEADERS=ck.h ckstream.h envelope.h init.h qd.h charm.h charm++.h \
          ckarrayreductionmgr.h cknodegroupreduction.h cksection.h \
          ckarrayindex.h ckarray.h cklocation.h ckreduction.h \
          ckcheckpoint.h ckmemcheckpoint.h ckevacuation.h\
-               ckmessagelogging.h ckobjid.h\
-         ckobjQ.h readonly.h charisma.h ComlibArrayListener.h ComlibStrategy.h \
+          ckmessagelogging.h ckobjid.h\
+         ckobjQ.h readonly.h charisma.h \
+          comlib.h ComlibArrayListener.h ComlibStrategy.h \
          ComlibLearner.h $(UTILHEADERS) \
          tempo.h waitqd.h LBDatabase.h lbdb.h lbdb++.h LBProfit.h $(LBHEADERS) \
           LBDBManager.h        LBComm.h LBOM.h LBObj.h LBMachineUtil.h LBAgent.h \
@@ -248,7 +249,8 @@ CKHEADERS=ck.h ckstream.h envelope.h init.h qd.h charm.h charm++.h \
          RectMulticastStrategy.h ckdirect.h \
          ControlPoints.decl.h PathHistory.decl.h \
          pathHistory.h envelope-path.h \
-         $(CVHEADERS)
+          controlPoints.h controlPointsf.h arrayRedistributor.h cp_effects.h register.h stats.h   \
+         $(CVHEADERS) $(CONVCOMHEADERS)
 
 ALLHEADERS=$(CKHEADERS) \
     simplemsg.h sm.h pvmc.h pvm3.h sdag.h \
@@ -395,7 +397,7 @@ LIBCONV_UTIL=pup_util.o pup_toNetwork.o pup_toNetwork4.o            \
        pup_xlater.o pup_c.o pup_paged.o pup_cmialloc.o                 \
        ckimage.o ckdll.o ckhashtable.o sockRoutines.o                  \
        conv-lists.o RTH.o persist-comm.o graph.o \
-       ckbitvector.o TopoManager.o CrayNid.o crc32.o
+       TopoManager.o CrayNid.o crc32.o
 
 LIBCONV_UTILF=pup_f.o
 
@@ -682,9 +684,9 @@ $(L)/loadsym.o: loadsym.c  $(CVHEADERS)
 
 CK_LIBS_CORE=$(L)/libck.a
 
-LIBCK_CORE=trace-common.o tracec.o tracef.o init.o register.o qd.o ck.o main.o  \
+LIBCK_CORE=trace-common.o tracec.o tracef.o init.o register.o qd.o ck.o main.o \
           msgalloc.o ckfutures.o ckIgetControl.o debug-message.o debug-charm.o ckcallback.o \
-          cklocation.o ckarray.o ckreduction.o ckarrayreductionmgr.o\
+          cklocation.o ckarray.o ckreduction.o ckarrayreductionmgr.o \
            tempo.o waitqd.o LBDatabase.o lbdb.o lbdbf.o charisma.o ckobjQ.o  \
           LBAgent.o LBProfit.o ckcheckpoint.o ckmemcheckpoint.o ckevacuation.o ckmessagelogging.o\
            LBDBManager.o LBComm.o LBObj.o LBMachineUtil.o CentralPredictor.o \
@@ -692,7 +694,8 @@ LIBCK_CORE=trace-common.o tracec.o tracef.o init.o register.o qd.o ck.o main.o
            ckgraph.o LButil.o Refiner.o RefinerApprox.o  \
            RefinerComm.o bitvecset.o ckset.o ckheap.o CommLBHeap.o \
           NullLB.o LBSimulation.o $(COMLIB_CORE_OBJS) modifyScheduler.o \
-          charmProjections.o cktiming.o pathHistory.o controlPoints.o arrayRedistributor.o cp_effects.o trace-controlPoints.o
+          charmProjections.o cktiming.o ckbitvector.o \
+           pathHistory.o controlPoints.o arrayRedistributor.o cp_effects.o trace-controlPoints.o
 
 charm-target: converse $(L)/libck.a $(L)/libckf.a loadbalancers default_libs comlib_objs 
 
@@ -1048,6 +1051,7 @@ depends: cidepends
            /bin/cp -f $(DEPENDFILE) $(DEPENDFILE).old; \
         fi; \
        echo '#generated by make depends' > $(DEPENDFILE); \
+        touch metis.h scotch.h;   \
        processFiles='';        \
         for i in $(LIBCONV_CORE) $(TRACE_OBJS) $(LIBCK_CORE) $(ALL_LB_OBJS) $(LIBBLUE_OBJS) $(COMLIB_OBJS) ; do \
              processed='false';        \
@@ -1063,7 +1067,8 @@ depends: cidepends
               echo "checking dependencies for $$SRCFILE" ; \
               if g++ -MM -Wno-deprecated -I. -I$(INC) $$SRCFILE  >> $(DEPENDFILE); then   echo '       $$(CHARMC) -c -I. '$$SRCFILE >> $(DEPENDFILE) ; else echo '' ; echo "Compilation of '$$SRCFILE' failed, please fix it first!!!!" ; exit; fi;  \
              echo '' >> $(DEPENDFILE) ; \
-        done;
+        done;  \
+        rm -f metis.h  scotch.h
 
 
 dependsCaseSensitive: cidepends
@@ -1073,6 +1078,7 @@ dependsCaseSensitive: cidepends
            /bin/cp -f $(DEPENDFILE) $(DEPENDFILE).old; \
         fi; \
        echo '#generated by make depends' > $(DEPENDFILE); \
+        touch metis.h scotch.h;   \
        processFiles='';        \
         for i in $(LIBCONV_CORE) $(TRACE_OBJS) $(LIBCK_CORE) $(ALL_LB_OBJS) $(LIBBLUE_OBJS) $(COMLIB_OBJS); do \
              processed='false';        \
@@ -1090,7 +1096,8 @@ dependsCaseSensitive: cidepends
               echo "checking dependencies for $$SRCFILE" ; \
               if g++ -MM -Wno-deprecated -I. -I$(INC) $$SRCFILE  >> $(DEPENDFILE); then   echo '       $$(CHARMC) -c -I. '$$SRCFILE >> $(DEPENDFILE) ; else echo '' ; echo "Compilation of '$$SRCFILE' failed, please fix it first!!!!" ; exit; fi;  \
              echo '' >> $(DEPENDFILE) ; \
-        done;
+        done;  \
+        rm -f metis.h  scotch.h