Changeset bd0e07 in git

Timestamp:

Mar 21, 2018, 5:50:21 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

caf8c65d1b9e21816d4d531841968cbefef2fecb

Parents:

1932d5c7bedae52a208f2b9636b004a4cd5dfad0

Message:

fix: julia-debug version

Location:

kernel

Files:

• GBEngine/tgb.cc (modified) (4 diffs)
• GBEngine/tgb_internal.h (modified) (6 diffs)
• linear_algebra/Minor.cc (modified) (1 diff)
• linear_algebra/Minor.h (modified) (1 diff)
• mod2.h (modified) (2 diffs)

kernel/GBEngine/tgb.cc

@@ -4465 +4465 @@
   kStrategy strat = c->strat;
 
+  #ifndef SING_NDEBUG
   assume (startf <= losl);
   assume ((startf == losl - 1)
           || (pLmCmp (los[startf].p, los[startf + 1].p) == -1));
+  #endif
   int i = startf;
 
@@ -4473 +4475 @@
   while(i >= 0)
   {
+    #ifndef SING_NDEBUG
     assume ((i == losl - 1) || (pLmCmp (los[i].p, los[i + 1].p) <= 0));
+    #endif
     assume (is_valid_ro (los[i]));
     j = kFindDivisibleByInS_easy (strat, los[i]);
@@ -4487 +4491 @@
 
       erg.to_reduce_l = i2;
+      #ifndef SING_NDEBUG
       assume ((i == losl - 1) || (pLmCmp (los[i].p, los[i + 1].p) == -1));
+      #endif
       canonicalize_region (los, erg.to_reduce_u + 1, startf, c);
       return;
@@ -4504 +4510 @@
         erg.reduce_by = i;
         erg.fromS = FALSE;
+        #ifndef SING_NDEBUG
         assume ((i == losl - 1) || (pLmCmp (los[i].p, los[i + 1].p) == -1));
+        #endif
         canonicalize_region (los, erg.to_reduce_u + 1, startf, c);
         return;

kernel/GBEngine/tgb_internal.h

@@ -936 +936 @@
       assume(!(npIsZero((number)(long) buffer[bpos],currRing->cf)));
       STATISTIC(n_Add); temp_array[idx]=F4mat_to_number_type(npAddM((number)(long) temp_array[idx], (number)(long) buffer[bpos++],currRing->cf));
+      #ifndef SING_NDEBUG
       assume(idx<temp_size);
+      #endif
     }
 
@@ -982 +984 @@
       //assume(!(npIsZero((number) buffer[bpos])));
       STATISTIC(n_Add); temp_array[i]=F4mat_to_number_type(npAddM((number)(long) temp_array[i], (number)(long) buffer[bpos++],currRing->cf));
+      #ifndef SING_NDEBUG
       assume(i<temp_size);
+      #endif
     }
 
@@ -1007 +1011 @@
   {
       STATISTIC(n_Add); temp_array[i]=F4mat_to_number_type(npAddM((number)(long) temp_array[i], (number)(long) row[i],currRing->cf));
+      #ifndef SING_NDEBUG
       assume(i<temp_size);
+      #endif
   }
 
@@ -1032 +1038 @@
 
       STATISTIC(n_Sub); temp_array[i]=F4mat_to_number_type(npSubM((number)(long) temp_array[i], (number)(long) row[i],currRing->cf));
+      #ifndef SING_NDEBUG
       assume(i<temp_size);
+      #endif
   }
 
@@ -1052 +1060 @@
           int idx=idx_array[j];
           STATISTIC(n_Add); temp_array[idx]=F4mat_to_number_type(   (number_type)(long)npAddM((number) (long)temp_array[idx],(number)(long) coef_array[j],currRing->cf));
+          #ifndef SING_NDEBUG
           assume(idx<temp_size);
+          #endif
         }
 }
@@ -1070 +1080 @@
           int idx=idx_array[j];
           STATISTIC(n_Sub); temp_array[idx]=F4mat_to_number_type(  (number_type)(long) npSubM((number) (long)temp_array[idx],(number)(long) coef_array[j],currRing->cf));
+          #ifndef SING_NDEBUG
           assume(idx<temp_size);
+          #endif
         }
 }

kernel/linear_algebra/Minor.cc

@@ -390 +390 @@
     result.setColumnKey(columnBlock, newColumnBits);
 
+  #ifndef SING_NDEBUG
   /* let's check that the number of selected rows and columns are equal;
      (this check is only performed in the debug version) */
   assume(result.getSetBits(1) == result.getSetBits(2));
+  #endif
 
   return result;

kernel/linear_algebra/Minor.h

@@ -2 +2 @@
 #define MINOR_H
 
+#include "kernel/mod2.h"
 #include "polys/monomials/ring.h"
 #include "kernel/polys.h"

kernel/mod2.h

@@ -133 +133 @@
 /* #define MAX_INT_LEN 11 */
 
-
-#ifdef DO_PROFILE
-/* define to enable explicit profiling of some crucial inline
- * routines and defines  */
-#undef DO_DEEP_PROFILE
-#endif
-
-/* define to enable assume */
-#ifndef HAVE_ASSUME
-#undef HAVE_ASSUME
-#endif
 
 /* define LINKAGE to "extern C" if compiling for shared libs */
@@ -398 +387 @@
 #define r_assume(x) do {} while (0)
 #else /* ! HAVE_ASSUME */
-#ifdef SING_NDEBUG
-#undef SING_NDEBUG
-#endif
 
 #define assume_violation(s,f,l) \