Changeset 3f94cb in git for libpolys/polys/flint_mpoly.cc

Timestamp:

Jul 24, 2019, 5:11:36 PM (5 years ago)

Author:

tthsqe12 <tthsqe12@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

3d5b277e2651a792f826b544d03d7179c438dba0

Parents:

690c98d2dc9aa6f233ef1da705b30c910d6e9898

Message:

limit worker threads based on poly length

File:

• libpolys/polys/flint_mpoly.cc (modified) (10 diffs)

libpolys/polys/flint_mpoly.cc

@@ -241 +241 @@
     fmpq_t content;
 
-    convert_sing_to_fmpq_mpoly_base(slong num_threads_, fmpq_mpoly_struct * res_,
-                             const fmpq_mpoly_ctx_struct * ctx_, const ring r_, poly p)
-      : num_threads(num_threads_),
+    convert_sing_to_fmpq_mpoly_base(fmpq_mpoly_struct * res_,
+                     const fmpq_mpoly_ctx_struct * ctx_, const ring r_, poly p)
+      : num_threads(0),
         res(res_),
         ctx(ctx_),
@@ -428 +428 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000; // TODO: should be paramter to this function
+
+    /* the constructor works out the length of p and sets some markers */
+    convert_sing_to_fmpq_mpoly_base base(res, ctx, r, p);
+
+    /* sensibly limit thread count and get workers */
+    thread_limit = FLINT_MIN(thread_limit, base.length/1024);
     handles = NULL;
     num_handles = 0;
@@ -444 +448 @@
     }
 
-    /* the constructor works out the length of p and sets some markers */
-    convert_sing_to_fmpq_mpoly_base base(num_handles + 1, res, ctx, r, p);
-
     /* fill in thread division points */
+    base.num_threads = 1 + num_handles;
     convert_sing_to_fmpq_mpoly_arg * args = new convert_sing_to_fmpq_mpoly_arg[base.num_threads];
     slong cur_idx = 0;
@@ -606 +608 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000;// TODO: should be paramter to this function
+
+    /* sensibly limit threads and get workers */
+    thread_limit = FLINT_MIN(thread_limit, f->zpoly->length/1024);
     handles = NULL;
     num_handles = 0;
@@ -623 +626 @@
 
     convert_fmpq_mpoly_to_sing_base base(num_handles + 1, f, ctx, r);
-
     convert_fmpq_mpoly_to_sing_arg * args = new convert_fmpq_mpoly_to_sing_arg[base.num_threads];
     slong cur_idx = 0;
@@ -681 +683 @@
     ring r;
 
-    convert_sing_to_nmod_mpoly_base(slong num_threads_, nmod_mpoly_struct * res_,
-                            const nmod_mpoly_ctx_struct * ctx_, const ring r_, poly p)
-      : num_threads(num_threads_),
+    convert_sing_to_nmod_mpoly_base(nmod_mpoly_struct * res_,
+                     const nmod_mpoly_ctx_struct * ctx_, const ring r_, poly p)
+      : num_threads(0),
         res(res_),
         ctx(ctx_),
@@ -792 +794 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000; // TODO: should be paramter to this function
+
+    /* the constructor works out the length of p and sets some markers */
+    convert_sing_to_nmod_mpoly_base base(res, ctx, r, p);
+
+    /* sensibly limit thread count and get workers */
+    thread_limit = FLINT_MIN(thread_limit, base.length/1024);
     handles = NULL;
     num_handles = 0;
@@ -808 +814 @@
     }
 
-    convert_sing_to_nmod_mpoly_base base(num_handles + 1, res, ctx, r, p);
-
     /* fill in thread division points */
+    base.num_threads = 1 + num_handles;
     convert_sing_to_nmod_mpoly_arg * args = new convert_sing_to_nmod_mpoly_arg[base.num_threads];
     slong cur_idx = 0;
@@ -921 +926 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000; // TODO: should be paramter to this function
+
+    /* sensibly limit threads and get workers */
+    thread_limit = FLINT_MIN(thread_limit, f->length/1024);
     handles = NULL;
     num_handles = 0;
@@ -938 +944 @@
 
     convert_nmod_mpoly_to_sing_base base(num_handles + 1, f, ctx, r);
-
     convert_nmod_mpoly_to_sing_arg * args = new convert_nmod_mpoly_to_sing_arg[base.num_threads];
     slong cur_idx = 0;