Merge pull request #13855 from iyamazaki/basker-float

ShyLU-Basker : fix compile errors/warnings (e.g., with float)

Author: iyamazaki

packages/shylu/shylu_node/basker/src/mwm2.hpp

@@ -533,26 +533,25 @@ namespace mwm_order
   template<class Int, class Entry>
   int mwm_bn_init
   (
-   Int n, 
+   Int n,
    Int nnz,
-   Int *col_ptr, 
+   Int *col_ptr,
    Int *row_idx,
    Entry  *val,
-   Int *pr, 
+   Int *pr,
    Int *L,
-   //Entry *d, 
-   double *d, 
-   Int *iperm, 
-   Int *jperm, 
-   Int &num, 
-   double &bv
+   Entry *d,
+   Int *iperm,
+   Int *jperm,
+   Int &num,
+   Entry &bv
   )
   {
     Int i,ii,i0,j,jj, k;
     Int kk, kk1, kk2;
 //    Entry a0, ai;
-    double a0, ai;
-    bv = (double) INF;
+    Entry a0, ai;
+    bv = (Entry) INF;
 
     //Init used values
     i0 = -1;
@@ -562,15 +561,13 @@ namespace mwm_order
       iperm[k] = -1;
       jperm[k] = -1;
       pr[k]    = col_ptr[k];
-      //d[k]     = (Entry) 0;
-      d[k]     = (double) 0;
+      d[k]     = (Entry) 0;
     }
 
     //Scan over column nodes
     for(j=0; j<n; j++)
     {
-      //a0 = (Entry) -1.0;
-      a0 = (double) -1.0;
+      a0 = (Entry) -1.0;
       //For each column node, 
       for(k=col_ptr[j]; k<col_ptr[j+1]; k++)
       {
@@ -606,7 +603,7 @@ namespace mwm_order
           i0 = i;
         }
       }//for-k, row nodes
-      if((a0 != ((double)(-1.0))) && (a0 < bv))
+      if((a0 != ((Entry)(-1.0))) && (a0 < bv))
       {
         bv = a0;
         if(iperm[i0] != -1)
@@ -707,21 +704,18 @@ namespace mwm_order
   template<class Int, class Entry>
   int mwm_bn
   (
-   Int n, 
+   Int n,
    Int nnz,
-   Int *col_ptr, 
+   Int *col_ptr,
    Int *row_idx,
    Entry  *val,
-   Int *pr, 
+   Int *pr,
    Int *L,
-   //Entry *d, 
-   double *d, 
-   Int *iperm, 
-   Int *jperm, 
-   //Int &num, 
-   //Entry &bv,
-   Int &num, 
-   double &bv
+   Entry *d,
+   Int *iperm,
+   Int *jperm,
+   Int &num,
+   Entry &bv
   )
   {
     Int i, i0;
@@ -730,19 +724,15 @@ namespace mwm_order
     Int jord, jdum, idum;
     Int qlen, low, up;
     Int q0;
-    double dq0;
-    //Entry dq0;
+    Entry dq0;
 
-    double dnew, di;
-    double csp;
-    //Entry dnew, di;
-    //Entry csp;
+    Entry dnew, di;
+    Entry csp;
     Int isp, jsp;
 
     Int lpos;
 
-    //Entry MINONE = (Entry) -1.0;
-    double MINONE = (double) -1.0;
+    Entry MINONE = (Entry) -1.0;
 
     Int *Q = new Int[n+1];
 
@@ -1045,14 +1035,13 @@ namespace mwm_order
    Int &num
   )
   {
-    double *d    = new double[n];
+    Entry *d     = new Entry[n];
     Int   *jperm = new Int[n];
     Int   *iperm = new Int[n];
     Int   *L     = new Int[n];
     Int   *pr    = new Int[n];
 
-    //Entry bv = 0;
-    double bv = 0;
+    Entry bv = 0;
 
     mwm_bn_init(n,nnz, 
 		col_ptr, row_idx, val,

packages/shylu/shylu_node/basker/src/shylubasker_order_scotch.hpp

@@ -236,7 +236,8 @@ namespace BaskerNS
         // id of the first leaf node (BF order, post_order maps from BF to ND)
         Int leaves_id = pow(2.0, (double)(num_levels)) - 1;
         if (Options.verbose == BASKER_TRUE) {
-          printf( " num_domains = %d: num_levels = %d, num_doms = %d, leves_id = %d\n",num_domains,num_levels,num_doms,leaves_id );
+          printf( " num_domains = %d: num_levels = %d, num_doms = %d, leves_id = %d\n",
+                  int(num_domains),int(num_levels),int(num_doms),int(leaves_id) );
         }
 
         // > insert root

packages/shylu/shylu_node/basker/test/amesos2_interface_test.cpp

@@ -129,9 +129,9 @@ int main(int argc, char* argv[])
     std::cout << "Done with Factor, Time: "
               << totalTime(ftime, myTime()) << std::endl;
     //mybasker.DEBUG_PRINT();
-    double ttime = myTime();
 
     if (nontranspose) {
+      double ttime = myTime();
       std::cout << "\n\n** Begin Solve **\n" << std::endl;
       mybasker.Solve(y,x);
       std::cout << "Done with Solve, Time: "
@@ -178,7 +178,7 @@ int main(int argc, char* argv[])
         x[i] = (Entry) 0.0;
       }
 
-      ttime = myTime();
+      double ttime = myTime();
       std::cout << "\n\n** Begin Transpose Solve **\n" << std::endl;
       // transpose
       mybasker.Solve(yt,x,true);
@@ -216,17 +216,15 @@ int main(int argc, char* argv[])
                                                            //---Options
       mybaskertr.SetThreads(nthreads);
       std::cout << "Setting Threads:" << nthreads << std::endl;
-      double stime = myTime();
+      stime = myTime();
       mybaskertr.Symbolic(m,n,nnz,col_ptr,row_idx,val);
       std::cout << "Done with Symbolic, Time: " 
         << totalTime(stime, myTime()) << std::endl;
-      double ftime = myTime();
+      ftime = myTime();
       mybaskertr.Factor(m,n,nnz,col_ptr,row_idx,val);
       std::cout << "Done with Factor, Time: "
         << totalTime(ftime, myTime()) << std::endl;
       //mybaskertr.DEBUG_PRINT();
-      double ttime = myTime();
-
 
       // Transpose solve:
       // This solve only works with square matrices