Changeset 45cfb82 in git

Timestamp:

May 5, 2021, 3:23:13 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b385d0e618e758a8143fee011320a6c069221b2c

Parents:

502859fe5faa956d714f45c2e56bd4bd4736e1ad

Message:

opt: canonicalize buckets

Location:

kernel/GBEngine

Files:

• kLiftstd.cc (modified) (2 diffs)
• kstd1.cc (modified) (3 diffs)
• kstd2.cc (modified) (13 diffs)
• kutil.cc (modified) (1 diff)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kLiftstd.cc

@@ -132 +132 @@
     }
     p_Delete(&M[i],tailR);
+    if ((i+1)%RED_CANONICALIZE==0) kBucketCanonicalize(b);
   }
   poly p;
@@ -296 +297 @@
     pass++;
     d = h_d + h->ecart;
-    if (pass%64==0) kBucketCanonicalize(h->bucket);
-  }
-}
+    if (pass%RED_CANONICALIZE==0) kBucketCanonicalize(h->bucket);
+  }
+}

kernel/GBEngine/kstd1.cc

@@ -792 +792 @@
   long reddeg,d;
   int pass = 0;
+  int cnt = 0;
   int j = 0;
 
@@ -907 +908 @@
         d = h->SetDegStuffReturnLDeg(strat->LDegLast);
       /*- try to reduce the s-polynomial -*/
+      cnt++;
       pass++;
       /*
@@ -933 +935 @@
         }
       }
-      if (UNLIKELY(pass>30))
+      if (UNLIKELY(cnt>RED_CANONICALIZE))
       {
         h->CanonicalizeP();
-        pass=0;
-        if (TEST_OPT_PROT) { PrintS("!");mflush(); }
+        cnt=0;
+        //if (TEST_OPT_PROT) { PrintS("!");mflush(); }
       }
       if ((TEST_OPT_PROT) && (strat->Ll < 0) && (d >= reddeg))

kernel/GBEngine/kstd2.cc

@@ -934 +934 @@
 
   poly h_p;
-  int i,j,at,pass, ii;
+  int i,j,at,pass,cnt,ii;
   unsigned long not_sev;
   // long reddeg,d;
 
-  pass = j = 0;
+  cnt = pass = j = 0;
   // d = reddeg = h->GetpFDeg();
   h->SetShortExpVector();
@@ -1068 +1068 @@
      *-if the number of pre-defined reductions jumps
      */
+    cnt++;
     pass++;
     if (!TEST_OPT_REDTHROUGH && (strat->Ll >= 0) && (pass > strat->LazyPass))
@@ -1097 +1098 @@
       }
     }
-    else if (UNLIKELY(pass>30))
+    else if (UNLIKELY(cnt>RED_CANONICALIZE))
     {
       h->CanonicalizeP();
-      pass=0;
-      if (TEST_OPT_PROT) { PrintS("!");mflush(); }
+      cnt=0;
+      //if (TEST_OPT_PROT) { PrintS("!");mflush(); }
     }
   }
@@ -1562 +1563 @@
 poly redtailSba (LObject* L, int pos, kStrategy strat, BOOLEAN withT, BOOLEAN normalize)
 {
-#define REDTAIL_CANONICALIZE 100
   strat->redTailChange=FALSE;
   if (strat->noTailReduction) return L->GetLmCurrRing();
@@ -1687 +1687 @@
   int j = 0;
   int pass = 0;
+  int cnt = 0;
   assume(h->pFDeg() == h->FDeg);
   long reddeg = h->GetpFDeg();
@@ -1818 +1819 @@
     d = h->SetpFDeg();
     /*- try to reduce the s-polynomial -*/
+    cnt++;
     pass++;
     if (//!TEST_OPT_REDTHROUGH &&
@@ -1870 +1872 @@
       }
     }
-    else if (UNLIKELY(pass>30))
+    else if (UNLIKELY(cnt>RED_CANONICALIZE))
     {
       h->CanonicalizeP();
-      pass=0;
-      if (TEST_OPT_PROT) { PrintS("!");mflush(); }
+      cnt=0;
+      //if (TEST_OPT_PROT) { PrintS("!");mflush(); }
     }
   }
@@ -2118 +2120 @@
 poly redNF (poly h,int &max_ind,int nonorm,kStrategy strat)
 {
-#define REDNF_CANONICALIZE 60
   if (h==NULL) return NULL;
   int j;
@@ -2217 +2218 @@
       {
         kBucketDestroy(&P.bucket);
-
-#ifdef KDEBUG
-//        if (TEST_OPT_DEBUG)
-//        {
-//          PrintS("redNF: starting S:\n");
-//          for( j = 0; j <= max_ind; j++ )
-//          {
-//            Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-//            pWrite(strat->S[j]);
-//          }
-//        };
-#endif
-
         return NULL;
       }
@@ -2250 +2238 @@
       kBucketDestroy(&P.bucket);
       pNormalize(P.p);
-
-#ifdef KDEBUG
-//      if (TEST_OPT_DEBUG)
-//      {
-//        PrintS("redNF: starting S:\n");
-//        for( j = 0; j <= max_ind; j++ )
-//        {
-//          Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-//          pWrite(strat->S[j]);
-//        }
-//      };
-#endif
-
       return P.p;
     }
@@ -2290 +2265 @@
 #ifdef HAVE_RINGS
   BOOLEAN is_ring = rField_is_Ring(currRing);
-#endif
-#ifdef KDEBUG
-//  if (TEST_OPT_DEBUG)
-//  {
-//    PrintS("redNF: starting S:\n");
-//    for( j = 0; j <= max_ind; j++ )
-//    {
-//      Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-//      pWrite(strat->S[j]);
-//    }
-//  };
 #endif
 
@@ -2375 +2339 @@
       {
         kBucketDestroy(&P.bucket);
-
-#ifdef KDEBUG
-//        if (TEST_OPT_DEBUG)
-//        {
-//          PrintS("redNF: starting S:\n");
-//          for( j = 0; j <= max_ind; j++ )
-//          {
-//            Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-//            pWrite(strat->S[j]);
-//          }
-//        };
-#endif
-
         return NULL;
       }
@@ -2408 +2359 @@
       kBucketDestroy(&P.bucket);
       pNormalize(P.p);
-
-#ifdef KDEBUG
-//      if (TEST_OPT_DEBUG)
-//      {
-//        PrintS("redNF: starting S:\n");
-//        for( j = 0; j <= max_ind; j++ )
-//        {
-//          Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-//          pWrite(strat->S[j]);
-//        }
-//      };
-#endif
-
       return P.p;
     }

kernel/GBEngine/kutil.cc

@@ -7145 +7145 @@
 poly redtailBba (LObject* L, int end_pos, kStrategy strat, BOOLEAN withT, BOOLEAN normalize)
 {
-#define REDTAIL_CANONICALIZE 100
   strat->redTailChange=FALSE;
   if (strat->noTailReduction) return L->GetLmCurrRing();

kernel/GBEngine/kutil.h

@@ -33 +33 @@
 #define setmaxT ((4096-12)/sizeof(TObject))
 #define setmaxTinc ((4096)/sizeof(TObject))
+
+#define RED_CANONICALIZE 50
+#define REDNF_CANONICALIZE 60
+#define REDTAIL_CANONICALIZE 100
 
 // if you want std computations as in Singular version < 2: