<div dir="ltr"><div>Satish, I tried again from scratch see the same thing.</div><div>I pushed this.</div><div>Thanks</div><div><br></div>09:35 mark/feature-xgc-interface-rebase= ~/Codes/petsc$ git rebase origin/master<br>First, rewinding head to replay your work on top of it...<br>Applying: starting rebase branch<br>Using index info to reconstruct a base tree...<br>M include/petsc/private/dmpleximpl.h<br>M include/petscdmplex.h<br>M src/dm/impls/plex/makefile<br>.git/rebase-apply/patch:2620: trailing whitespace.<br> for (d=0;d<src->dim;d++) *pp++ = src->df[d][s][idx]; <br>warning: 1 line adds whitespace errors.<br>Falling back to patching base and 3-way merge...<br>Auto-merging src/dm/impls/plex/makefile<br>Auto-merging include/petscdmplex.h<br>CONFLICT (content): Merge conflict in include/petscdmplex.h<br>Auto-merging include/petsc/private/dmpleximpl.h<br>error: Failed to merge in the changes.<br>Patch failed at 0001 starting rebase branch<br>hint: Use 'git am --show-current-patch' to see the failed patch<br>Resolve all conflicts manually, mark them as resolved with<br>"git add/rm <conflicted_files>", then run "git rebase --continue".<br>You can instead skip this commit: run "git rebase --skip".<br>To abort and get back to the state before "git rebase", run "git rebase --abort".<br>09:36 1 mark/feature-xgc-interface-rebase *+|REBASE 1/19 ~/Codes/petsc$ vi include/petscdmplex.h<br>09:37 mark/feature-xgc-interface-rebase *+|REBASE 1/19 ~/Codes/petsc$ git add include/petscdmplex.h<br>09:37 mark/feature-xgc-interface-rebase +|REBASE 1/19 ~/Codes/petsc$ git rebase --continue<br>Applying: starting rebase branch<br>Applying: manual merge<br>Applying: RE test<br>Applying: remove Ehat<br>Applying: clean up interface, redo regression tests, found false negatives<br>Applying: change Ec<br>Applying: tweek griding<br>Applying: clean up, working on impurity injection<br>Applying: fixed quench and pulse test<br>Applying: hardwired CUDA kernel for DIM, added presolve in ex11<br>Applying: added guard<br>Applying: starting to get E field added<br>Applying: doc<br>Applying: fix test params<br>Applying: remove comment<br>Applying: updated test syntax<br>Applying: cleaned up flags<br>Applying: cleaned up flags<br>Applying: fixed soruce bug<br><div><br></div><div><br></div><div>09:37 mark/feature-xgc-interface-rebase<> ~/Codes/petsc$ rm -fr arch-macosx-gnu-g/<br>09:38 mark/feature-xgc-interface-rebase<> ~/Codes/petsc$ ../arch-macosx-gnu-g.py <br>===============================================================================<br> Configuring PETSc to compile on your system <br>===============================================================================<br>=============================================================================== ***** WARNING: You have an older version of Gnu make, it will work, but may not support all the parallel testing options. You can install the latest Gnu make with your package manager, such as brew or macports, or use the --download-make option to get the latest Gnu make ***** =============================================================================== =============================================================================== Trying to download git://<a href="https://bitbucket.org/petsc/pkg-sowing.git">https://bitbucket.org/petsc/pkg-sowing.git</a> for SOWING =============================================================================== =============================================================================== Running configure on SOWING; this may take several minutes =============================================================================== =============================================================================== Running make on SOWING; this may take several minutes =============================================================================== =============================================================================== Running make install on SOWING; this may take several minutes =============================================================================== TESTING: checkSharedLibrary from config.packages.sowing(config/BuildSystem/config/package.py:926) *******************************************************************************<br> CONFIGURATION CRASH (Please send configure.log to <a href="mailto:petsc-maint@mcs.anl.gov">petsc-maint@mcs.anl.gov</a>)<br>*******************************************************************************<br><br>09:40 1 mark/feature-xgc-interface-rebase<> ~/Codes/petsc$ <br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Apr 3, 2020 at 8:17 AM Mark Adams <<a href="mailto:mfadams@lbl.gov">mfadams@lbl.gov</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Apr 2, 2020 at 11:05 PM Satish Balay <<a href="mailto:balay@mcs.anl.gov" target="_blank">balay@mcs.anl.gov</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">My OS build also went through. Looks like you haven't pushed [force update] this branch - so I'm testing with something totally different.<br>
<br></blockquote><div><br></div><div>Yes, I have a <> after a rebase. Do you want me to push it? Or should I just start over? I thought I started with a clean version of my code from the repo. </div><div>Thanks,</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
So likely something in your rebased sources is causing bfort to fail..<br>
<br>
Satish<br>
<br>
On Thu, 2 Apr 2020, Mark Adams wrote:<br>
<br>
> I see:<br>
> 22:46 128 mark/feature-xgc-interface-rebase<> ~/Codes/petsc$ git status<br>
> On branch mark/feature-xgc-interface-rebase<br>
> Your branch and 'origin/mark/feature-xgc-interface-rebase' have diverged,<br>
> and have 130 and 18 different commits each, respectively.<br>
> (use "git pull" to merge the remote branch into yours)<br>
> <br>
> Untracked files:<br>
> (use "git add <file>..." to include in what will be committed)<br>
> out2.txt<br>
> src/dm/impls/plex/examples/tutorials/Landau/<br>
> <br>
> <br>
> On Thu, Apr 2, 2020 at 10:45 PM Mark Adams <<a href="mailto:mfadams@lbl.gov" target="_blank">mfadams@lbl.gov</a>> wrote:<br>
> <br>
> ><br>
> ><br>
> > On Thu, Apr 2, 2020 at 10:33 PM Satish Balay <<a href="mailto:balay@mcs.anl.gov" target="_blank">balay@mcs.anl.gov</a>> wrote:<br>
> ><br>
> >> Is this branch mark/feature-xgc-interface-rebase pushed?<br>
> ><br>
> ><br>
> > yes.<br>
> ><br>
> ><br>
> >> I had done a build with the current state of it - and the build went<br>
> >> through fine. This was on linux.<br>
> >><br>
> >> Will try OSX now.<br>
> >><br>
> >> Satish<br>
> >><br>
> >> On Thu, 2 Apr 2020, Mark Adams wrote:<br>
> >><br>
> >> > Note, when I rebased I got one conflict, in a header where I added<br>
> >> stuff at<br>
> >> > the end and master did also so I just kept them both and continued.<br>
> >> > Other than that it was a clean rebase.<br>
> >> ><br>
> >> > On Thu, Apr 2, 2020 at 10:15 PM Mark Adams <<a href="mailto:mfadams@lbl.gov" target="_blank">mfadams@lbl.gov</a>> wrote:<br>
> >> ><br>
> >> > ><br>
> >> > ><br>
> >> > > On Thu, Apr 2, 2020 at 9:32 PM Satish Balay <<a href="mailto:balay@mcs.anl.gov" target="_blank">balay@mcs.anl.gov</a>><br>
> >> wrote:<br>
> >> > ><br>
> >> > >> can you try this in a local clone [same branch] and see if that<br>
> >> works?<br>
> >> > >><br>
> >> > >> cd /Users/markadams/Codes<br>
> >> > >> git clone petsc petsc-test<br>
> >> > >> cd petsc-test<br>
> >> > >> ./configure ...<br>
> >> > >><br>
> >> > >> Satish<br>
> >> > >><br>
> >> > >><br>
> >> > >> On Thu, 2 Apr 2020, Mark Adams wrote:<br>
> >> > >><br>
> >> > >> > I tried to rebase mark/feature-xgc-interface-rebase with master<br>
> >> and I<br>
> >> > >> get<br>
> >> > >> > this.<br>
> >> > >> > I of course deleted the arch directory.<br>
> >> > >> > Thanks,<br>
> >> > >> > Mark<br>
> >> > >> ><br>
> >> > >><br>
> >> > >><br>
> >> ><br>
> >><br>
> >><br>
> <br>
<br>
</blockquote></div></div>
</blockquote></div>