[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Mark Adams]

There are a lot of diffs like this. What make you think it is mine?  The
cheby changes should not create such a large diff.

On Tue, May 24, 2016 at 3:23 PM, Satish Balay <balay at mcs.anl.gov> wrote:

> Another issue:
>
>
> http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2016/05/24/examples_next_arch-cuda-double_es.log
>
> /scratch/petsc/petsc.clone/src/ksp/ksp/examples/tests
> Possible problem with ex26_1, diffs above
>
>
> balay at asterix /home/balay/petsc (next=)
> $ git diff master..next -- src/ksp/ksp/examples/tests/output/ex26_1.out
> |cat
> diff --git a/src/ksp/ksp/examples/tests/output/ex26_1.out
> b/src/ksp/ksp/examples/tests/output/ex26_1.out
> index c46eca6..659624f 100644
> --- a/src/ksp/ksp/examples/tests/output/ex26_1.out
> +++ b/src/ksp/ksp/examples/tests/output/ex26_1.out
> @@ -1,10 +1,6 @@
>  Fine grid size 9 by 9
> -  0 KSP Residual norm 10.0656
> -  1 KSP Residual norm 4.35349
> -  2 KSP Residual norm 0.638099
> -  3 KSP Residual norm 0.0815887
> -  4 KSP Residual norm 0.00953547
> -  5 KSP Residual norm 0.00117851
> -  6 KSP Residual norm 0.000265924
> -  7 KSP Residual norm 2.74224e-05
> -Number of iterations = 7
> +  0 KSP Residual norm 23.5347
> +  1 KSP Residual norm 0.230059
> +  2 KSP Residual norm 0.000468129
> +  3 KSP Residual norm 1.16147e-06
> +Number of iterations = 3
> balay at asterix /home/balay/petsc (next=)
> $ git log --oneline src/ksp/ksp/examples/tests/output/ex26_1.out  |head -1
> 7fd3bd7 updated test for new cheby
> balay at asterix /home/balay/petsc (next=)
> $ git branch -r --contains 7fd3bd7
>   origin/next
> balay at asterix /home/balay/petsc (next=)
> $
>
> So you made this change directly to next? Looks like next is way
> corrupted - and I should just rewind it to latest master..
>
> Satish
>
> On Tue, 24 May 2016, Satish Balay wrote:
>
> > On Tue, 24 May 2016, Mark Adams wrote:
> >
> > > Do I now wait for my pull request to be approved?
> >
> > Mark,
> >
> > Currently there is a bit of mess in regards to your branches.
> >
> > $ git branch -r |grep mark |grep ex56
> >   origin/mark/ksp-ex56
> >   origin/mark/ksp-newex56
> >   origin/mark/snes-ex56b
> >   origin/mark/snes-ex56c
> >
> > You have a bunch of branches with the name 'ex56' - presumably you
> > worked initially on mark/snes-ex56b and switched to 'mark/snes-ex56c'.
> >
> > And I see the the following 2 merges to next
> >
> > >>>>>>>
> > commit e223b1660d8274c4632642ec520eee8c34d18eb5
> > Merge: de2cc15 c13d8fd
> > Author: Barry Smith <bsmith at mcs.anl.gov>
> > Date:   Mon May 23 15:27:49 2016 -0500
> >
> >     Merge branch 'mark/snes-ex56b' into next
> >
> > commit ebff70bc705bbe7fea86844e10d9a274abdf3658
> > Merge: c8d3fd4 dfc6d4a
> > Author: Satish Balay <balay at mcs.anl.gov>
> > Date:   Thu May 19 23:59:01 2016 -0500
> >
> >     Merge branch 'mark/snes-ex56c' into next
> > <<<<<<<
> >
> > On my part - I noticed you had a buggy commit in next - which I wanted
> > to fix - so fixed in 'mark/snes-ex56c' and merged to next.
> >
> > $ git branch -r --contains eb041292
> >   origin/mark/snes-ex56c
> >   origin/next
> >
> > But how did this commit come to next? I don't see a prior 'Merge
> > branch 'mark/snes-ex56c' message in next history. Ok I think
> > c8d3fd49b4313a86346f23ef7d5371efba2d3dc9 was the next HEAD - when I
> > did the merge.
> >
> > $ git log --oneline --merges --ancestry-path
> eb041292..c8d3fd49b4313a86346f23ef7d5371efba2d3dc9
> > c8d3fd4 Merge branch 'next' of bitbucket.org:petsc/petsc into next
> > 01528be Merge branch 'master' into next
> > 8bd3767 Merge branch
> 'pr476/psanan/psanan/pc-telescope-subcomm-type/master' into next
> > 83661ee Merge branch
> 'pr476/psanan/psanan/pc-telescope-subcomm-type/master' into next
> > 2a9b9f0 Merge branch 'master' into next
> > d5742a2 fixed error check in main of ex56
> > a003960 Merge branch 'master' of bitbucket.org:petsc/petsc into
> mark/snes-ex56c
> >
> > So 'd5742a2 fixed error check in main of ex56' is a merge commit?
> >
> > You did code change and merge in the same commit - and removed the
> > default git commit message - "Merge 'mark/snes-ex56c' into next"?
> >
> > This is way confusing..
> >
> > Now to figure out how to fix this. I see origin/mark/snes-ex56b is
> > merged to next - but origin/mark/snes-ex56c is not completely merged.
> >
> > Is origin/mark/snes-ex56b abandoned? If so - I should revert Barry's
> > inadvertent merge of origin/mark/snes-ex56b into next - and merge
> > origin/mark/snes-ex56c
> >
> > Thanks,
> > Satish
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20160524/f5576eca/attachment.html>