[petsc-dev] Is master broken?

Karl Rupp rupp at iue.tuwien.ac.at
Sat Aug 3 09:50:35 CDT 2019


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
>>
> 


More information about the petsc-dev mailing list