Changeset e12c6c in git

Timestamp:

Feb 2, 2018, 8:18:02 AM (6 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9b67d65cca6ba85b6bbd058c2032a7592d15660f

Parents:

e7be125e3c4930d177dccfb8d52e2f0553e56f1f

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2018-02-02 08:18:02+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2018-02-02 11:17:17+01:00

Message:

chg: introduce option use_cache for syFrank()

Files:

• Singular/iparith.cc (modified) (1 diff)
• kernel/GBEngine/syz.h (modified) (1 diff)
• kernel/GBEngine/syz4.cc (modified) (18 diffs)

Singular/iparith.cc

@@ -2226 +2226 @@
         WerrorS("wrong optional argument for fres");
     }
-    syStrategy r = syFrank(id, max_length, method, false);
+    syStrategy r = syFrank(id, max_length, method);
     assume(r->fullres != NULL);
     res->data = (void *)r;

kernel/GBEngine/syz.h

@@ -99 +99 @@
 syStrategy syKosz(ideal arg,int * length);
 
+// use_cache and use_tensor_trick are needed in PrymGreen.jl; do not delete!
 syStrategy syFrank(const ideal arg, const int length, const char *method,
-        const bool use_tensor_trick);
+        const bool use_cache = true, const bool use_tensor_trick = false);
 
 void syKillComputation(syStrategy syzstr, ring r=currRing);

kernel/GBEngine/syz4.cc

@@ -15 +15 @@
 #include <vector>
 #include <map>
-
-/*
- * If set to true, the result of compute_image() is cached for _every_ term in
- * the current step of the resolution. This corresponds to the subtree attached
- * to the node which represents this term, see reference.
- */
-#define CACHE 1
 
 /*
@@ -144 +137 @@
 }
 
-#if CACHE
 static poly traverse_tail(const poly multiplier, const int comp,
         const ideal previous_module, const std::vector<bool> &variables,
         const lt_struct *const *const hash_previous_module);
-#else
+
 static poly compute_image(const poly multiplier, const int comp,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lt_struct *const *const hash_previous_module);
-#define traverse_tail compute_image
-#endif   // CACHE
+        const lt_struct *const *const hash_previous_module,
+        const bool use_cache);
 
 /*
@@ -160 +151 @@
 static poly reduce_term(const poly multiplier, const poly term,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lt_struct *const *const hash_previous_module)
+        const lt_struct *const *const hash_previous_module,
+        const bool use_cache)
 {
     poly s = find_reducer(multiplier, term, hash_previous_module);
@@ -168 +160 @@
     const ring r = currRing;
     const int c = __p_GetComp(s, r) - 1;
-    const poly t = traverse_tail(s, c, previous_module, variables,
-            hash_previous_module);
+    poly t;
+    if (use_cache) {
+        t = traverse_tail(s, c, previous_module, variables,
+                hash_previous_module);
+    } else {
+        t = compute_image(s, c, previous_module, variables,
+                hash_previous_module, false);
+    }
     return p_Add_q(s, t, r);
 }
@@ -179 +177 @@
 static poly compute_image(const poly multiplier, const int comp,
         const ideal previous_module, const std::vector<bool> &variables,
-        const lt_struct *const *const hash_previous_module)
+        const lt_struct *const *const hash_previous_module,
+        const bool use_cache)
 {
     const poly tail = previous_module->m[comp]->next;
@@ -188 +187 @@
     for (poly p = tail; p != NULL; p = pNext(p)) {
         const poly rt = reduce_term(multiplier, p, previous_module, variables,
-                hash_previous_module);
+                hash_previous_module, use_cache);
         sBucket_Add_p(sum, rt, pLength(rt));
     }
@@ -198 +197 @@
 }
 
-#if CACHE
 struct cache_compare
 {
@@ -267 +265 @@
     }
     poly p = compute_image(multiplier, comp, previous_module, variables,
-            hash_previous_module);
+            hash_previous_module, true);
     insert_into_cache_term(T, multiplier, p);
     return p;
 }
-#endif   // CACHE
 
 /*
@@ -278 +275 @@
 static poly lift_ext_LT(const poly a, const ideal previous_module,
         const std::vector<bool> &variables,
-        const lt_struct *const *const hash_previous_module)
+        const lt_struct *const *const hash_previous_module,
+        const bool use_cache)
 {
     const ring R = currRing;
     // the leading term does not need to be cached
     poly t1 = compute_image(a, __p_GetComp(a, R)-1, previous_module, variables,
-            hash_previous_module);
-    poly t2 = traverse_tail(a->next, __p_GetComp(a->next, R)-1,
-            previous_module, variables, hash_previous_module);
+            hash_previous_module, use_cache);
+    poly t2;
+    if (use_cache) {
+        t2 = traverse_tail(a->next, __p_GetComp(a->next, R)-1,
+                previous_module, variables, hash_previous_module);
+    } else {
+        t2 = compute_image(a->next, __p_GetComp(a->next, R)-1,
+                previous_module, variables, hash_previous_module, false);
+    }
     t1 = p_Add_q(t1, t2, R);
     return t1;
@@ -527 +531 @@
  */
 static void computeLiftings(const resolvente res, const int index,
-        const std::vector<bool> &variables)
-{
-#if CACHE
-    initialize_cache(res[index-1]->ncols);
-#endif   // CACHE
+        const std::vector<bool> &variables, const bool use_cache)
+{
+    if (use_cache) {
+        initialize_cache(res[index-1]->ncols);
+    }
     lt_struct **hash_previous_module
         = (lt_struct **)omAlloc((res[index-1]->rank+1)*sizeof(lt_struct *));
@@ -537 +541 @@
     for (int j = res[index]->ncols-1; j >= 0; j--) {
         res[index]->m[j]->next->next = lift_ext_LT(res[index]->m[j],
-                res[index-1], variables, hash_previous_module);
+                res[index-1], variables, hash_previous_module, use_cache);
     }
     for (int i = 0; i <= res[index-1]->rank; i++) {
@@ -543 +547 @@
     }
     omFree(hash_previous_module);
-#if CACHE
-    delete_cache(res[index-1]->ncols);
-#endif   // CACHE
+    if (use_cache) {
+        delete_cache(res[index-1]->ncols);
+    }
 }
 
@@ -600 +604 @@
 static int computeResolution_iteration(resolvente res, const int max_index,
         syzHeadFunction *syzHead, const bool do_lifting,
-        const bool single_module, const bool use_tensor_trick,
-        std::vector<bool> &variables)
+        const bool single_module, const bool use_cache,
+        const bool use_tensor_trick, std::vector<bool> &variables)
 {
     int index = 1;
     while (!idIs0(res[index])) {
         if (do_lifting) {
-            computeLiftings(res, index, variables);
+            computeLiftings(res, index, variables, use_cache);
             if (single_module) {
                 delete_tails(res, index-1);
@@ -632 +636 @@
 static int computeResolution(resolvente res, const int max_index,
         syzHeadFunction *syzHead, const bool do_lifting,
-        const bool single_module, const bool use_tensor_trick)
+        const bool single_module, const bool use_cache,
+        const bool use_tensor_trick)
 {
     if (idIs0(res[0])) {
@@ -649 +654 @@
         res[1] = computeFrame(res[0], syzM_i_unsorted, syzHead);
         index = computeResolution_iteration(res, max_index, syzHead,
-                do_lifting, single_module, use_tensor_trick, variables);
+                do_lifting, single_module, use_cache, use_tensor_trick,
+                variables);
     }
     variables.clear();
@@ -726 +732 @@
  * Compute the Schreyer resolution of arg, see reference at the beginning of
  * this file.
+ *
+ * If use_cache == true (default), the result of compute_image() is cached for
+ * _every_ term in the current step of the resolution. This corresponds to the
+ * subtree attached to the node which represents this term, see reference.
+ *
  * If use_tensor_trick == true, the current module is modfied after each
  * lifting step in the resolution: any term which contains a variable which
@@ -731 +742 @@
  * resulting object is not necessarily a complex anymore. However, constant
  * entries remain exactly the same. This option does not apply for
- * method == "frame" and method "extended frame". It is used in PrymGreen.jl;
- * do not delete!
+ * method == "frame" and method "extended frame".
+ *
+ * These two options are used in PrymGreen.jl; do not delete!
  */
 syStrategy syFrank(const ideal arg, const int length, const char *method,
-        const bool use_tensor_trick)
+        const bool use_cache, const bool use_tensor_trick)
 {
     syStrategy result = (syStrategy)omAlloc0(sizeof(ssyStrategy));
@@ -749 +761 @@
     set_options(&syzHead, &do_lifting, &single_module, method);
     int new_length = computeResolution(res, length-1, syzHead, do_lifting,
-            single_module, use_tensor_trick);
+            single_module, use_cache, use_tensor_trick);
     if (new_length < length) {
         res = (resolvente)omReallocSize(res, (length+1)*sizeof(ideal),