Hi Mark,
most of the CUDA-related fixes from your PR are now in master. Thank you!
The pinning of GPU-matrices to CPUs is not in master because it had
several issues:
https://bitbucket.org/petsc/petsc/pull-requests/1954/cuda-fixes-to-pinning-onto-cpu/diff
The ViennaCL-related changes in mark/gamg-fix-viennacl-rebased can be
safely discarded as the new GPU wrapper will come in place over the next
days. ex56 has not been pulled over as it's not running properly on GPUs
yet (the pinning in your branch effectively turned GPU matrices into
normal PETSc matrices, effectively running (almost) everything on the
CPU again)
So at this point I recommend to start a new branch off master and
manually transfer over any bits from the pinning that you want to keep.
Best regards,
Karli
On 8/3/19 8:47 PM, Mark Adams wrote:
Karl,
Did you want me to do anything at this point? (on vacation this week) I
will verify that master is all fixed if you get all my stuff integrated
when I get back to work in a week.
Thanks,
Mark
On Sat, Aug 3, 2019 at 10:50 AM Karl Rupp <r...@iue.tuwien.ac.at
<mailto:r...@iue.tuwien.ac.at>> wrote:
If you ignore the initial ViennaCL-related commits and check against
current master (that just received cherry-picked updates from your PR),
then there are really only a few commits left that are not yet
integrated.
(I'll extract two more PRs on Monday, so master will soon have your
fixes in.)
Best regards,
Karli
On 8/3/19 5:21 AM, Balay, Satish wrote:
> I've attempted to rebase this branch over latest master - and pushed
> my changes to branch mark/gamg-fix-viennacl-rebased-v2
>
> You might want to check each of your commits in this branch to see if
> they are ok. I had to add one extra commit - to make it match 'merge
> of mark/gamg-fix-viennacl-rebased and master'.
>
> This branch has 21 commits. I think its best if you can collapse them
> into reasonable chunks of changes. [presumably a single commit
for all
> the changes is not the correct thing here. But the current set of 21
> commits are all over the place]
>
> If you are able to migrate to this branch - its best to delete
the old
> one [i.e origin/mark/gamg-fix-viennacl-rebased]
>
> Satish
>
> On Fri, 2 Aug 2019, Mark Adams via petsc-dev wrote:
>
>> I have been cherry-picking, etc, branch
mark/gamg-fix-viennacl-rebased and
>> it is very messed up. Can someone please update this branch when
all the
>> fixes are settled down? eg, I am seeing dozens of modified files
that I
>> don't know anything about and I certainly don't want to put in a
PR for
>> them.
>>
>> I also seem to lose my pinToCPU method for cuda matrices. I don't
>> understand how that conflicted with anyone else but it did.
>>
>> Thanks,
>> Mark
>>
>
