Changeset f846ac in git

Timestamp:

Jul 5, 2019, 3:31:35 PM (5 years ago)

Author:

tthsqe12 <tthsqe12@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e2e2f765be02bebe5d52e7767512e55fa395ece8

Parents:

a40b288857c4e60c94e2f3ab2715381bf097761c

Message:

more robust divisons

File:

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

libpolys/polys/flint_mpoly.cc

@@ -330 +330 @@
 
     convert_sing_to_fmpq_mpoly_arg * args = new convert_sing_to_fmpq_mpoly_arg[base.num_threads];
+    slong cur_idx = 0;
     for (slong i = 0; i < base.num_threads; i++)
     {
+        slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.length/base.num_threads : base.length;
+        next_idx = FLINT_MAX(next_idx, cur_idx);
+        next_idx = FLINT_MIN(next_idx, base.length);
         args[i].base = &base;
-        args[i].start_idx = (i+0)*base.length/base.num_threads;
-        args[i].end_idx   = (i+1)*base.length/base.num_threads;
+        args[i].start_idx = cur_idx;
+        args[i].end_idx   = next_idx;
+        cur_idx = next_idx;
     }
 
@@ -464 +469 @@
 
     convert_fmpq_mpoly_to_sing_arg * args = new convert_fmpq_mpoly_to_sing_arg[base.num_threads];
+    slong cur_idx = 0;
     for (slong i = 0; i < base.num_threads; i++)
     {
+        slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.f->zpoly->length/base.num_threads
+                                                  : base.f->zpoly->length;
+        next_idx = FLINT_MAX(next_idx, cur_idx);
+        next_idx = FLINT_MIN(next_idx, base.f->zpoly->length);
         args[i].base = &base;
-        args[i].start_idx = (i+0)*base.f->zpoly->length/base.num_threads;
-        args[i].end_idx   = (i+1)*base.f->zpoly->length/base.num_threads;
+        args[i].start_idx = cur_idx;
+        args[i].end_idx   = next_idx;
+        cur_idx = next_idx;
         args[i].poly_end = NULL;
         args[i].poly_start = NULL;
@@ -609 +620 @@
 
     convert_sing_to_nmod_mpoly_arg * args = new convert_sing_to_nmod_mpoly_arg[base.num_threads];
+    slong cur_idx = 0;
     for (slong i = 0; i < base.num_threads; i++)
     {
+        slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.length/base.num_threads
+                                                  : base.length;
+        next_idx = FLINT_MAX(next_idx, cur_idx);
+        next_idx = FLINT_MIN(next_idx, base.length);
         args[i].base = &base;
-        args[i].start_idx = (i+0)*base.length/base.num_threads;
-        args[i].end_idx   = (i+1)*base.length/base.num_threads;
+        args[i].start_idx = cur_idx;
+        args[i].end_idx   = next_idx;
+        cur_idx = next_idx;
     }
 
@@ -717 +734 @@
 
     convert_nmod_mpoly_to_sing_arg * args = new convert_nmod_mpoly_to_sing_arg[base.num_threads];
+    slong cur_idx = 0;
     for (slong i = 0; i < base.num_threads; i++)
     {
+        slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.f->length/base.num_threads
+                                                  : base.f->length;
+        next_idx = FLINT_MAX(next_idx, cur_idx);
+        next_idx = FLINT_MIN(next_idx, base.f->length);
         args[i].base = &base;
-        args[i].start_idx = (i+0)*base.f->length/base.num_threads;
-        args[i].end_idx   = (i+1)*base.f->length/base.num_threads;
+        args[i].start_idx = cur_idx;
+        args[i].end_idx   = next_idx;
+        cur_idx = next_idx;
         args[i].poly_end = NULL;
         args[i].poly_start = NULL;