Changeset d4cec6a in git for libpolys/polys/operations/p_Mult_q.cc

Timestamp:

Jul 23, 2019, 11:31:27 AM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7161acac8387482214ebcdd85e77266519f0cad2

Parents:

d906dc5d406b00b056fb825f5c5c8988ebcaceb3628fc3d0ec524cd36ca82c3a6275c0dcf5d73c83

Message:

Merge branch 'spielwiese' into stable

File:

• libpolys/polys/operations/p_Mult_q.cc (modified) (5 diffs)

libpolys/polys/operations/p_Mult_q.cc

@@ -23 +23 @@
 #include "polys/templates/p_MemAdd.h"
 #include "polys/templates/p_MemCopy.h"
+#include "polys/flintconv.h"
+#include "polys/flint_mpoly.h"
 
 #include "p_Mult_q.h"
@@ -268 +270 @@
 
 
+// Use factory if min(pLength(p), pLength(q)) >= MIN_LENGTH_FACTORY (>MIN_LENGTH_BUCKET)
+// Not thoroughly tested what is best
+#define MIN_LENGTH_FACTORY 200
+#define MIN_LENGTH_FACTORY_QQ 60
+#define MIN_FLINT_QQ 10
+#define MIN_FLINT_Zp 20
+
 /// Returns:  p * q,
 /// Destroys: if !copy then p, q
-/// Assumes: pLength(p) >= 2 pLength(q) >=2
+/// Assumes: pLength(p) >= 2 pLength(q) >=2, !rIsPluralRing(r)
 poly _p_Mult_q(poly p, poly q, const int copy, const ring r)
 {
@@ -281 +290 @@
   poly pt;
 
-  pqLength(p, q, lp, lq, MIN_LENGTH_BUCKET);
+  pqLength(p, q, lp, lq, MIN_LENGTH_FACTORY);
 
   if (lp < lq)
@@ -292 +301 @@
     lq = l;
   }
+  BOOLEAN pure_polys=(p_GetComp(p,r)==0) && (p_GetComp(q,r)==0);
+  #ifdef HAVE_FLINT
+  #if __FLINT_RELEASE >= 20503
+  if (lq>MIN_FLINT_QQ)
+  {
+    fmpq_mpoly_ctx_t ctx;
+    if (pure_polys && rField_is_Q(r) && !convSingRFlintR(ctx,r))
+    {
+      lp=pLength(p);
+      //printf("mul in flint\n");
+      poly res=Flint_Mult_MP(p,lp,q,lq,ctx,r);
+      if (!copy)
+      {
+        p_Delete(&p,r);
+        p_Delete(&q,r);
+      }
+      return res;
+    }
+  }
+  if (lq>MIN_FLINT_Zp)
+  {
+    nmod_mpoly_ctx_t ctx;
+    if (pure_polys && rField_is_Zp(r) && !convSingRFlintR(ctx,r))
+    {
+      lp=pLength(p);
+      //printf("mul in flint\n");
+      poly res=Flint_Mult_MP(p,lp,q,lq,ctx,r);
+      if (!copy)
+      {
+        p_Delete(&p,r);
+        p_Delete(&q,r);
+      }
+      return res;
+    }
+  }
+  #endif
+  #endif
   if (lq < MIN_LENGTH_BUCKET || TEST_OPT_NOT_BUCKETS)
     return _p_Mult_q_Normal(p, q, copy, r);
-  else if ((lq >= MIN_LENGTH_FACTORY)
-  && (r->cf->convSingNFactoryN!=ndConvSingNFactoryN))
+  else if (pure_polys
+  && (((lq >= MIN_LENGTH_FACTORY)
+    && (r->cf->convSingNFactoryN!=ndConvSingNFactoryN))
+  || ((lq >= MIN_LENGTH_FACTORY_QQ)
+    && rField_is_Q(r))))
   {
     poly h=singclap_pmult(p,q,r);
@@ -307 +356 @@
   else
   {
-    assume(lp == pLength(p));
+    lp=pLength(p);
     assume(lq == pLength(q));
     return _p_Mult_q_Bucket(p, lp, q, lq, copy, r);