On Mon, 2 Jul 2018, Mark Adams wrote:
> Satish and Matt,
> What is the syntax multiple libraries? I have this now but need to addd
> more files.
> Thanks,
> Mark
>
> '--with-blaslapack-lib=/opt/intel/compilers_and_libraries_2018.1.163/linux/mkl/lib/intel64/libmkl_intel_thread.a',
--with-blaslapa
Will need to fix these issues before I can add the tests. I just tried on one
box - and get the
attached errors.
Satish
On Sun, 1 Jul 2018, Lisandro Dalcin wrote:
> And what about adding pragmatic? Right now I'm getting this failure in master.
>
> make -f gmakefile test search=snes_tutorials-e
Logs?
And what version of cmake does not require C++11 compliant compiler? We could
downgrade to that..
Satish
On Thu, 5 Jul 2018, Matthew Knepley wrote:
> Now we require a fully C++11 compliant compiler, or the CMake build dies.
> This is crazy.
>
>Matt
>
>
:18 PM Satish Balay wrote:
>
> > Logs?
> >
>
> I can send it, but its really straightforward. The clang++/g++ on my box
> (which I will not upgrade because the latest MacOS is crazy)
> does not have the header, and thus is not compliant C++11.
>
>
> > An
On Thu, 5 Jul 2018, Jed Brown wrote:
> When can we delete the legacy test system? Are we currently using it
> anywhere?
[Don't know exactly which parts we would delete] - but the new targets
cover ex*[f,f90] type examples - and not anything else.
So all other examples that don't fit this string
te was done due to:
> > https://bitbucket.org/petsc/petsc/commits/e5b329dd4ac
> >
> > No point in going back to having old issues..
> >
> > Satish
> >
> > On Thu, 5 Jul 2018, Matthew Knepley wrote:
> >
> > > On Thu, Jul 5, 2018 at 5:18 PM Sat
src/ksp/ksp/examples/tutorials
make ex2
On Thu, 5 Jul 2018, Jed Brown wrote:
> Satish Balay writes:
>
> > On Thu, 5 Jul 2018, Jed Brown wrote:
> >
> >> When can we delete the legacy test system? Are we currently using it
> >> anywhere?
> >
> >
The primary error is:
>>>
make[1]: Leaving directory '/cygdrive/c/sources/petsc'
^[[1;31m**ERROR*
Error during compile, check windows-intel-debug/lib/petsc/conf/make.log
Send it and windows-intel-debug/lib/petsc/conf/configure.log
A few additional notes:
On Thu, 5 Jul 2018, Satish Balay wrote:
> >>>>>>>>>>>>>
> Using configure Options:
> --prefix=/cygdrive/c/installed/petsc_git-intel-debug/
> --PETSC_DIR=/cygdrive/c/sources/petsc --PETSC_ARCH=windows-intel-debug
I think SLEPc primarily relies on regression.py in configure.
${PETSC_DIR}/lib/petsc/conf/test has targets to support:
cd src/ksp/ksp/examples/tutorials
make ex2
and ${PETSC_DIR}/lib/petsc/conf/test.common has targets to support:
make alltests [used by nightlybuilds]
Satish
On Fri, 6 Jul 2018
On Thu, 5 Jul 2018, Matthew Knepley wrote:
> On Thu, Jul 5, 2018 at 5:45 PM Satish Balay wrote:
>
> > Can you try the following and see if it works for you
> >
> > ./configure PETSC_ARCH=arch-cmake-test --with-mpi=0 --with-sowing=0
> > --with-fc=0 --download-cmak
On Fri, 6 Jul 2018, Satish Balay wrote:
> On Thu, 5 Jul 2018, Matthew Knepley wrote:
>
> > On Thu, Jul 5, 2018 at 5:45 PM Satish Balay wrote:
> >
> > > Can you try the following and see if it works for you
> > >
> > > ./configure PETSC_ARCH
Sorry - I don't quiet understand what you are suggesting here.
On Thu, 5 Jul 2018, Jed Brown wrote:
> "Smith, Barry F." writes:
>
> >> On Jul 5, 2018, at 5:36 PM, Jed Brown wrote:
> >>
> >> When can we delete the legacy test system? Are we currently using it
> >> anywhere?
> >
> > Make te
On Sat, 7 Jul 2018, Hector E Barrios Molano wrote:
> Thanks Barry and Satish for your answers.
>
> I installed the correct version of hypre. Also, I changed the paths to short
> dos paths as Satish suggested. Now PETSc compiles without problems and the
> tests are ok.
>
> Regarding Satish notes:
Or is the issue with the name "lib/petsc/conf/test"?
I guess it could be renamed lib/petsc/conf/rules_examples [or something else]
Satish
On Sat, 7 Jul 2018, Satish Balay wrote:
> Sorry - I don't quiet understand what you are suggesting here.
>
> On Thu, 5 J
Hm - for safeguards - I guess one could use PETSC_VERSION_LT(3,9,99) as
equivalent to PETSC_VERSION_LT(3,10,0)
Satish
On Thu, 12 Jul 2018, Kong, Fande wrote:
> I want to know this info, and I can put some safeguard in the code.
>
> Thanks,
>
> Fande,
>
http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2018/07/16/filtered-make_next_arch-linux-pkgs-64idx_thrash.log
/sandbox/petsc/petsc.next-3/src/mat/impls/hypre/mhypre.c:1089:9: warning:
passing argument 3 of ‘HYPRE_IJMatrixAddToValues’ from incompatible pointer
type [enabled by def
> >
> >
> > On Mon, Jul 16, 2018 at 10:53 AM, Fande Kong wrote:
> >
> >>
> >>
> >> On Mon, Jul 16, 2018 at 10:45 AM, Satish Balay wrote:
> >>
> >>>
> >>> http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/arch
On Mon, 16 Jul 2018, Fande Kong wrote:
> In order to have make MatRestoreArray_HYPRE and MatRestoreArray_HYPRE looks
> same.
Well its more like PetscMalloc() and PetscFree() to me - so they don't have
matching requirements..]
> If did not do anything to size and array, and then we may have som
Thanks, merged to next.
Satish
On Mon, 16 Jul 2018, Fande Kong wrote:
> Thanks, Satish,
>
> I updated the changes. Please check again.
>
>
> Fande,
>
> On Mon, Jul 16, 2018 at 12:22 PM, Satish Balay wrote:
>
> > On Mon, 16 Jul 2018, Fande Kong wrote
On Tue, 24 Jul 2018, Fande Kong wrote:
> Hi Developers,
>
>
> Could we somehow let "make -j N" to take multiple threads for compiling
> PETSc. Do we use multiple threads when compiling the external packages such
> as hypre, parmetis etc.?
yes - with packages that support '-j' builds.
Satish
PETSc configure sets up a default value that always gets used.
>>>
balay@asterix /home/balay/tmp/petsc (maint=)
$ make
Using MAKEFLAGS: -j4 -l6.0 w -- PETSC_DIR=/home/balay/tmp/petsc
PETSC_ARCH=arch-linux2-c-debug
<<<
You can always override this default by adding a -j option. [since the
us
ke
- or use MAKE_NP
Satish
On Tue, 24 Jul 2018, Fande Kong wrote:
>
>
>
>
> From: Satish Balay
> Sent: Tuesday, July 24, 2018 4:06 PM
> To: Fande Kong
> Cc: Jed Brown; For users of the development version of PETSc
> Subject: Re: [petsc-dev] could we let "ma
MAKE_NP
>
> Fande
>
> Sent from my iPhone
>
> > On Jul 24, 2018, at 4:26 PM, Satish Balay wrote:
> >
> > I hate html e-mail which doesn't add reply markers - can't figure out
> > easily what you saying :(
> >
> >>> However
______
> From: petsc-dev on behalf of Satish Balay
>
> Sent: Tuesday, July 24, 2018 5:57:55 PM
> To: Fande Kong
> Cc: petsc-dev
> Subject: Re: [petsc-dev] could we let "make -j N" work for PETSc and external
> packages?
>
> Another alternat
https://bitbucket.org/petsc/petsc/commits/e6de09342ce9c4562cc062ff2c1bac4bd956bda0
It is compatible with Hypre-2.14. For Hypre-2.11 - you would have to revert the
above change.
Satish
On Thu, 2 Aug 2018, Antonio Trande wrote:
> Hi all.
>
> Petsc-3.9.3 does not compile against Hypre-2.11.2:
>
On Wed, 22 Aug 2018, Jed Brown wrote:
> Matthew Knepley writes:
>
> > Someone changes an interface, and you pull the change. The header changes
> > will cause all the C files
> > using that API to rebuild. However, the doc system (sowing) runs bfort on
> > the C file to generate the Fortran
> >
You would use:
--with-blas-lapack-lib=%{_libdir}/libopenblas.so
The options --with-openblas-include --with-openblas-lib etc are a bit
misleading [due to the way some of the blas packages ae organized]
Satish
On Fri, 31 Aug 2018, Antonio Trande wrote:
> Hello everyone.
>
> How to configure c
It should work. configure.log will have details..
Satish
--
balay@asterix /home/balay/petsc (maint=)
$ ./configure --with-blaslapack-lib=-lopenblas
===
Configuring PETSc to compile on your system
I pushed the change to balay/remove-Regression.py
Satish
On Mon, 3 Sep 2018, Jose E. Roman wrote:
> We are almost done with migrating SLEPc tests to the new test harness. If you
> want, you can remove Regression.py from PETSc, as well as any makefile rules
> that might remain for legacy tests.
ttributeError: PETSc instance has no attribute 'test_runs'
<<<<
This issue comes up with xsdk@develop - but I can work arround it.
Satish
On Wed, 5 Sep 2018, Jose E. Roman wrote:
> It works for us. Thanks.
> Jose
>
>
> > El 5 sept 2018, a las 15:15, S
Great. Thanks!
Satish
On Fri, 7 Sep 2018, Jose E. Roman wrote:
> It is in master now, so the error should be fixed.
> Jose
>
>
> > El 7 sept 2018, a las 3:02, Satish Balay escribió:
> >
> > I see the relvent slepc changes are in alex/test-harness
>
Also - please check and update src/docs/website/documentation/changes/dev.html
as needed.
Thanks,
Satish
On Wed, 5 Sep 2018, Karl Rupp wrote:
> Dear PETSc developers,
>
> please open any outstanding pull requests for the upcoming PETSc 3.10 release
> in the next few hours. After that, please d
Reminder!
please check
http://www.mcs.anl.gov/petsc/documentation/changes/dev.html and update
src/docs/website/documentation/changes/dev.html with relavent changes.
Thanks,
Satish
On Mon, 10 Sep 2018, Satish Balay wrote:
> Also - please check and update
> src/docs/website/documen
Just a heads-up regarding final changes for 3.10 release.
These changes are in in branch balay/release-3.10-revert-to-dev
It has 2 commits:
- The first commit in this branch will be the final commit to 3.10 release.
- The second commit will restore master back to dev from release.
I'll be rebas
otential (code, doc) fixes can be queued for 3.10.1
> >
> > Satish
> >
> > On Tue, 11 Sep 2018, Satish Balay wrote:
> >
> > > Reminder!
> > >
> > > please check
> > > http://www.mcs.anl.gov/petsc/documentation/changes/dev.html and update
potential (code, doc) fixes can be queued for 3.10.1
>
> Satish
>
> On Tue, 11 Sep 2018, Satish Balay wrote:
>
> > Reminder!
> >
> > please check
> > http://www.mcs.anl.gov/petsc/documentation/changes/dev.html and update
> > src/docs/website/doc
All (next users),
ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2018-April/022747.html
I've recreated 'next' branch - and have a backup for current 'next' at
'next-sep-2018'.
So if you have/use 'next' branch in your clone - please do the following (in
all your git clones):
git checkout m
On Wed, 12 Sep 2018, Balay, Satish wrote:
> For more housekeeping - look at the remaining local and remote
> branches and figure-out what to do. [perhaps some of them are
> intermediate branches during rebase - or abandoned features that
> should be deleted].
For reference - current list of remot
Thanks! Fixed now.
Satish
On Wed, 12 Sep 2018, Hapla Vaclav wrote:
> Satish, at http://www.mcs.anl.gov/petsc/download/index.html, link "Summary of
> PETSc-3.10 changes" still points to 39.html
>
> Vaclav
>
> > 12. 9. 2018 v 17:01, Satish Balay :
> >
&g
yes. such fixes can go into maint.
Thanks!
Satish
On Wed, 12 Sep 2018, Hapla Vaclav wrote:
> I have also noticed that the headline TAO is 2 times in 310.html - should I
> fix it in maint?
>
> Vaclav
>
> > 12. 9. 2018 v 17:36, Satish Balay :
> >
> > T
On Tue, 19 Apr 2016, Lisandro Dalcin wrote:
> Satish and Barry, two quick questions:
>
> * Shouldn't RDict.log be stored in
> $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf and symlinked to $PETSC_DIR,
> just like configure.log and make.log?
Yes - and I don't think we need the link for it.
>
> * Do we
Pushed
https://bitbucket.org/petsc/petsc/commits/016c41562d0c66f2a2a067d47ae42d9f8caaa289
Satish
On Thu, 21 Apr 2016, Barry Smith wrote:
>
>Hmm, when someone explicitly sets --with-shared-libraries=1 I think they
> would be rather upset if configure ends up using ar and static libraries
Ok - the master tests ran overnight
I've switched the day builds to maint. [nightbuilds are reverted to next]
Also created maint-3.6 branch off maint - and updated maint with master.
Satish
On Fri, 22 Apr 2016, Barry Smith wrote:
>
>So the current plan is that Satish will make tonights te
On Sat, 23 Apr 2016, Jed Brown wrote:
> Satish Balay writes:
>
> > Ok - the master tests ran overnight
> >
> > I've switched the day builds to maint. [nightbuilds are reverted to next]
> >
> > Also created maint-3.6 branch off maint - and updated mai
Dear PETSc 'maint' branch users,
In anticipation of the next 3.7 release of petsc - I've updated
'maint' branch in petsc git repository to 3.7 pre-release changes.
If you 'git pull' on maint branch - you would get these 3.7
pre-release changes.
To stay on 3.6 - you can switch to 'maint-3.6' bran
On Sun, 24 Apr 2016, Jed Brown wrote:
> Satish Balay writes:
>
> > Master currently doesn't work as you describe.
>
> Why doesn't it work that way? That was the philosophy when we adopted
> this branching model years ago, it works reliably for many other
>
On Sun, 24 Apr 2016, Satish Balay wrote:
> > As for pending merges, what is the status of these branches (in 'next',
> > but not yet in 'master')?
> >
> > barry/fix-some-clang-warnings
> > knepley/feature-fe-nonaffine
> > knepley/fi
On Sun, 24 Apr 2016, Lisandro Dalcin wrote:
> Satish, I have two open PRs ready to be merged into master (already
> merged into next). As you are in charge of making the release, I did
> not want to step on you, so I'll not make the merge into master until
> you acknowledge. Or just merge them you
On Sun, 24 Apr 2016, Lisandro Dalcin wrote:
> On 24 April 2016 at 18:38, Satish Balay wrote:
> > On Sun, 24 Apr 2016, Lisandro Dalcin wrote:
> >
> >> Satish, I have two open PRs ready to be merged into master (already
> >> merged into next). As you are in ch
On Sun, 24 Apr 2016, Jed Brown wrote:
> Satish Balay writes:
>
> > On Sun, 24 Apr 2016, Jed Brown wrote:
> >
> >> Satish Balay writes:
> >>
> >> > Master currently doesn't work as you describe.
> >>
> >> Why doesn
On Mon, 25 Apr 2016, Lisandro Dalcin wrote:
> Please merge this branch with changelog updates:
>
> https://bitbucket.org/petsc/petsc/branch/dalcinl/ts-changes
Cherry picked to maint.
Thanks,
Satish
>
> I branched it of from master. "git diff maint..master" was showing
> some flops logging com
I've reset the the day/night test builds as follows:
week-day (mon-fri) builds: master
weekend-day (sat-sun) builds: maint
night (mon-sun) builds: next
Currently each set of builds are done in 4 stages. For ex: night
builds start at 12:05AM, 1:45AM, 3:45AM, 5:45AM - and the results are
collected
ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017804.html
I've recreated 'next' branch - and have a backup for current 'next' at
'next-apr-2016'.
So *all git repo users* (if you have/use 'next' branch in your clone)
- please do the following (in all your git clones):
git checkout
ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017808.html
I've deleted all deveopment branches that are already merged into
maint (v3.7) from https://bitbucket.org/petsc/petsc
However if you wish to remove these branches from your clone - it has
to be done manually (in each clone).
On Mon, 25 Apr 2016, Lisandro Dalcin wrote:
> "git diff maint..master" was showing
> some flops logging commits from Jed that are not yet in maint, and
> that IMHO should go to release.
merged to maint
thanks,
Satish
> merged.
> If you are sure you want to delete it, run 'git branch -D
> shri/add-tsevent-to-powergrid-examples'.
>
>
> > On Apr 25, 2016, at 12:01 PM, Satish Balay wrote:
> >
> > ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017808.html
>
On Mon, 25 Apr 2016, Jed Brown wrote:
> Matthew Knepley writes:
>
> > I just get
> >
> > maint $:/PETSc3/petsc/petsc-dev$ git branch --merged v3.7
> > git branch --merged v3.7
> > knepley/feature-configuration-callbacks
> >
> > which is the one branch I have leftover here. Is that what I am su
7;git [...] -- [...]'
> ~/Src/petsc (next=)
> $ git log v3.7..barry/download-mstk
> ~/Src/petsc (next=)
>
>
>
> > On Apr 25, 2016, at 1:12 PM, Satish Balay wrote:
> >
> > What do you have for
> >
> > git fetch
> > git log v3.7..bar
On Mon, 25 Apr 2016, Satish Balay wrote:
> For more housekeeping - look at the remaining local and remote
> branches and figure-out what to do. [perhaps some of them are
> intermediate branches during rebase - or abandoned features that
> should be deleted]. For my branches - I wo
I can do a bisection with a known working snapshot
77c6581de992f535ad6374ab817ab0b36cb4c745
Satish
On Tue, 17 May 2016, Matthew Knepley wrote:
> I will figure it out.
>
> Matt
>
> On Tue, May 17, 2016 at 9:25 PM, Barry Smith wrote:
>
> >
> >
> > ftp://ftp.mcs.anl.gov/pub/petsc/nightlylog
7324519880fc66cf0f8c1fe5928b68cb45a0ab2a M src
Satish
On Tue, 17 May 2016, Satish Balay wrote:
> I can do a bisection with a known working snapshot
> 77c6581de992f535ad6374ab817ab0b36cb4c745
>
> Satish
>
>
> On Tue, 17 May 2016, Matthew Knepley wrote:
>
> > I will
yes - please fix - and I can test..
Satish
On Tue, 17 May 2016, Matthew Knepley wrote:
> On Tue, May 17, 2016 at 9:53 PM, Satish Balay wrote:
>
> > ok - bisect says:
> >
>
> Okay, the fix is to use DMGetNumFields(). Shou
On Tue, 17 May 2016, Matthew Knepley wrote:
> On Tue, May 17, 2016 at 10:01 PM, Satish Balay wrote:
>
> > yes - please fix - and I can test..
>
>
> Pushed to master.
This example now works..
balay@asterix /home/balay/petsc/src/snes/examples/tutorials (master=)
$ m
Mark,
petsc 'next' doesn't build for complex due to error in cheby.c
$ git branch -r --contains d5742a2a619a688a61daaaef5bdde3042d32f41a
origin/next
$ git branch -r --contains eb041292
origin/mark/snes-ex56c
origin/next
Perhaps you have merged mark/snes-ex56c to next pushed next - but not
On Thu, 19 May 2016, Satish Balay wrote:
> I was going to push the following fix to mark/snes-ex56c.
>
> diff --git a/src/ksp/ksp/impls/cheby/cheby.c b/src/ksp/ksp/impls/cheby/cheby.c
> index f2a26bf..722d32d 100644
> --- a/src/ksp/ksp/impls/cheby/cheby.c
> +++ b/src/ksp/ksp/i
Mark,
$ git log --merges origin/mark/snes-ex56c --oneline |grep mark/snes-ex56c
27d400f Merge branch 'master' of bitbucket.org:petsc/petsc into mark/snes-ex56c
f3dabe8 Merge branch 'master' of bitbucket.org:petsc/petsc into mark/snes-ex56c
1df2bc2 Merge branch 'master' of bitbucket.org:petsc/petsc
On Fri, 20 May 2016, Mark Adams wrote:
> On Fri, May 20, 2016 at 1:17 PM, Satish Balay wrote:
>
> > Mark,
> >
> > $ git log --merges origin/mark/snes-ex56c --oneline |grep mark/snes-ex56c
> > 27d400f Merge branch 'master' of bitbucket.org:petsc/petsc in
Well 'git merge master' on this branch doesn't help with this concern.
The process is
- don't merge to next until feature complete
[in this stage - you can rebase against master as many times as necessary]
- on feature completion - merge to next
- and monitor 'next' tests dashboard - until all r
c15 c13d8fd
Author: Barry Smith
Date: Mon May 23 15:27:49 2016 -0500
Merge branch 'mark/snes-ex56b' into next
commit ebff70bc705bbe7fea86844e10d9a274abdf3658
Merge: c8d3fd4 dfc6d4a
Author: Satish Balay
Date: Thu May 19 23:59:01 2016 -0500
Merge branch 'mark/snes-ex56c
On Tue, 24 May 2016, Barry Smith wrote:
>
> After you put something in next you need go to
> ftp://ftp.mcs.anl.gov/pub/petsc/nightlylogs/index.html follow the next link
> and click on the all button in the upper right hand side to make sure the
> examples/tests work on all machines.
I'll su
, 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/
; - 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
>
On Tue, 24 May 2016, Mark Adams wrote:
> 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.
Your pull request
https://bitbucket.org/petsc/petsc/pull-requests/479/mark-snes-ex56c/diff#chg-src/ksp/ksp/examples/tests/output/
Looks like our test scripts require all test machines to be up :(
Since one of the boxes is down [ipro] - some of the build scripts
hanged [because ssh to it hanged] - i.e some tests did not run. But
the copy scripts ran and grabbed the old [i.e next] results - and
published on the 'master' dashb
On Tue, 24 May 2016, Jed Brown wrote:
> Satish Balay writes:
> >> I checked Barry's commits and saw the mark/snes-ex56b and picked it in
> >> mark/snes-ex56c.
> >
> > Ok - this suggests I should revert 'mark/snes-ex56b' merge from next.
> >
ref http://lists.mcs.anl.gov/pipermail/petsc-dev/2016-April/019013.html
We are having to unwind 'next' branch as we fear that some commits in
this branch are harder to track.
I've recreated 'next' branch - and have a backup for current 'next' at
'next-may-2016'.
So *all git repo users* (if you h
On Tue, 24 May 2016, Satish Balay wrote:
> On Tue, 24 May 2016, Jed Brown wrote:
> > I would be in favor of either rewinding 'next' or reverting all of
> > Mark's stuff (if you can identify well enough), then rebasing his branch
> > so it's not such a me
On Wed, 25 May 2016, Mark Adams wrote:
> Is rebase -i going to work? I read:
>
> git rebase -i master
>
> Note that rebasing to the master does not work if you merged the master
> into your feature branch while you were working on the new feature. If you
> did this you will need to find the ori
On Wed, 25 May 2016, Mark Adams wrote:
> I did 'git rebase -i master', in jed's branch and need to fix about 1/2
> dozen failures to apply patch. I fixed them, but this does not seem like
> what I should be doing. I also had many commits that were not mine, I
> guess because I pulled from master
On Wed, 25 May 2016, Mark Adams wrote:
>
> 10:09 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git reset
> --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1
> HEAD is now at f2cb842 fixed bug in makefile
>
> OK, now what?
1. Verify that its feature complete as you expect [and not mi
On Wed, 25 May 2016, Mark Adams wrote:
> >
> >
> >> 10:09 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git
> > reset --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1
> > HEAD is now at f2cb842 fixed bug in makefile
> >
> > OK, now what?
> >
> >
>
> I guess there is not much choice.
On Wed, 25 May 2016, Mark Adams wrote:
> On Wed, May 25, 2016 at 10:18 AM, Satish Balay wrote:
>
> > On Wed, 25 May 2016, Mark Adams wrote:
> >
> > >
> > > 10:09 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git
> > reset
> > &
ix manually. I wanted to check before I proceed. They were
> straightforward fixes.
>
> Mark
>
>
> On Wed, May 25, 2016 at 10:40 AM, Mark Adams wrote:
>
> >
> >
> > On Wed, May 25, 2016 at 10:18 AM, Satish Balay wrote:
> >
>
On Wed, 25 May 2016, Mark Adams wrote:
> >
> >
> >
> > I have no idea how Mac users use git effectively without a working
> > 'gitk' [to verify commit diffs] or 'git gui' [to selectively commit
> > some changes] or 'kdiff3' which I use via 'git mergetool' [for 3-way
> > merges]..
> >
>
> Yes, I h
ex56c on server]
- After I do my changes - you can start using mark/snes-ex56c
Satish
On Wed, 25 May 2016, Mark Adams wrote:
> On Wed, May 25, 2016 at 11:14 AM, Satish Balay wrote:
>
> > This is hopeless..
> >
> > Did you reset your 'mark/snes-ex56c' again to the o
On Wed, 25 May 2016, Mark Adams wrote:
> >
> >
> > If thats the case - when you have a merge conflict during 'merge' or
> > 'rebase' - then you should be able to do 'git mergetool' and easily
> > resolve the conflict using kdiff3
> >
> >
> OK, well this looks promising (kdiff3 seems to work, I thi
On Wed, 25 May 2016, Mark Adams wrote:
> On Wed, May 25, 2016 at 11:31 AM, Satish Balay wrote:
>
> > Mark,
> >
> > To simplify - lets start over..
> >
> > - you delete your copy of mark/snes-ex56c, jed/mark/snes-ex56c
> >
> > i.e:
> > gi
sorry - copy/paste error.
git rebase -i f303cd651cc9f18b5b8505d3b571425f3b3e5c1a
[f303cd651cc9f18b5b8505d3b571425f3b3e5c1a is commit in master - from where
mark/snes-ex56c branched off]
I use 'master..mark/snes-ex56c' to determine this.
Satish
On Wed, 25 May 2016, Mark Adams wrote:
> >
> >
>
On Wed, 25 May 2016, Satish Balay wrote:
> sorry - copy/paste error.
>
> git rebase -i f303cd651cc9f18b5b8505d3b571425f3b3e5c1a
>
> [f303cd651cc9f18b5b8505d3b571425f3b3e5c1a is commit in master - from where
> mark/snes-ex56c branched off]
>
> I use 'master..mark/
is starting commit. [as git
rebase -i expects the prior commit to the first commit you want to
interactively rebase/ modify]
>>>>>>>..
$ git show -q af1c4d2ad570dd93a87158e0a6b031ad52f71ccd^
commit f303cd651cc9f18b5b8505d3b571425f3b3e5c1a
Merge: ca41317 391bf75
Author: Satish Balay
On Wed, 25 May 2016, Mark Adams wrote:
> On Wed, May 25, 2016 at 12:14 PM, Satish Balay wrote:
>
> > Yeah - Sorry - bad copy/paste gave the wrong commit-id.
> >
> > Here this the process you would normally follow [without gitk]
> >
> gitk works but it opens Wi
On Wed, 25 May 2016, Mark Adams wrote:
> I'm doing an all test right now, what should I do after that?
You have a PR on this branch. It gets automatically updated with all
the changes on it.
You can add in a comment saying - "its again ready for review".
Someone [usually Barry or Jed or Matt] w
On Wed, 25 May 2016, Satish Balay wrote:
> On Wed, 25 May 2016, Mark Adams wrote:
>
> > I'm doing an all test right now, what should I do after that?
>
> You have a PR on this branch. It gets automatically updated with all
> the changes on it.
>
> You can add
On Wed, 25 May 2016, Satish Balay wrote:
> On Wed, 25 May 2016, Satish Balay wrote:
>
> > On Wed, 25 May 2016, Mark Adams wrote:
> >
> > > I'm doing an all test right now, what should I do after that?
> >
> > You have a PR on this branch. It gets au
s --download-parmetis --download-ml --download-hypre
&& make all && make alltests
Now 'alltests' on both the builds are clean.
Perhaps you might want to squash it over your previous commit.
>>>>>>>>>>>
balay@asterix /home/balay/petsc (mark/sn
On Fri, 27 May 2016, Mark Adams wrote:
> >
> > Satish, please don't use this syntax for force pushes. Prefer
> >
> > git push origin +mark/snes-ex65c
> >
>
> 08:13 mark/snes-ex56c<> ~/Codes/petsc$ git push origin +mark/snes-ex65c
> error: src refspec mark/snes-ex65c does not match any.
> error:
On Fri, 27 May 2016, Satish Balay wrote:
> On Fri, 27 May 2016, Mark Adams wrote:
>
> > >
> > > Satish, please don't use this syntax for force pushes. Prefer
> > >
> > > git push origin +mark/snes-ex65c
> > >
> >
> > 08:
Matt,
Per integration workflow - all feature branches should be tested
locally (and be complete) - before merged to next [next is for
integration testing - not feature testing]
You could have used (modified):
config/examples/arch-linux-xsdk-dbg.py
config/examples/arch-osx-xsdk-opt.py
Yeah - we
On Mon, 6 Jun 2016, Matthew Knepley wrote:
> On Mon, Jun 6, 2016 at 5:27 PM, Satish Balay wrote:
>
> > Matt,
> >
> > Per integration workflow - all feature branches should be tested
> > locally (and be complete) - before merged to next [next is for
> > integ
1 - 100 of 2841 matches
Mail list logo
