Merged in kaushikggg/petsc4py (pull request #127)

VecCUDA(Get/Restore)ArrayReadWrite -> VecCUDA(Get/Restore)Array
firedrakeproject · Jul 25, 2019 · 30a1bbd · 30a1bbd
2 parents 054bb74 + a95c801
commit 30a1bbd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/PETSc/Vec.pyx b/src/PETSc/Vec.pyx
@@ -395,7 +395,7 @@ cdef class Vec(Object):
         cdef const_char *m = NULL
         if mode is not None: mode = str2bytes(mode, &m)
         if m == NULL or (m[0] == c'r' and m[1] == c'w'):
-            CHKERR( VecCUDAGetArrayReadWrite(self.vec, &hdl) )
+            CHKERR( VecCUDAGetArray(self.vec, &hdl) )
         elif m[0] == c'r':
             CHKERR( VecCUDAGetArrayRead(self.vec, <const_PetscScalar**>&hdl) )
         elif m[0] == c'w':
@@ -409,7 +409,7 @@ cdef class Vec(Object):
         cdef const_char *m = NULL
         if mode is not None: mode = str2bytes(mode, &m)
         if m == NULL or (m[0] == c'r' and m[1] == c'w'):
-            CHKERR( VecCUDARestoreArrayReadWrite(self.vec, &hdl) )
+            CHKERR( VecCUDARestoreArray(self.vec, &hdl) )
         elif m[0] == c'r':
             CHKERR( VecCUDARestoreArrayRead(self.vec, <const_PetscScalar**>&hdl) )
         elif m[0] == c'w':

diff --git a/src/PETSc/petscvec.pxi b/src/PETSc/petscvec.pxi
@@ -155,10 +155,10 @@ cdef extern from * nogil:
 
     int VecCUDAGetArrayRead(PetscVec,const_PetscScalar*[])
     int VecCUDAGetArrayWrite(PetscVec,PetscScalar*[])
-    int VecCUDAGetArrayReadWrite(PetscVec,PetscScalar*[])
+    int VecCUDAGetArray(PetscVec,PetscScalar*[])
     int VecCUDARestoreArrayRead(PetscVec,const_PetscScalar*[])
     int VecCUDARestoreArrayWrite(PetscVec,PetscScalar*[])
-    int VecCUDARestoreArrayReadWrite(PetscVec,PetscScalar*[])
+    int VecCUDARestoreArray(PetscVec,PetscScalar*[])
 
 # --------------------------------------------------------------------
 

diff --git a/src/include/custom.h b/src/include/custom.h
@@ -162,11 +162,11 @@ PetscLogEventGetPerfInfo(int stage,PetscLogEvent event,PetscEventPerfInfo *info)
 
 PETSC_EXTERN PetscErrorCode VecCUDAGetArrayRead(Vec,const PetscScalar**);
 PETSC_EXTERN PetscErrorCode VecCUDAGetArrayWrite(Vec,PetscScalar**);
-PETSC_EXTERN PetscErrorCode VecCUDAGetArrayReadWrite(Vec,PetscScalar**);
+PETSC_EXTERN PetscErrorCode VecCUDAGetArray(Vec,PetscScalar**);
 
 PETSC_EXTERN PetscErrorCode VecCUDARestoreArrayRead(Vec,const PetscScalar**);
 PETSC_EXTERN PetscErrorCode VecCUDARestoreArrayWrite(Vec,PetscScalar**);
-PETSC_EXTERN PetscErrorCode VecCUDARestoreArrayReadWrite(Vec,PetscScalar**);
+PETSC_EXTERN PetscErrorCode VecCUDARestoreArray(Vec,PetscScalar**);
 
 #else
 
@@ -182,7 +182,6 @@ VecCUDAGetArray(Vec v,PetscScalar **a)
 }
 #define VecCUDAGetArrayRead(v,a) VecCUDAGetArray(v,(PetscScalar**)(a))
 #define VecCUDAGetArrayWrite     VecCUDAGetArray
-#define VecCUDAGetArrayReadWrite VecCUDAGetArray
 
 PETSC_STATIC_INLINE PetscErrorCode
 VecCUDARestoreArray(Vec v,PetscScalar **a)
@@ -196,7 +195,6 @@ VecCUDARestoreArray(Vec v,PetscScalar **a)
 }
 #define VecCUDARestoreArrayRead(v,a) VecCUDARestoreArray(v,(PetscScalar**)(a))
 #define VecCUDARestoreArrayWrite     VecCUDARestoreArray
-#define VecCUDARestoreArrayReadWrite VecCUDARestoreArray
 
 #endif