Commits

Karl Rupp committed ab6435e

ViennaCL: Updated code for new interface to PetscObjectComposeFunction() and XXXRegister()

Comments (0)

Files changed (3)

src/mat/impls/aij/mpi/mpiviennacl/mpiaijviennacl.cxx

 
   PetscFunctionBegin;
   ierr = MatCreate_MPIAIJ(A);CHKERRQ(ierr);
-  ierr = PetscObjectComposeFunction((PetscObject)A,"MatMPIAIJSetPreallocation_C","MatMPIAIJSetPreallocation_MPIAIJViennaCL",MatMPIAIJSetPreallocation_MPIAIJViennaCL);CHKERRQ(ierr);
+  ierr = PetscObjectComposeFunction((PetscObject)A,"MatMPIAIJSetPreallocation_C",MatMPIAIJSetPreallocation_MPIAIJViennaCL);CHKERRQ(ierr);
   A->ops->getvecs        = MatGetVecs_MPIAIJViennaCL;
 
   ierr = PetscObjectChangeTypeName((PetscObject)A,MATMPIAIJVIENNACL);CHKERRQ(ierr);

src/mat/interface/matregis.c

 
   #if defined PETSC_HAVE_VIENNACL
   ierr = MatRegisterBaseName(MATAIJVIENNACL,MATSEQAIJVIENNACL,MATMPIAIJVIENNACL);CHKERRQ(ierr);
-  ierr = MatRegisterDynamic(MATSEQAIJVIENNACL,     path,"MatCreate_SeqAIJViennaCL",  MatCreate_SeqAIJViennaCL);CHKERRQ(ierr);
-  ierr = MatRegisterDynamic(MATMPIAIJVIENNACL,     path,"MatCreate_MPIAIJViennaCL",  MatCreate_MPIAIJViennaCL);CHKERRQ(ierr);
+  ierr = MatRegister(MATSEQAIJVIENNACL, MatCreate_SeqAIJViennaCL);CHKERRQ(ierr);
+  ierr = MatRegister(MATMPIAIJVIENNACL, MatCreate_MPIAIJViennaCL);CHKERRQ(ierr);
 #endif
 
 

src/vec/vec/interface/vecregall.c

   ierr = VecRegister(VECCUSP,       VecCreate_CUSP);CHKERRQ(ierr);
 #endif
 #if defined PETSC_HAVE_VIENNACL
-  ierr = VecRegisterDynamic(VECSEQVIENNACL,  path, "VecCreate_SeqViennaCL",  VecCreate_SeqViennaCL);CHKERRQ(ierr);
-  ierr = VecRegisterDynamic(VECMPIVIENNACL,  path, "VecCreate_MPIViennaCL",  VecCreate_MPIViennaCL);CHKERRQ(ierr);
-  ierr = VecRegisterDynamic(VECVIENNACL,     path, "VecCreate_ViennaCL",     VecCreate_ViennaCL);CHKERRQ(ierr);
+  ierr = VecRegister(VECSEQVIENNACL,  VecCreate_SeqViennaCL);CHKERRQ(ierr);
+  ierr = VecRegister(VECMPIVIENNACL,  VecCreate_MPIViennaCL);CHKERRQ(ierr);
+  ierr = VecRegister(VECVIENNACL,     VecCreate_ViennaCL);CHKERRQ(ierr);
 #endif
 #if 0
 #if defined(PETSC_HAVE_SIEVE)