Merge pull request #279 from wegank/secondary-modular-phase-data-race-fix-0

Fix a data race during secondary modular phase

Author: vneiger

.github/workflows/msolve.yml

@@ -76,7 +76,7 @@ jobs:
           make --version
           autoconf --version
           libtool --version
-          echo "MAKE=make -j 2 --output-sync=target" >> $GITHUB_ENV
+          echo "MAKE=make -j$(expr $(nproc) + 1) --output-sync=target" >> $GITHUB_ENV
       - name: "Build FLINT"
         run: |
           git clone --depth=1 https://github.com/flintlib/flint

src/neogb/f4.c

@@ -358,7 +358,9 @@ static int32_t initialize_f4(
     md->hcm = (hi_t *)malloc(sizeof(hi_t));
 
     if (gmd->fc != fc) {
-        reset_function_pointers(fc, md->laopt);
+        if (gmd->f4_qq_round != 2) {
+            reset_function_pointers(fc, md->laopt);
+        }
         bs = copy_basis_mod_p(gbs, md);
         if (md->laopt < 40) {
             if (md->trace_level != APPLY_TRACER) {

src/neogb/nf.c

@@ -67,7 +67,9 @@ bs_t *core_nf(
 
     /* reset to exact linear algebra for normal form computation */
     md->laopt = 2;
-    set_function_pointers(md);
+    if (md->f4_qq_round != 2) {
+        set_function_pointers(md);
+    }
 
     /* matrix holding sparse information generated
      * during symbolic preprocessing */