Changeset 172d852 in git for Singular/walk.cc

Timestamp:

Jan 24, 2019, 2:32:29 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

08394f319ba420091cccad7e025c3f7cac04c373

Parents:

5abb79fd2458b47b21d297f2c8b26f285ac9546f756676ef1fcf4cff300fb1607a6d21293b253245

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-01-24 14:32:29+01:00

git-committer:

GitHub <noreply@github.com>2019-01-24 14:32:29+01:00

Message:

Merge pull request #906 from rbehrends/prelim-thread-rewrite

Singular changes for multi-threading support.

File:

• Singular/walk.cc (modified) (17 diffs)

Singular/walk.cc

@@ -78 +78 @@
 #include "misc/mylimits.h"
 
-int nstep;
+VAR int nstep;
 
 extern BOOLEAN ErrorCheck();
 
-extern BOOLEAN pSetm_error;
+EXTERN_VAR BOOLEAN pSetm_error;
 
 void Set_Error( BOOLEAN f) { pSetm_error=f; }
 
-BOOLEAN Overflow_Error =  FALSE;
-
-#ifdef TIME_TEST
-clock_t xtif, xtstd, xtlift, xtred, xtnw;
-clock_t xftostd, xtextra, xftinput, to;
+VAR BOOLEAN Overflow_Error =  FALSE;
+
+#ifdef TIME_TEST
+VAR clock_t xtif, xtstd, xtlift, xtred, xtnw;
+VAR clock_t xftostd, xtextra, xftinput, to;
 #endif
 
@@ -1509 +1509 @@
 *  compute a perturbed weight vector of a matrix order w.r.t. an ideal  *
 *************************************************************************/
-int Xnlev;
+VAR int Xnlev;
 intvec* Mfpertvector(ideal G, intvec* ivtarget)
 {
@@ -3656 +3656 @@
  //mpz_out_str(stdout, 10, ndeg);
 #endif
-  mpz_t deg_tmp;
+  VAR mpz_t deg_tmp;
   mpz_init_set(deg_tmp, ndeg);
 
-  mpz_t *ivres=( mpz_t *) omAlloc(nV*sizeof(mpz_t));
+  VAR mpz_t *ivres=( mpz_t *) omAlloc(nV*sizeof(mpz_t));
   mpz_init_set_ui(ivres[nV-1],1);
 
@@ -3668 +3668 @@
   }
 
-  mpz_t *ivtmp=(mpz_t *)omAlloc(nV*sizeof(mpz_t));
+  VAR mpz_t *ivtmp=(mpz_t *)omAlloc(nV*sizeof(mpz_t));
   for(i=0; i<nV; i++)
   {
     mpz_init(ivtmp[i]);
   }
-  mpz_t sing_int;
+  VAR mpz_t sing_int;
   mpz_init_set_ui(sing_int,  2147483647);
 
-  intvec* repr_vector = new intvec(nV);
+  VAR intvec* repr_vector = new intvec(nV);
 
   // define ivtmp := ndeg^(n-1).w_1 + ndeg^(n-2).w_2 + ... + w_n
@@ -3695 +3695 @@
     }
   }
-  delete ivMat;
-
-  int ntrue=0;
+  VAR delete ivMat;
+
+  VAR int ntrue=0;
   for(i=0; i<nV; i++)
   {
@@ -3731 +3731 @@
   mpz_clear(ndeg);
 
-  return repr_vector;
+  VAR return repr_vector;
 }
 #endif
@@ -3780 +3780 @@
 #endif
 
-  mpz_t deg_tmp;
+  VAR mpz_t deg_tmp;
   mpz_init_set(deg_tmp, ndeg);
 
-  mpz_t *ivres=(mpz_t *)omAlloc(nV*sizeof(mpz_t));
+  VAR mpz_t *ivres=(mpz_t *)omAlloc(nV*sizeof(mpz_t));
   mpz_init_set_ui(ivres[nV-1], 1);
 
@@ -3792 +3792 @@
   }
 
-  mpz_t sing_int;
+  VAR mpz_t sing_int;
   mpz_init_set_ui(sing_int,  2147483647);
 
-  intvec* repr_vector = new intvec(nV);
-  int ntrue=0;
+  VAR intvec* repr_vector = new intvec(nV);
+  VAR int ntrue=0;
   for(i=0; i<nV; i++)
   {
@@ -3827 +3827 @@
   mpz_clear(sing_int);
 
-  return repr_vector;
+  VAR return repr_vector;
 }
 #endif
@@ -4503 +4503 @@
 }
 
-int ngleich;
-intvec* Xsigma;
-intvec* Xtau;
-int xn;
-intvec* Xivinput;
-intvec* Xivlp;
+VAR int ngleich;
+VAR intvec* Xsigma;
+VAR intvec* Xtau;
+VAR int xn;
+VAR intvec* Xivinput;
+VAR intvec* Xivlp;
 
 
@@ -6925 +6925 @@
 }
 
-intvec* XivNull;
+VAR intvec* XivNull;
 
 /*****************************
@@ -6942 +6942 @@
 }
 
-int nnflow;
-int Xcall;
-int Xngleich;
+VAR int nnflow;
+VAR int Xcall;
+VAR int Xngleich;
 
 /***********************************************************************
@@ -8835 +8835 @@
 
 #ifdef TIME_TEST
-  clock_t tostd, tif=0, tstd=0, tlift=0, tred=0, tnw=0, textra=0;
-  clock_t tinput = clock();
-#endif
-  int nsteppert=0, i, nV = currRing->N, nwalk=0, npert_tmp=0;
-  int *npert=(int*)omAlloc(2*nV*sizeof(int));
-  ideal Gomega, M,F,  G1, Gomega1, Gomega2, M1, F1;
+  VAR clock_t tostd, tif=0, tstd=0, tlift=0, tred=0, tnw=0, textra=0;
+  VAR clock_t tinput = clock();
+#endif
+  VAR int nsteppert=0, i, nV = currRing->N, nwalk=0, npert_tmp=0;
+  VAR int *npert=(int*)omAlloc(2*nV*sizeof(int));
+  INST_VAR ideal Gomega, M,F,  G1, Gomega1, Gomega2, M1, F1;
   //ring endRing;
-  ring newRing, oldRing, lpRing;
-  intvec* next_weight;
-  intvec* ivNull = new intvec(nV); //define (0,...,0)
-  intvec* iv_dp = MivUnit(nV);// define (1,1,...,1)
-  intvec* iv_lp = Mivlp(nV); //define (1,0,...,0)
-  ideal H0;
+  VAR ring newRing, oldRing, lpRing;
+  VAR intvec* next_weight;
+  VAR intvec* ivNull = new intvec(nV); //define (0,...,0)
+  VAR intvec* iv_dp = MivUnit(nV);// define (1,1,...,1)
+  VAR intvec* iv_lp = Mivlp(nV); //define (1,0,...,0)
+  INST_VAR ideal H0;
   //ideal H1;
-  ideal H2, Glp;
-  int weight_norm, nGB, endwalks = 0,  nwalkpert=0,  npertstep=0;
-  intvec* Mlp =  MivMatrixOrderlp(nV);
-  intvec* vector_tmp = new intvec(nV);
+  INST_VAR ideal H2, Glp;
+  VAR int weight_norm, nGB, endwalks = 0,  nwalkpert=0,  npertstep=0;
+  VAR intvec* Mlp =  MivMatrixOrderlp(nV);
+  VAR intvec* vector_tmp = new intvec(nV);
 #ifndef BUCHBERGER_ALG
-  intvec* hilb_func;
+  VAR intvec* hilb_func;
 #endif
   // to avoid (1,0,...,0) as the target vector
-  intvec* last_omega = new intvec(nV);
+  VAR intvec* last_omega = new intvec(nV);
   for(i=nV-1; i>0; i--)
   {
@@ -8865 +8865 @@
 
 //intvec* extra_curr_weight = new intvec(nV);
-  intvec* target_weight = new intvec(nV);
+  VAR intvec* target_weight = new intvec(nV);
   for(i=nV-1; i>=0; i--)
   {
     (*target_weight)[i] = (*target_tmp)[i];
   }
-  ring XXRing = currRing;
+  VAR ring XXRing = currRing;
   newRing = currRing;
 
@@ -8901 +8901 @@
 
 #ifdef REPRESENTATION_OF_SIGMA
-  ideal Gw = MwalkInitialForm(G, curr_weight);
+  INST_VAR ideal Gw = MwalkInitialForm(G, curr_weight);
 
   if(islengthpoly2(Gw)==1)
@@ -8942 +8942 @@
 
   idDelete(&Gw);
-  delete iv_dp;
+  VAR delete iv_dp;
 #endif
 
@@ -9355 +9355 @@
  FINISH:
   delete ivNull;
-  delete next_weight;
-  delete iv_lp;
+  VAR delete next_weight;
+  VAR delete iv_lp;
   omFree(npert);