Merge branch 'sb-graph-dev' into 102-add-configuration-file-to-sbg-partitioner

Author: francosansone

.github/workflows/c-cpp.yml

@@ -12,10 +12,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Compiler.
+      run: cc --version
     - name: Install deps.
       run: | 
         sudo apt-get update
         sudo apt-get install libboost1.83-dev
+        sudo apt-get install libboost-program-options-dev
         sudo apt-get install cmake 
         sudo apt-get install g++
         sudo apt-get install rapidjson-dev

CMakeLists.txt

@@ -18,7 +18,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_compile_definitions(SBG_PARTITIONER_LOGGING)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -Wall ") # -Werror
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder -fconcepts -O3")
 endif()
 
 # Output directories

Makefile.in

@@ -0,0 +1,112 @@
+# Target variables
+MODE ?= Release
+
+# The Directories, Source, Includes, Objects, Binary 
+ROOT   	      := .
+3RD_PARTY_DIR := $(ROOT)/3rd-party
+GTEST_DIR     := googletest-release-1.12.1
+GTEST_CODE    := $(GTEST_DIR).tar.gz
+OBJ_DIR       := $(ROOT)/obj
+BUILD_DIR    	:= $(OBJ_DIR)/release
+AST_DIR    	  := $(ROOT)/ast
+BIN_DIR    	  := $(ROOT)/bin
+ifeq ($(MODE),Debug)
+BUILD_DIR    	:= $(OBJ_DIR)/debug
+endif
+prefix 			  ?= /usr/local
+exec_prefix   ?= $(prefix)
+includedir    ?= $(prefix)/include
+libdir        ?= $(exec_prefix)/lib
+boost_libdir  ?= $(prefix)
+
+# Flags, Libraries and Includes
+INCLUDES := -I. -I$(boost_libdir)/include
+CXXFLAGS := -std=c++17 -Wall -Werror -Wno-reorder -O3 -D BOOST_PHOENIX_STL_TUPLE_H_ -D BOOST_MPL_LIMIT_LIST_SIZE=30 -D BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+ifeq ($(MODE),Debug)
+CXXFLAGS 	+= -ggdb  
+endif
+LIB_SBGRAPH = lib/libsbgraph.a
+
+all: $(LIB_SBGRAPH)
+
+include sbg/Makefile.include
+include parser/Makefile.include
+include eval/Makefile.include
+include test/Makefile.include
+
+$(BUILD_DIR)/%.o : %.cpp
+	$(CC) $(INCLUDES) $(CXXFLAGS) -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $<
+	$(CC) $(INCLUDES) -c $< -o $@ $(CXXFLAGS)
+
+$(LIB_SBGRAPH): create-folders $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
+	$(AR) rcs $(LIB_SBGRAPH) $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
+
+lib-gtest: | create-folders 
+ifeq ("$(wildcard $(3RD_PARTY_DIR)/gtest/usr/lib)","")
+	cd $(3RD_PARTY_DIR)/gtest; tar xvzf $(GTEST_CODE)
+	mkdir -p $(3RD_PARTY_DIR)/gtest/build
+	cd $(3RD_PARTY_DIR)/gtest/build; cmake ../$(GTEST_DIR) -DCMAKE_INSTALL_PREFIX=../usr  
+	cd $(3RD_PARTY_DIR)/gtest/build; make install 
+	rm -rf $(3RD_PARTY_DIR)/gtest/$(GTEST_DIR)
+	rm -rf $(3RD_PARTY_DIR)/gtest/build
+endif
+
+install: | install-folders
+	@echo "Installing SBG library headers."
+	@echo ${prefix}
+	@install $(ROOT)/ast/*.hpp $(includedir)/ast
+	@install $(ROOT)/sbg/*.hpp $(includedir)/sbg
+	@install $(ROOT)/util/*.hpp $(includedir)/util
+	@install $(ROOT)/parser/*.hpp $(includedir)/parser
+	@install $(ROOT)/eval/*.hpp $(includedir)/eval
+	@install $(ROOT)/lib/libsbgraph.a $(libdir)/
+	@echo "Done."
+
+install-folders:
+	@mkdir -p $(libdir)
+	@mkdir -p $(includedir)
+	@mkdir -p $(includedir)/ast
+	@mkdir -p $(includedir)/sbg
+	@mkdir -p $(includedir)/util
+	@mkdir -p $(includedir)/parser
+	@mkdir -p $(includedir)/eval
+
+create-folders::
+	@mkdir -p $(ROOT)/lib
+	@mkdir -p $(OBJ_DIR)
+	@mkdir -p $(BUILD_DIR)
+	@mkdir -p $(BUILD_DIR)/$(AST_DIR)
+	@mkdir -p $(BIN_DIR)
+
+.PHONY: doc
+
+doc:
+	@mkdir -p $(ROOT)/doc
+	@mkdir -p $(ROOT)/doc/html
+	@mkdir -p $(ROOT)/doc/latex
+	doxygen eval/EVAL.doxyfile
+	doxygen sbg/SBG.doxyfile
+	doxygen util/UTIL.doxyfile
+
+test: lib-gtest $(SBG_TEST)
+
+TEST_DIRS         := test/parser test/performance test/performance/boost test/eval
+ 
+clean:
+	$(RM) -rf $(BIN_DIR) $(OBJ_DIR) $(LIB_SBGRAPH) $(ROOT)/lib $(ROOT)/include $(3RD_PARTY_DIR)/gtest/usr
+	for dir in $(TEST_DIRS); do \
+    $(RM) -rf $$dir/bin; \
+    $(RM) -rf $$dir/obj; \
+    $(RM) -rf $$dir/test_data; \
+  done
+
+help:
+	@echo "make MODE=<Debug|Release> prefix=<PATH> exec_prefix=<PATH> includedir=<PATH> libdir=<PATH> boost_libdir=<PATH>"
+	@echo "Default values:"
+	@echo ""
+	@echo "MODE=Debug"
+	@echo "prefix=/usr/local"
+	@echo "exec_prefix=/usr/local"
+	@echo "includedir=/usr/local/include"
+	@echo "libdir=/usr/local/lib"
+	@echo "boost_libdir=/usr/local/include"

algorithms/cc/cc.cpp

@@ -33,10 +33,9 @@ namespace LIB {
 PWMap connectedComponents(SBG g)
 {
   auto begin = std::chrono::high_resolution_clock::now();
-  const PWMapAF &fact_ = g.fact();
 
   if (!g.V().isEmpty()) {
-    PWMap rmap = fact_.createPWMap(g.V()), old_rmap = fact_.createPWMap();
+    PWMap rmap = PW_FACT.createPWMap(g.V()), old_rmap = PW_FACT.createPWMap();
 
     if (g.E().isEmpty())
       return rmap;
@@ -68,7 +67,7 @@ PWMap connectedComponents(SBG g)
     end - begin);
   Util::SBG_LOG << "Total CC exec time: " << total.count() << "\n";
 
-  return fact_.createPWMap();
+  return PW_FACT.createPWMap();
 }
 
 } // namespace LIB

algorithms/cutvertex/CMakeLists.txt

@@ -2,4 +2,6 @@ target_sources(
     sbgraph
     PRIVATE
         cut_vertex.cpp
+        cv_fact.cpp
+        maxdeg_cv.cpp
 )

algorithms/cutvertex/cut_vertex.cpp

@@ -28,124 +28,20 @@ namespace SBG {
 namespace LIB {
 
 ////////////////////////////////////////////////////////////////////////////////
-// Cut-set algorithm -----------------------------------------------------------
+// Vertex Cut Set Algorithm Abstract Strategy Constructors ---------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-CutVertex::CutVertex(const DSBG &dsbg, bool debug) 
-  : fact_(dsbg.fact()), dsbg_(dsbg), debug_(debug) {}
+CVStrategy::CVStrategy() {}
 
-member_imp(CutVertex, DSBG, dsbg);
-member_imp(CutVertex, bool, debug);
+////////////////////////////////////////////////////////////////////////////////
+// Vertex Cut Set Algorithm Interface ------------------------------------------ 
+////////////////////////////////////////////////////////////////////////////////
 
-PWMap CutVertex::getDegMap(const DSBG &dsbg)
-{
-  Set V = dsbg.V();
-  PWMap mapB = dsbg.mapB(), mapD = dsbg.mapD();
-
-  auto dims = V.arity();
-  MD_NAT zero(dims, 0), one(dims, 1);
-  PWMap dmap = fact_.createPWMap(fact_.createMap(V, Exp(zero))); 
-
-  for (const Map &SE : dsbg.subEmap()) {
-    Set dom = SE.dom();
-    MD_NAT n(dims, dom.cardinal());
-    Set vsB = mapB.image(dom), vsD = mapD.image(dom);
-    if (vsB.cardinal() == 1) {
-      PWMap ith = dmap.restrict(vsD).offsetImage(n);
-      dmap = ith.combine(dmap);
-      ith = dmap.restrict(vsB).offsetImage(one);
-      dmap = ith.combine(dmap);
-    }
-    else if (vsD.cardinal() == 1) {
-      PWMap ith = dmap.restrict(vsB).offsetImage(n);
-      dmap = ith.combine(dmap);
-      ith = dmap.restrict(vsD).offsetImage(one);
-      dmap = ith.combine(dmap);
-    }
-    else {
-      PWMap ith = dmap.restrict(vsB.cup(vsD)).offsetImage(one);
-      dmap = ith.combine(dmap);
-    }
-  }
-
-  return dmap;
-}
+CutVertex::CutVertex(CVStratPtr strat) : strategy_(std::move(strat)) {}
 
-Set CutVertex::calculate()
+Set CutVertex::calculate(const DSBG& dsbg) const
 {
-  auto begin = std::chrono::high_resolution_clock::now();
-  DSBG dg = dsbg();
-  PWMap Vmap = dg.Vmap(), mapB = dg.mapB(), mapD = dg.mapD();
-  PWMap rmap = SCC(dg, debug()).calculate();
-  Set newD = fact_.createSet(), oldD = newD, visitedV = newD, V = dg.V();
-  if (debug())
-    Util::SBG_LOG << "initial dg vertex cut set:\n" << dg << "\n";
-
-  PWMap dmap = getDegMap(dg);
-  // Degree map
-  if (debug())
-    Util::SBG_LOG << "initial dmap: " << dmap << "\n\n";
-
-  while (rmap.dom() != rmap.image()) {
-    oldD = newD;
- 
-    MD_NAT aux = dmap.image().maxElem();
-    MD_NAT vmax = dmap.preImage(fact_.createSet(aux)).minElem();
-    Set vmaxSV = Vmap.image(fact_.createSet(vmax));
-    newD = newD.cup(fact_.createSet(vmax));
-
-    if (!visitedV.intersection(vmaxSV).isEmpty()) {
-      MD_NAT vmaxD = newD.intersection(Vmap.preImage(vmaxSV)).minElem();
-
-      SetPiece mdi;
-      for (unsigned int j = 0; j < vmax.arity(); ++j) {
-        if (vmax[j] < vmaxD[j]) {
-          NAT st = vmaxD[j] - vmax[j];
-          NAT beg = vmax[j] % st;
-          mdi.emplaceBack(Interval(beg, st, vmax[j]));
-        }
-
-        else
-          mdi.emplaceBack(Interval(vmaxD[j], vmax[j] - vmaxD[j], Inf));    
-      }
-      if (debug()) {
-        Util::SBG_LOG << "vmax: " << vmax << "\n"; 
-        Util::SBG_LOG << "vmaxD: " << vmaxD << "\n"; 
-        Util::SBG_LOG << "mdi: " << mdi << "\n\n";
-      }
-      Set mdi_set = fact_.createSet(mdi);
-      newD = newD.cup(mdi_set.intersection(Vmap.preImage(vmaxSV)));
-    }
-
-    // Update graph info erasing newD vertices
-    visitedV = visitedV.cup(vmaxSV);
-    dg = dg.eraseVertices(newD);
-    Vmap = dg.Vmap();
-    mapB = dg.mapB(); 
-    mapD = dg.mapD(); 
-
-    // Update degree map
-    dmap = getDegMap(dg);
-
-    // Resulting SCC from induced graph
-    rmap = SCC(dg, debug()).calculate();
-
-    if (debug()) {
-      Util::SBG_LOG << "oldD: " << oldD << "\n";
-      Util::SBG_LOG << "newD: " << newD << "\n";
-      Util::SBG_LOG << "resulting graph:\n" << dg << "\n";
-      Util::SBG_LOG << "new degree map: " << dmap << "\n";
-      Util::SBG_LOG << "new rmap: " << rmap << "\n\n";
-    }
-  }
-  auto end = std::chrono::high_resolution_clock::now();
-
-  auto total = std::chrono::duration_cast<std::chrono::microseconds>(
-    end - begin
-  );
-  Util::SBG_LOG << "Total vertex cut set exec time: " << total.count() << " [μs]\n\n"; 
-
-  return newD.compact();
+  return strategy_->calculate(dsbg);
 }
 
 } // namespace LIB

algorithms/cutvertex/cut_vertex.hpp

@@ -1,6 +1,6 @@
 /** @file cut_vertex.hpp
 
- @brief <b>Cut Vertex Set SBG implementation</b>
+ @brief <b>SBG Vertex Cut Set Algorithm Abstract Interface</b>
 
  <hr>
 
@@ -24,40 +24,47 @@
 #ifndef SBG_CUTVERTEX_HPP
 #define SBG_CUTVERTEX_HPP
 
-#include "sbg/sbg.hpp"
+#include "algorithms/scc/scc_fact.hpp"
 
 namespace SBG {
 
 namespace LIB {
 
 ///////////////////////////////////////////////////////////////////////////////
-// Cut-set algorithm ----------------------------------------------------------
+// Vertex Cut Set Algorithm Abstract Strategy ---------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
+class CVStrategy;
+
+typedef std::unique_ptr<CVStrategy> CVStratPtr;
+
 /**
-* @brief Aims to calculate a minimum cut-set of vertices, that is, a set of
+* @brief Aims to calculate a minimum cut set of vertices, that is, a set of
 * vertices such that if these vertices are taken out, the resulting graph has no
 * SCC left. Since this is a NP-hard problem, heuristics are used, and thus is
 * not guaranteed that the set is actually minimum.
 */
+class CVStrategy {
+  public:
+  virtual ~CVStrategy() = default;
 
-struct CutVertex {
-  private:
-  const PWMapAF &fact_;
+  CVStrategy();
 
-  //*** SBG info, constant
-  member_class(DSBG, dsbg);
+  virtual Set calculate(const DSBG& dsbg) const = 0;
+};
 
-  //-----------------------------
-  member_class(bool, debug);
+///////////////////////////////////////////////////////////////////////////////
+// Vertex Cut Set Algorithm Interface (context) ------------------------------- 
+///////////////////////////////////////////////////////////////////////////////
 
+class CutVertex {
   public:
-  CutVertex(const DSBG &dsbg, bool debug);
+  CutVertex(CVStratPtr strat);
 
-  Set calculate(); 
+  Set calculate(const DSBG& dsbg) const;
 
   private:
-  PWMap getDegMap(const DSBG &dsbg);
+  CVStratPtr strategy_;
 };
 
 } // namespace LIB