Commits

Matt Knepley committed b27c093 Merge with conflicts

Merge branch 'knepley/fix-cublas-init' into knepley/feature-dt-fem

* knepley/fix-cublas-init:
Sys: Allow CUBLAS init to be turned off - This causes SEGV on my Air all the time
DMPlex: Removed dead declaration (thanks Lisandro)
added citation for superlu99

Conflicts:
src/sys/objects/pinit.c

  • Participants
  • Parent commits d7ef3ee, 20e2c33

Comments (0)

Files changed (3)

File include/petscdmplex.h

 PETSC_EXTERN PetscErrorCode DMPlexCreateCohesiveSubmesh(DM, PetscBool, const char [], PetscInt, DM *);
 PETSC_EXTERN PetscErrorCode DMPlexCreateFromCellList(MPI_Comm, PetscInt, PetscInt, PetscInt, PetscInt, PetscBool, const int[], PetscInt, const double[], DM*);
 PETSC_EXTERN PetscErrorCode DMPlexCreateFromDAG(DM, PetscInt, const PetscInt [], const PetscInt [], const PetscInt [], const PetscInt [], const PetscScalar []);
-PETSC_EXTERN PetscErrorCode DMPlexClone(DM, DM*);
 PETSC_EXTERN PetscErrorCode DMPlexGetDimension(DM, PetscInt *);
 PETSC_EXTERN PetscErrorCode DMPlexSetDimension(DM, PetscInt);
 PETSC_EXTERN PetscErrorCode DMPlexGetChart(DM, PetscInt *, PetscInt *);

File src/docs/tex/petsc.bib

 %   DO NOT DEFINE ANY ABREVIATIONS TO USE IN ENTRIES BELOW: Always write out the names of journels etc
 
 @inproceedings{hartono2009annotation,
-  title={Annotation-based empirical performance tuning using Orio},
+  title={Annotation-based empirical performance tuning using {Orio}},
   author={Hartono, Albert and Norris, Boyana and Sadayappan, Ponnuswamy},
   booktitle={Parallel \& Distributed Processing, 2009. IPDPS 2009. IEEE International Symposium on},
   pages={1--11},
    howpublished  = "\url{http://acts.nersc.gov}",
    key = "{Advanced CompuTational Software (ACTS) Web page}",
 }
-
+@article{superlu99,
+  author  = {James W. Demmel and Stanley C. Eisenstat and John R. Gilbert and Xiaoye S. Li and Joseph W. H. Liu},
+  title = {A supernodal approach to sparse partial pivoting},
+  journal = {SIAM J. Matrix Analysis and Applications},
+  year = {1999},
+  volume  = {20},
+  number = {3},
+  pages = {720-755}
+}
 @misc{superlu:homepage,
    author = "J. Demmel and J. Gilbert and X. Li",
    title = "{SuperLU Web page}",

File src/sys/objects/pinit.c

 #if defined(PETSC_HAVE_CUDA)
   flg  = PETSC_TRUE;
   ierr = PetscOptionsGetBool(NULL,"-cublas",&flg,NULL);CHKERRQ(ierr);
-  if (!flg) {
+  if (flg) {
     PetscMPIInt p;
     for (p = 0; p < PetscGlobalSize; ++p) {
       if (p == PetscGlobalRank) cublasInit();
 #if defined(PETSC_HAVE_CUDA)
   flg  = PETSC_TRUE;
   ierr = PetscOptionsGetBool(NULL,"-cublas",&flg,NULL);CHKERRQ(ierr);
-  if (!flg) {
+  if (flg) {
     PetscInt p;
     for (p = 0; p < PetscGlobalSize; ++p) {
       if (p == PetscGlobalRank) cublasShutdown();