starUpperBound fixes for SYCL.

Author: highperformancecoder

models/Makefile

@@ -44,6 +44,9 @@ $(MODELS:=.so): %.so: %.o ../lib/libecolab$(ECOLIBS_EXT).a
 $(MODELS:=.app): %.app: %
 	$(ECOLAB_HOME)/utils/mkmacapp $<
 
+# required because gcc builds do not inlcude vecBitSet.h
+starComplexity.o: vecBitSet.cd
+
 ifneq ($(MAKECMDGOALS),clean)
 include $(MODELS:=.d)
 endif

models/starComplexity.cc

@@ -438,6 +438,7 @@ NautyRep toNautyRep(linkRep g, unsigned nodes)
   for (unsigned i=0; i<nodes; ++i)
     for (unsigned j=0; j<i; ++j)
       if (!(g&(linkRep(1)<<(i*(i-1)/2+j))).empty())
+        //if (g(i,j))
         n(i,j)=n(j,i)=true;
   return n;
 }
@@ -575,7 +576,7 @@ unsigned starUpperBound(linkRep x, unsigned nodes)
 
   // calculate node degree
   map<unsigned,unsigned> nodeDegree;
-  for (unsigned i=0; i<maxNodes; ++i)
+  for (unsigned i=0; i<nodes; ++i)
     for (unsigned j=0; j<i; ++j)
       if (x(i,j))
         {
@@ -617,8 +618,9 @@ unsigned starUpperBound(linkRep x, unsigned nodes)
 
 unsigned StarComplexityGen::starUpperBound(const linkRep& x) const
 {
-  unsigned ub=::starUpperBound(x, elemStars.size());
-  unsigned complementUb=::starUpperBound(~x, elemStars.size());
+  unsigned n=elemStars.size();
+  unsigned ub=::starUpperBound(x, n);
+  unsigned complementUb=::starUpperBound((~x).maskOut(n), n);
   assert(ub>0 && complementUb>0);
   return min(ub, complementUb);
 }

models/starComplexity.h

@@ -1,7 +1,5 @@
 // hard code maximum number of nodes
-constexpr unsigned maxNodes=10, maxStars=2*maxNodes-1;
-
-//using linkRep=unsigned long long;
+constexpr unsigned maxNodes=22, maxStars=2*maxNodes-1;
 
 #include "netcomplexity.h"
 
@@ -41,17 +39,32 @@ class linkRepImpl
     return r;
   }
   linkRepImpl operator<<(int n) {
-    linkRepImpl r;
+    linkRepImpl r(0);
     auto d=div(n, int(8*sizeof(Impl)));
     for (unsigned i=0; i<size-d.quot; ++i)
       r.data[i+d.quot]=data[i]<<d.rem;
     return r;
   }
+  /// mask out bits not used, give a node count
+  linkRepImpl& maskOut(unsigned nodes) {
+    unsigned numBits=nodes*(nodes-1)/2;
+    // divide data up into chunks of size of unsigned
+    auto d=div(numBits, int(8*sizeof(unsigned)));
+    auto uData=reinterpret_cast<unsigned*>(data);
+    uData[d.quot]&=(1<<d.rem)-1;
+    // check that data is a multiple of unsigned
+    static_assert(sizeof(data)%sizeof(unsigned)==0);
+    for (unsigned i=d.quot+1; i<sizeof(data)/(sizeof(unsigned)); ++i)
+      uData[i]=0;
+    return *this;
+  }
   // return true if there is a link between nodes i and j
   bool operator()(unsigned i,unsigned j) const {
-        if (i<j) std::swap(i,j);
-        auto d=div(i*(i-1)/2+j, int(8*sizeof(Impl)));
-        return Impl(data[d.quot] & (Impl(1)<<d.rem));
+    if (i==j) return false; // no self-links
+    if (i<j) std::swap(i,j);
+    auto d=div(i*(i-1)/2+j, int(8*sizeof(unsigned)));
+    auto uData=reinterpret_cast<const unsigned*>(data);
+    return uData[d.quot] & 1<<d.rem;
   }
   bool empty() const {
     for (unsigned i=0; i<size; ++i)

models/starComplexity.py

@@ -12,7 +12,7 @@
     maxStars=max(maxStars,v)
 
 print('maxStars=',maxStars)
-maxStars=9
+maxStars=10
 
 #starC.blockSize(256)
 starC.blockSize(4096)