restr - clean up read/write logic for restr

CEED · Dec 15, 2021 · 6bb2089 · 6bb2089
1 parent 01e02ac
commit 6bb2089
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 26 deletions.
diff --git a/backends/blocked/ceed-blocked-operator.c b/backends/blocked/ceed-blocked-operator.c
@@ -88,10 +88,6 @@ static int CeedOperatorSetupFields_Blocked(CeedQFunction qf,
       ierr = CeedElemRestrictionCreateVector(blk_restr[i+start_e], NULL,
                                              &e_vecs_full[i+start_e]);
       CeedChkBackend(ierr);
-      if (is_input) {
-        ierr = CeedVectorSetArray(e_vecs_full[i+start_e], CEED_MEM_HOST,
-                                  CEED_COPY_VALUES, NULL); CeedChkBackend(ierr);
-      }
     }
 
     switch(eval_mode) {

diff --git a/backends/cuda/ceed-cuda-operator.c b/backends/cuda/ceed-cuda-operator.c
@@ -150,11 +150,6 @@ static int CeedOperatorSetupFields_Cuda(CeedQFunction qf, CeedOperator op,
         ierr = CeedElemRestrictionCreateVector(Erestrict, NULL,
                                                &evecs[i + starte]);
         CeedChkBackend(ierr);
-        // Allocate array
-        if (isinput) {
-          ierr = CeedVectorSetArray(evecs[i + starte], CEED_MEM_DEVICE,
-                                    CEED_COPY_VALUES, NULL); CeedChkBackend(ierr);
-        }
       }
     }
 

diff --git a/backends/cuda/ceed-cuda-restriction.c b/backends/cuda/ceed-cuda-restriction.c
@@ -145,7 +145,13 @@ static int CeedElemRestrictionApply_Cuda(CeedElemRestriction r,
   const CeedScalar *d_u;
   CeedScalar *d_v;
   ierr = CeedVectorGetArrayRead(u, CEED_MEM_DEVICE, &d_u); CeedChkBackend(ierr);
-  ierr = CeedVectorGetArray(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  if (tmode == CEED_TRANSPOSE) {
+    // Sum into for transpose mode, e-vec to l-vec
+    ierr = CeedVectorGetArray(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  } else {
+    // Overwrite for notranspose mode, l-vec to e-vec
+    ierr = CeedVectorGetArrayWrite(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  }
 
   // Restrict
   if (tmode == CEED_NOTRANSPOSE) {

diff --git a/backends/hip/ceed-hip-operator.c b/backends/hip/ceed-hip-operator.c
@@ -150,11 +150,6 @@ static int CeedOperatorSetupFields_Hip(CeedQFunction qf, CeedOperator op,
         ierr = CeedElemRestrictionCreateVector(Erestrict, NULL,
                                                &evecs[i + starte]);
         CeedChkBackend(ierr);
-        // Allocate array
-        if (isinput) {
-          ierr = CeedVectorSetArray(evecs[i + starte], CEED_MEM_DEVICE,
-                                    CEED_COPY_VALUES, NULL); CeedChkBackend(ierr);
-        }
       }
     }
 

diff --git a/backends/hip/ceed-hip-restriction.c b/backends/hip/ceed-hip-restriction.c
@@ -144,7 +144,13 @@ static int CeedElemRestrictionApply_Hip(CeedElemRestriction r,
   const CeedScalar *d_u;
   CeedScalar *d_v;
   ierr = CeedVectorGetArrayRead(u, CEED_MEM_DEVICE, &d_u); CeedChkBackend(ierr);
-  ierr = CeedVectorGetArray(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  if (tmode == CEED_TRANSPOSE) {
+    // Sum into for transpose mode, e-vec to l-vec
+    ierr = CeedVectorGetArray(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  } else {
+    // Overwrite for notranspose mode, l-vec to e-vec
+    ierr = CeedVectorGetArrayWrite(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  }
 
   // Restrict
   if (tmode == CEED_NOTRANSPOSE) {

diff --git a/backends/magma/ceed-magma-restriction.c b/backends/magma/ceed-magma-restriction.c
@@ -45,7 +45,13 @@ static int CeedElemRestrictionApply_Magma(CeedElemRestriction r,
   CeedScalar *dv;
 
   ierr = CeedVectorGetArrayRead(u, CEED_MEM_DEVICE, &du); CeedChkBackend(ierr);
-  ierr = CeedVectorGetArray(v, CEED_MEM_DEVICE, &dv); CeedChkBackend(ierr);
+  if (tmode == CEED_TRANSPOSE) {
+    // Sum into for transpose mode, e-vec to l-vec
+    ierr = CeedVectorGetArray(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  } else {
+    // Overwrite for notranspose mode, l-vec to e-vec
+    ierr = CeedVectorGetArrayWrite(v, CEED_MEM_DEVICE, &d_v); CeedChkBackend(ierr);
+  }
 
   bool isStrided;
   ierr = CeedElemRestrictionIsStrided(r, &isStrided); CeedChkBackend(ierr);

diff --git a/backends/opt/ceed-opt-operator.c b/backends/opt/ceed-opt-operator.c
@@ -90,10 +90,6 @@ static int CeedOperatorSetupFields_Opt(CeedQFunction qf, CeedOperator op,
       ierr = CeedElemRestrictionCreateVector(blk_restr[i+start_e], NULL,
                                              &e_vecs_full[i+start_e]);
       CeedChkBackend(ierr);
-      if (is_input) {
-        ierr = CeedVectorSetArray(e_vecs_full[i+start_e], CEED_MEM_HOST,
-                                  CEED_COPY_VALUES, NULL); CeedChkBackend(ierr);
-      }
     }
 
     switch(eval_mode) {

diff --git a/backends/ref/ceed-ref-operator.c b/backends/ref/ceed-ref-operator.c
@@ -61,10 +61,6 @@ static int CeedOperatorSetupFields_Ref(CeedQFunction qf, CeedOperator op,
       ierr = CeedElemRestrictionCreateVector(elem_restr, NULL,
                                              &e_vecs_full[i+start_e]);
       CeedChkBackend(ierr);
-      if (is_input) {
-        ierr = CeedVectorSetArray(e_vecs_full[i+start_e], CEED_MEM_HOST,
-                                  CEED_COPY_VALUES, NULL); CeedChkBackend(ierr);
-      }
     }
 
     switch(eval_mode) {

diff --git a/backends/ref/ceed-ref-restriction.c b/backends/ref/ceed-ref-restriction.c
@@ -38,7 +38,13 @@ static inline int CeedElemRestrictionApply_Ref_Core(CeedElemRestriction r,
   v_offset = start*blk_size*elem_size*num_comp;
 
   ierr = CeedVectorGetArrayRead(u, CEED_MEM_HOST, &uu); CeedChkBackend(ierr);
-  ierr = CeedVectorGetArray(v, CEED_MEM_HOST, &vv); CeedChkBackend(ierr);
+  if (t_mode == CEED_TRANSPOSE) {
+    // Sum into for transpose mode, e-vec to l-vec
+    ierr = CeedVectorGetArray(v, CEED_MEM_HOST, &vv); CeedChkBackend(ierr);
+  } else {
+    // Overwrite for notranspose mode, l-vec to e-vec
+    ierr = CeedVectorGetArrayWrite(v, CEED_MEM_HOST, &vv); CeedChkBackend(ierr);
+  }
   // Restriction from L-vector to E-vector
   // Perform: v = r * u
   if (t_mode == CEED_NOTRANSPOSE) {