[petsc-dev] Is master broken?

Mark Adams mfadams at lbl.gov
Mon Aug 12 05:26:21 CDT 2019


Satish,

Your new branch mark/gamg-fix-viennacl-rebased-v2 does not seem to have
Barry's fixes (the source of this thread):

 ...
          , line 243: error: function call is not allowed in a constant
          expression
  #if PETSC_PKG_CUDA_VERSION_GE(10,1,0)

Here is the reflog of the cherry picking that I did to fix my last version.
I forget exactly what I did to get these changes so I'd like to not mess it
up. Can you add these to your new branch?

Thanks,
Mark

06:10 2 mark/gamg-fix-viennacl-rebased-v2= ~/petsc$ git reflog
3baf678 HEAD@{0}: checkout: moving from mark/gamg-fix-viennacl-rebased to
mark/gamg-fix-viennacl-rebased-v2
e50f779 HEAD@{1}: cherry-pick: 1) When detecting version info handle blanks
introducted by preprocessor, error if needed version cannot be det
87beba0 HEAD@{2}: cherry-pick: Use outputPreprocess instead of preprocess
since it prints source to log
9163512 HEAD@{3}: cherry-pick: Fix manual pages for
MatXXXYBAIJSetPreallocationCSR() routines
b4500af HEAD@{4}: cherry-pick: fix compile warnings on
arch-linux-pkgs-64idx triggered by c73702f59ac80eb68c197b7eea6d8474b9e9853c
9f418a9 HEAD@{5}: cherry-pick: Fix compile warnings --with-cuda
b541e45 HEAD@{6}: commit (cherry-pick): added a file that seemed to get
deleted
5d2c71f HEAD@{7}: checkout: moving from
barry/2019-09-01/robustify-version-check to mark/gamg-fix-viennacl-rebased
7c2e96e HEAD@{8}: cherry-pick: Fix compile warnings --with-cuda
d70ea55 HEAD@{9}: cherry-pick: MATSEQDENSECUDA: Fix warnings
c85f03d HEAD@{10}: pull origin: Fast-forward
e24ebd8 HEAD@{11}: checkout: moving from master to
barry/2019-09-01/robustify-version-check

>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20190812/68f74c2c/attachment.html>


More information about the petsc-dev mailing list