Changeset 950a94 in git

Timestamp:

Apr 5, 2021, 8:53:07 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3b920ed3c3de324ec3518b5635feb03d0ab430ba4ad5cdee02a913f5a35346f60310f09d427a9e92ec35b06cd0d64d898912171ca267d9a5c53beee3

Parents:

03514358a007bf6bb923bc7b510ec15fb877158b68efee280d28d45c36fe198205a93c29e0641ea8

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-04-05 20:53:07+02:00

git-committer:

GitHub <noreply@github.com>2021-04-05 20:53:07+02:00

Message:

Merge pull request #1078 from mkoeppe/DEFAULT_CHECKING_PATH_refactor_flint_check

m4/flint-check.m4: Refactor

Files:

• Tst/Manual/letterplace_reduce.res.gz.uu (modified) (1 diff)
• Tst/Manual/letterplace_reduce.stat (modified) (1 diff)
• Tst/Manual/letterplace_reduce.tst (modified) (1 diff)
• kernel/GBEngine/kstd2.cc (modified) (2 diffs)
• kernel/GBEngine/kutil.cc (modified) (1 diff)
• m4/flint-check.m4 (modified) (3 diffs)

Tst/Manual/letterplace_reduce.res.gz.uu

@@ -1 @@
-begin 640 letterplace_reduce.res.gz
-M'XL("$W=UUX"`VQE='1E<G!L86-E7W)E9'5C92YR97,`55'+;H,P$+SS%:NH
-M!W`<!$G3AU`MM>J%J.HAZ3V"X"(DBQ#C*-A?W[7C0",?9A^S,ZOU[N<S_P:`
-ME,%7_@$SU:M8-.4L`XSV3=NH,,H"B\`8"*X4EYTH#GPO>74^\+CEE[A7A0IV
-M7FGIE7XEYW5Y%1N;*P9C_!B#;-H:)+Q!0L.!:FHB6G43>\VNC"TRK-R[J'DI
-MBU!26$<3[8E!4_%"0(X\30:B80&&:&(H8$(&EV)$'1A,L4<&V\4'<TSQ(1HL
-M&T0[92:#YYO!!@W4Y=BK*LS_+?#"H#L*#=W-'V6T=S%>^$[PU0^<<,"M9-NW
-MM>ZH:8(W<)<..[I!3T>U`PN/<U<9^>G(/SE^,G:6T^W35>S^UW[<N0_3*'L(
-*_@"QU8$#"@(`````
+begin 644 letterplace_reduce.res.gz
+M'XL("(ZL5&`"`VQE='1E<G!L86-E7W)E9'5C92YR97,`?91-;Z,P$(;O^16C
+M:@_&=0F0KZ[0(@&]I%KMH>FY%1!OA,H2((X:^/4[-A\VTF[%83SXF1G[G9$/
+MKT_[7P#@!O!S'\&=N`B[R-,['W#UGI>Y():_D!:"``HN!&^J(LGX>\./UXS;
+M)?^T+R(1B\.0R1LR_6XX/Z5]LFES%<"T7MO0Y.4)&O@!#B,WUK+.8L=*TYN@
+M)UZ0D.G"XL33)B$-@XVEL6T`^9$G!>R1:^F-MO``'6UIQP`=>E,NKI@R';JX
+M1V]R%S^X1Q<_M!W^[M#*J$X7V(T%GK&`^#Q?Q)'LC0,\!E"=BQ:JL3ZF:8<J
+MW9!XEO#[$%!C@#J2W!Z/-4-=!S502I.*/6--A<J`A\'>JS\3[TY\K7AGVO&T
+M]N[*AH^\**#Q>_NB"ZX-;&.TB#BLMA@)6<1BBSWI-KG;_[9IIT5R4<3R^B?E
+M#93RVO6;AQ=VEP07!C5*F2!2UC1$[6H:T5BQ-8UII-E1Q;1G(\7&&-.S(8TG
+MUG,&-NO96+$AQO1L1$/-NN8\X46R#RY(PD*+&5XT\U"1T4EG8#H#4Q/,9F`V
+M`S,$]8&P<^=*Y.>28&L/D>4;[FN2%P:Z^GI4O?4T'@DE>'\+!5"6)@QP7F"Y
+M=/3,>!L31Y$4+JW&P>2W$Z^U@5"U1D;],V:G!\Y[M-6[(Q^4ZX6XEO]M\1<T
+'B5"CH@0`````
 `
 end

Tst/Manual/letterplace_reduce.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1591205197:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:254776
-1 >> tst_memory_1 :: 1591205197:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2183168
-1 >> tst_memory_2 :: 1591205197:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:2261944
-1 >> tst_timer_1 :: 1591205197:4132, 64 bit:4.1.3:x86_64-Linux:nepomuck:7
+1 >> tst_memory_0 :: 1616161934:4201, 64 bit:4.2.0:x86_64-Darwin:hoth.localdomain:385640
+1 >> tst_memory_1 :: 1616161934:4201, 64 bit:4.2.0:x86_64-Darwin:hoth.localdomain:2151440
+1 >> tst_memory_2 :: 1616161934:4201, 64 bit:4.2.0:x86_64-Darwin:hoth.localdomain:2265744
+1 >> tst_timer_1 :: 1616161934:4201, 64 bit:4.2.0:x86_64-Darwin:hoth.localdomain:5

Tst/Manual/letterplace_reduce.tst

@@ -11 +11 @@
 reduce(q,J);
 
+kill r; kill R;
+
+ring r = (0,q),(A,B,C),Dp;
+ring R = freeAlgebra(r,7);
+number nq = q^2 - 1/(q^2);
+poly a = nq*A + q*B*C - 1/q*C*B;
+poly b = nq*B + q*C*A - 1/q*A*C;
+poly c = nq*C + q*A*B - 1/q*B*A;
+ideal I = bracket(a,A), bracket(a,B), bracket(a,C),bracket(b,A), bracket(b,B), bracket(b,C),bracket(c,A), bracket(c,B), bracket(c,C);
+option(redSB); option(redTail);
+ideal J = twostd(I);
+reduce(a*(A*B) - (A*B)*a, J); //0
+reduce(a*(B*A) - (B*A)*a, J); // 0
+reduce(bracket(a, A*B + B*A), J); // 0
+
 tst_status(1);$

kernel/GBEngine/kstd2.cc

@@ -3782 +3782 @@
   omfree(strat->S_2_R);
   omfree(strat->fromQ);
-#ifdef HAVE_SHIFTBBA
-  // only LM of elements in S is shifted
-  // necessary to prevent deleting the tail multiple times
-  if (rIsLPRing(currRing))
-  {
-    for (int j = 0; j < IDELEMS(strat->Shdl); j++)
-    {
-      if (strat->Shdl->m[j]!=NULL && pmFirstVblock(strat->Shdl->m[j]) > 1)
-      {
-        // otherwise the tail would be freed multiple times
-        pNext(strat->Shdl->m[j]) = NULL;
-      }
-    }
-  }
-#endif
   idDelete(&strat->Shdl);
   SI_RESTORE_OPT1(save1);
@@ -3951 +3936 @@
   omfree(strat->S_2_R);
   omfree(strat->fromQ);
-#ifdef HAVE_SHIFTBBA
-  // only LM of elements in S is shifted
-  // necessary to prevent deleting the tail multiple times
-  if (rIsLPRing(currRing))
-  {
-    for (int j = 0; j < IDELEMS(strat->Shdl); j++)
-    {
-      if (strat->Shdl->m[j]!=NULL && pmFirstVblock(strat->Shdl->m[j]) > 1)
-      {
-        // otherwise the tail would be freed multiple times
-        pNext(strat->Shdl->m[j]) = NULL;
-      }
-    }
-  }
-#endif
   idDelete(&strat->Shdl);
   SI_RESTORE_OPT1(save1);

kernel/GBEngine/kutil.cc

@@ -9455 +9455 @@
   for (int i = maxPossibleShift; i > 0; i--)
   {
-
-    LObject qq;
-    qq.p = pLPCopyAndShiftLM(p.p, i); // don't use Set() because it'll test the poly order
+    // NOTE: don't use "shared tails" here. In rare cases it can cause problems
+    // in `kNF2` because of lazy poly normalizations.
+    LObject qq(p_Copy(p.p, strat->tailRing));
+    p_mLPshift(qq.p, i, strat->tailRing);
     qq.shift = i;
     strat->initEcart(&qq); // initEcartBBA sets length, pLength, FDeg and ecart

m4/flint-check.m4

@@ -17 +17 @@
 
 AC_ARG_WITH(flint,
-[  --with-flint=<path>|yes|no  Use FLINT library. If argument is no, you do not have
-                            the library installed on your machine (set as
-                            default). If argument is yes or <empty> that means
-                            the library is reachable with the standard search
-                            path (/usr or /usr/local). Otherwise you give the
-                            <path> to the directory which contain the library.
+[  --with-flint=<path>|yes|no  Use FLINT library. By default (yes), Singular will
+                            try to find the library and use it if found.
+                            If argument is no, Singular will not use the
+                            library even if it could be found on your machine.
+                            Otherwise you can give the <path> to the directory
+                            which contains the library.
              ],
              [if test "x$withval" = xyes ; then
-                        FLINT_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+                        FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
               elif test "x$withval" != xno ; then
                         FLINT_HOME_PATH="$withval"
              fi],
-             [FLINT_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+             [FLINT_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"])
 
 dnl Check for existence
@@ -38 +38 @@
 
 flint_found="no"
-dnl check for system installed libraries if FLINT_HOME_PATH is the default
-if test "$FLINT_HOME_PATH" = "$DEFAULT_CHECKING_PATH" ; then
-        FLINT_CFLAGS=""
-        FLINT_LIBS="-lflint -lmpfr -lgmp"
-
-        # we suppose that mpfr and mpir to be in the same place or available by default
-        CFLAGS=" ${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
-        LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
-
-        AC_TRY_LINK([#include <flint/fmpz.h>
-                    ],
-                    [fmpz_t x; fmpz_init(x);], [
-                flint_found="yes"
-        ])
-fi
-
 dnl if flint was not previously found, search FLINT_HOME_PATH
-if test "x$flint_found" = "xno" ; then
-        for FLINT_HOME in ${FLINT_HOME_PATH}
-        do
-
+for FLINT_HOME in ${FLINT_HOME_PATH}
+do
+        if test "$FLINT_HOME" = DEFAULTS; then
+                FLINT_CFLAGS=""
+                FLINT_LIBS="-lflint -lmpfr -lgmp"
+        else
                 FLINT_CFLAGS="-I${FLINT_HOME}/include/"
                 FLINT_LIBS="-L${FLINT_HOME}/lib -Wl,-rpath,${FLINT_HOME}/lib -lflint -lmpfr -lgmp"
+        fi
 
         # we suppose that mpfr and mpir to be in the same place or available by default
@@ -72 +59 @@
                         break
                 ])
-        done
-fi
+done
 
 AC_LANG_POP([C])