Stop passing jl_opts around

Author: thilinarmtb

src/elliptic/box/crs_box.cpp

@@ -161,7 +161,7 @@ static void asm2_solve(const struct box *box) {
 }
 
 template <typename T>
-static void asm1_setup(struct box *box, const jl_opts *opts, double tol, const struct comm *comm) {
+static void asm1_setup(struct box *box, double tol, const struct comm *comm) {
   buffer *bfr = &(box->bfr);
   struct comm *local = &(box->local);
 
@@ -214,15 +214,16 @@ static void asm1_setup(struct box *box, const jl_opts *opts, double tol, const s
 
   // Setup ASM1 solver.
   box->asm1 = NULL;
-  switch(opts->asm1) {
+  switch(box->opts.asm1) {
   case BOX_XXT:
-    box->asm1 = (void *)crs_xxt_setup(box->sn, tmp_vtx, nnz, ia, ja, va, opts->dom, opts->null_space, local);
+    box->asm1 = (void *)crs_xxt_setup(box->sn, tmp_vtx, nnz, ia, ja, va,
+        box->opts.dom, box->opts.null_space, local);
     break;
   case BOX_CHOLMOD:
-    asm1_cholmod_setup(A, null_space, box, opts);
+    asm1_cholmod_setup(A, null_space, box);
     break;
   case BOX_GPU:
-    asm1_gpu_setup(A, null_space, box, opts);
+    asm1_gpu_setup(A, null_space, box);
     break;
   }
 
@@ -240,7 +241,7 @@ static void asm1_setup(struct box *box, const jl_opts *opts, double tol, const s
 }
 
 template <typename T>
-static void cpu_setup(struct box *box, const jl_opts *opts) {
+static void cpu_setup(struct box *box) {
   uint work_array_size = MAX(box->sn, *(nekData.box_n));
   box->sx = malloc(sizeof(T) * 2 * work_array_size);
   box->srhs = (void *)((T *)box->sx + work_array_size);
@@ -293,7 +294,7 @@ static void gpu_setup(struct box *box) {
   T *inv_mul = tcalloc(T, box->sn);
   for (uint i = 0; i < box->un; i++)
     inv_mul[i] = 1.0;
-  gs(inv_mul, opts->dom, gs_add, 0, box->gsh, &(box->bfr));
+  gs(inv_mul, box->opts.dom, gs_add, 0, box->gsh, &(box->bfr));
   for (uint i = 0; i < box->sn; i++)
     inv_mul[i] = 1.0 / inv_mul[i];
   o_invmul.copyFrom(inv_mul);
@@ -326,14 +327,14 @@ struct box *crs_box_setup(uint n, const ulong *id, uint nnz, const uint *Ai, con
   const double tol = 1e-12;
   switch(opts->dom) {
     case gs_double:
-      asm1_setup<double>(box, opts, tol, comm);
-      cpu_setup<double>(box, opts);
-      gpu_setup<double>(box, opts);
+      asm1_setup<double>(box, tol, comm);
+      cpu_setup<double>(box);
+      gpu_setup<double>(box);
       break;
     case gs_float:
-      asm1_setup<float>(box, opts, tol, comm);
-      cpu_setup<float>(box, opts);
-      gpu_setup<float>(box, opts);
+      asm1_setup<float>(box, tol, comm);
+      cpu_setup<float>(box);
+      gpu_setup<float>(box);
       break;
     default:
       break;

src/elliptic/box/crs_box_cholmod.cpp

@@ -50,17 +50,17 @@ static void csr_finalize(struct cholmod_csr *B) {
   free(B);
 }
 
-void asm1_cholmod_setup(struct csr *A, unsigned null_space, struct box *box, const jl_opts *opts) {
+void asm1_cholmod_setup(struct csr *A, unsigned null_space, struct box *box) {
   if (initialied)
     return;
 
-  dom = opts->dom;
+  dom = box->opts.dom;
   switch (dom) {
   case gs_double:
-    box->asm1 = (void *)csr_setup_double(A, null_space, &box->global);
+    box->asm1 = (void *)csr_setup_double(A, null_space, &(box->global));
     break;
   case gs_float:
-    box->asm1 = (void *)csr_setup_float(A, null_space, &box->global);
+    box->asm1 = (void *)csr_setup_float(A, null_space, &(box->global));
     break;
   default:
     break;

src/elliptic/box/crs_box_gpu.cpp

@@ -185,7 +185,7 @@ void asm1_gpu_free(struct box *box) {
 #elif defined(ENABLE_ONEMKL)
 #include "crs_box_gpu_onemkl.hpp"
 
-void asm1_gpu_setup(struct csr *A, unsigned null_space, struct box *box, const jl_opts *opts) {
+void asm1_gpu_setup(struct csr *A, unsigned null_space, struct box *box) {
   assert(null_space == 0);
 
   if (initialized) return;
@@ -208,7 +208,7 @@ void asm1_gpu_setup(struct csr *A, unsigned null_space, struct box *box, const j
   d_x = box_onemkl_device_malloc<double>(nr);
 
   initialized = 1;
-  dom = opts->dom;
+  dom = box->opts.dom;
 }
 
 template <typename T>

src/elliptic/box/crs_box_impl.hpp

@@ -50,12 +50,12 @@ void sparse_cholmod_solve(void *x, struct cholmod_csr *factor, const void *r);
 void sparse_cholmod_free(struct cholmod_csr *factor);
 
 // ASM1: CHOLMOD API interface.
-void asm1_cholmod_setup(struct csr *A, unsigned null_space, struct box *box, const jl_opts *opts);
+void asm1_cholmod_setup(struct csr *A, unsigned null_space, struct box *box);
 void asm1_cholmod_solve(void *x, struct box *box, const void *r);
 void asm1_cholmod_free(struct box *box);
 
 // ASM1: GPU BLAS interface.
-void asm1_gpu_setup(struct csr *A, unsigned null_space, struct box *box, const jl_opts *opts);
+void asm1_gpu_setup(struct csr *A, unsigned null_space, struct box *box);
 void asm1_gpu_solve(void *x, struct box *box, const void *r);
 void asm1_gpu_solve(occa::memory &o_x, struct box *box, occa::memory &o_r);
 void asm1_gpu_free(struct box *box);