October 2014 - petsc-dev - mailman3.cels.anl.gov

Re: [petsc-dev] Fwd: [mpich-announce] Announcing the availability of mpich-3.1.3
by Satish Balay 08 Oct '14

08 Oct '14

The issue is - petsc configure is now generating mpich configure command with options "--enable-shared --disable-shared" - this appears to have indeterminate state. I pushed my changes (and merged to next) https://bitbucket.org/petsc/petsc/commits/607f0d5c7ef848709a3b95a6699cbf56d… Satish On Wed, 8 Oct 2014, Barry Smith wrote: > > Report to the mpich mailing list which I joined but then immediately added to my email kill list > > > On Oct 8, 2014, at 5:10 PM, Satish Balay <balay(a)mcs.anl.gov> wrote: > > > I'm seeing some commonblock warnings. I see similar stuff in some > > nightlybuilds [in the past few days]. > > > > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2014/10/06/filtered-ma… > > > > > >>>>> . > > balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) > > $ make ex2f PETSC_ARCH=arch-test > > /home/balay/petsc/arch-test/bin/mpif90 -c -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -I/home/balay/petsc/include -I/home/balay/petsc/arch-test/include -o ex2f.o ex2f.F > > /home/balay/petsc/arch-test/bin/mpif90 -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -o ex2f ex2f.o -Wl,-rpath,/home/balay/petsc/arch-test/lib -L/home/balay/petsc/arch-test/lib -lpetsc -llapack -lblas -lX11 -lpthread -Wl,-rpath,/home/balay/petsc/arch-test/lib -lhwloc -lm -Wl,-rpath,/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -lmpifort -lgfortran -lm -lgfortran -lm -lquadmath -lm -lmpicxx -lstdc++ -Wl,-rpath,/home/balay/petsc/arch-test/lib -L/home/balay/petsc/arch-test/lib -Wl,-rpath,/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -ldl -lmpi -lpthread -lrt -lgcc_s -ldl > > /usr/bin/ld: Warning: alignment 32 of symbol `mpifcmb9_' in /home/balay/petsc/arch-test/lib/libmpi.a(lib_libmpi_la-setbot.o) is smaller than 64 in ex2f.o > > /usr/bin/ld: Warning: alignment 32 of symbol `mpifcmb5_' in /home/balay/petsc/arch-test/lib/libmpi.a(lib_libmpi_la-setbot.o) is smaller than 64 in ex2f.o > > /usr/bin/rm -f ex2f.o > > <<<<<< > > > > > > Looking at the build - I see some funny stuff "--enable-shared --disable-shared" > > > >>>>>>>>>>>> > > balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) > > $ /home/balay/petsc/arch-test/bin/mpichversion > > MPICH Version: 3.1.3 > > MPICH Release date: Wed Oct 8 09:37:19 CDT 2014 > > MPICH Device: ch3:sock > > MPICH configure: --prefix=/home/balay/petsc/arch-test MAKE=/usr/bin/gmake --libdir=/home/balay/petsc/arch-test/lib CC=gcc CFLAGS= -fPIC -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g3 -O0 AR=/usr/bin/ar ARFLAGS=cr CXX=g++ CXXFLAGS= -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g -O0 -fPIC F77=gfortran FFLAGS= -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 FC=gfortran FCFLAGS= -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 --enable-shared --disable-shared --with-device=ch3:sock --without-mpe --with-pm=hydra --enable-g=meminit --enable-fast > > MPICH CC: gcc -fPIC -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g3 -O0 -DNDEBUG -DNVALGRIND -O2 > > MPICH CXX: g++ -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g -O0 -fPIC -DNDEBUG -DNVALGRIND -O2 > > MPICH F77: gfortran -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -O2 > > MPICH FC: gfortran -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -O2 > > balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) > > <<<<<<<<< > > > > This must be related to using gnupackage - and then adding extra > > options. Removing '--disable-shared' appears to get rid of the warnings. > > > > > > So easy thing to do [to fix this issue] is strip out shared library > > options from MPICH.py. [and prefer the ones from package.py]. > > > > However do we still want to support the following? > > > > help.addArgument('MPI', '-download-mpich-shared=<bool>', nargs.ArgBool(None, 1, 'Install MPICH with shared libraries')) > > > > Satish > > > > On Wed, 8 Oct 2014, Barry Smith wrote: > > > >> > >> Satish, > >> > >> Can you please upgrade to this. You can also remove the def MPICHInstall(self): and just call the parent GNUPackageInstall. > >> > >> Thanks > >> > >> Barry > >> > >

1 0

Re: [petsc-dev] Fwd: [mpich-announce] Announcing the availability of mpich-3.1.3
by Barry Smith 08 Oct '14

08 Oct '14

Report to the mpich mailing list which I joined but then immediately added to my email kill list On Oct 8, 2014, at 5:10 PM, Satish Balay <balay(a)mcs.anl.gov> wrote: > I'm seeing some commonblock warnings. I see similar stuff in some > nightlybuilds [in the past few days]. > > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2014/10/06/filtered-ma… > > >>>>> . > balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) > $ make ex2f PETSC_ARCH=arch-test > /home/balay/petsc/arch-test/bin/mpif90 -c -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -I/home/balay/petsc/include -I/home/balay/petsc/arch-test/include -o ex2f.o ex2f.F > /home/balay/petsc/arch-test/bin/mpif90 -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -o ex2f ex2f.o -Wl,-rpath,/home/balay/petsc/arch-test/lib -L/home/balay/petsc/arch-test/lib -lpetsc -llapack -lblas -lX11 -lpthread -Wl,-rpath,/home/balay/petsc/arch-test/lib -lhwloc -lm -Wl,-rpath,/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -lmpifort -lgfortran -lm -lgfortran -lm -lquadmath -lm -lmpicxx -lstdc++ -Wl,-rpath,/home/balay/petsc/arch-test/lib -L/home/balay/petsc/arch-test/lib -Wl,-rpath,/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -ldl -lmpi -lpthread -lrt -lgcc_s -ldl > /usr/bin/ld: Warning: alignment 32 of symbol `mpifcmb9_' in /home/balay/petsc/arch-test/lib/libmpi.a(lib_libmpi_la-setbot.o) is smaller than 64 in ex2f.o > /usr/bin/ld: Warning: alignment 32 of symbol `mpifcmb5_' in /home/balay/petsc/arch-test/lib/libmpi.a(lib_libmpi_la-setbot.o) is smaller than 64 in ex2f.o > /usr/bin/rm -f ex2f.o > <<<<<< > > > Looking at the build - I see some funny stuff "--enable-shared --disable-shared" > >>>>>>>>>>>> > balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) > $ /home/balay/petsc/arch-test/bin/mpichversion > MPICH Version: 3.1.3 > MPICH Release date: Wed Oct 8 09:37:19 CDT 2014 > MPICH Device: ch3:sock > MPICH configure: --prefix=/home/balay/petsc/arch-test MAKE=/usr/bin/gmake --libdir=/home/balay/petsc/arch-test/lib CC=gcc CFLAGS= -fPIC -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g3 -O0 AR=/usr/bin/ar ARFLAGS=cr CXX=g++ CXXFLAGS= -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g -O0 -fPIC F77=gfortran FFLAGS= -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 FC=gfortran FCFLAGS= -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 --enable-shared --disable-shared --with-device=ch3:sock --without-mpe --with-pm=hydra --enable-g=meminit --enable-fast > MPICH CC: gcc -fPIC -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g3 -O0 -DNDEBUG -DNVALGRIND -O2 > MPICH CXX: g++ -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g -O0 -fPIC -DNDEBUG -DNVALGRIND -O2 > MPICH F77: gfortran -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -O2 > MPICH FC: gfortran -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -O2 > balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) > <<<<<<<<< > > This must be related to using gnupackage - and then adding extra > options. Removing '--disable-shared' appears to get rid of the warnings. > > > So easy thing to do [to fix this issue] is strip out shared library > options from MPICH.py. [and prefer the ones from package.py]. > > However do we still want to support the following? > > help.addArgument('MPI', '-download-mpich-shared=<bool>', nargs.ArgBool(None, 1, 'Install MPICH with shared libraries')) > > Satish > > On Wed, 8 Oct 2014, Barry Smith wrote: > >> >> Satish, >> >> Can you please upgrade to this. You can also remove the def MPICHInstall(self): and just call the parent GNUPackageInstall. >> >> Thanks >> >> Barry >>

1 0

Re: [petsc-dev] Fwd: [mpich-announce] Announcing the availability of mpich-3.1.3
by Satish Balay 08 Oct '14

08 Oct '14

I'm seeing some commonblock warnings. I see similar stuff in some nightlybuilds [in the past few days]. http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2014/10/06/filtered-ma… >>>>. balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) $ make ex2f PETSC_ARCH=arch-test /home/balay/petsc/arch-test/bin/mpif90 -c -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -I/home/balay/petsc/include -I/home/balay/petsc/arch-test/include -o ex2f.o ex2f.F /home/balay/petsc/arch-test/bin/mpif90 -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -o ex2f ex2f.o -Wl,-rpath,/home/balay/petsc/arch-test/lib -L/home/balay/petsc/arch-test/lib -lpetsc -llapack -lblas -lX11 -lpthread -Wl,-rpath,/home/balay/petsc/arch-test/lib -lhwloc -lm -Wl,-rpath,/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -lmpifort -lgfortran -lm -lgfortran -lm -lquadmath -lm -lmpicxx -lstdc++ -Wl,-rpath,/home/balay/petsc/arch-test/lib -L/home/balay/petsc/arch-test/lib -Wl,-rpath,/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.9.1 -ldl -lmpi -lpthread -lrt -lgcc_s -ldl /usr/bin/ld: Warning: alignment 32 of symbol `mpifcmb9_' in /home/balay/petsc/arch-test/lib/libmpi.a(lib_libmpi_la-setbot.o) is smaller than 64 in ex2f.o /usr/bin/ld: Warning: alignment 32 of symbol `mpifcmb5_' in /home/balay/petsc/arch-test/lib/libmpi.a(lib_libmpi_la-setbot.o) is smaller than 64 in ex2f.o /usr/bin/rm -f ex2f.o <<<<<< Looking at the build - I see some funny stuff "--enable-shared --disable-shared" >>>>>>>>>>> balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) $ /home/balay/petsc/arch-test/bin/mpichversion MPICH Version: 3.1.3 MPICH Release date: Wed Oct 8 09:37:19 CDT 2014 MPICH Device: ch3:sock MPICH configure: --prefix=/home/balay/petsc/arch-test MAKE=/usr/bin/gmake --libdir=/home/balay/petsc/arch-test/lib CC=gcc CFLAGS= -fPIC -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g3 -O0 AR=/usr/bin/ar ARFLAGS=cr CXX=g++ CXXFLAGS= -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g -O0 -fPIC F77=gfortran FFLAGS= -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 FC=gfortran FCFLAGS= -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 --enable-shared --disable-shared --with-device=ch3:sock --without-mpe --with-pm=hydra --enable-g=meminit --enable-fast MPICH CC: gcc -fPIC -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g3 -O0 -DNDEBUG -DNVALGRIND -O2 MPICH CXX: g++ -Wall -Wwrite-strings -Wno-strict-aliasing -Wno-unknown-pragmas -g -O0 -fPIC -DNDEBUG -DNVALGRIND -O2 MPICH F77: gfortran -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -O2 MPICH FC: gfortran -fPIC -Wall -Wno-unused-variable -ffree-line-length-0 -Wno-unused-dummy-argument -g -O0 -O2 balay@asterix /home/balay/petsc/src/ksp/ksp/examples/tutorials (master *=) <<<<<<<<< This must be related to using gnupackage - and then adding extra options. Removing '--disable-shared' appears to get rid of the warnings. So easy thing to do [to fix this issue] is strip out shared library options from MPICH.py. [and prefer the ones from package.py]. However do we still want to support the following? help.addArgument('MPI', '-download-mpich-shared=<bool>', nargs.ArgBool(None, 1, 'Install MPICH with shared libraries')) Satish On Wed, 8 Oct 2014, Barry Smith wrote: > > Satish, > > Can you please upgrade to this. You can also remove the def MPICHInstall(self): and just call the parent GNUPackageInstall. > > Thanks > > Barry >

1 0

Fwd: [mpich-announce] Announcing the availability of mpich-3.1.3
by Barry Smith 08 Oct '14

08 Oct '14

Satish, Can you please upgrade to this. You can also remove the def MPICHInstall(self): and just call the parent GNUPackageInstall. Thanks Barry Begin forwarded message: > From: "Seo, Sangmin" <sseo(a)anl.gov> > Subject: [mpich-announce] Announcing the availability of mpich-3.1.3 > Date: October 8, 2014 at 11:14:46 AM CDT > To: "announce(a)mpich.org" <announce(a)mpich.org>, "<discuss(a)mpich.org>" <discuss(a)mpich.org> > Reply-To: "<discuss(a)mpich.org>" <discuss(a)mpich.org>, <announce(a)mpich.org> > > The MPICH team is pleased to announce the availability of a new stable release, mpich-3.1.3. > > This is a stable release that adds several enhancements to Portals4 support, PAMI, RMA, and ROMIO. It also contains a large number of bug fixes. > > All production environments are encouraged to upgrade to this release. > > More information about the release can be found on the MPICH website: > > http://www.mpich.org > > A list of changes in this release is included at the end of this email. > > Regards, > > The MPICH Team > > =============================================================================== > Changes in 3.1.3 > =============================================================================== > > # Several enhancements to Portals4 support. > > # Several enhancements to PAMI (thanks to IBM for the code contribution). > > # Several enhancements to the CH3 RMA implementation. > > # Several enhancements to ROMIO. > > # Fixed deadlock in multi-threaded MPI_Comm_idup. > > # Several other minor bug fixes, memory leak fixes, and code cleanup. > > A full list of changes is available at the following link: > > http://git.mpich.org/mpich.git/shortlog/v3.1.2..v3.1.3 > > A full list of bugs that have been fixed is available at the > following link: > > https://trac.mpich.org/projects/mpich/query?status=closed&group=resolution&… > > > _______________________________________________ > announce mailing list announce(a)mpich.org > To manage subscription options or unsubscribe: > https://lists.mpich.org/mailman/listinfo/announce

1 0

Re: [petsc-dev] petsc.mcs, cg.mcs Reboot
by John Roberts 08 Oct '14

08 Oct '14

All, I’ll be rebooting petsc and cg in about 10 minutes. thanks. -- John Roberts Argonne National Laboratory CELS Systems jeroberts(a)anl.gov On Oct 7, 2014, at 10:32 AM, Satish Balay <balay(a)mcs.anl.gov> wrote: > Sure.. > > cc:ing users of these machines. Perhaps you can send a note [say 10 min] before rebooting the machines. > > thanks, > Satish > > On Tue, 7 Oct 2014, John Roberts wrote: > >> Satish, >> >> Let’s plan for a reboot tomorrow at 10am if possible on both cg and petsc? >>

1 0

Re: [petsc-dev] petsc.mcs, cg.mcs Reboot
by Satish Balay 07 Oct '14

07 Oct '14

Sure.. cc:ing users of these machines. Perhaps you can send a note [say 10 min] before rebooting the machines. thanks, Satish On Tue, 7 Oct 2014, John Roberts wrote: > Satish, > > LetοΏ½s plan for a reboot tomorrow at 10am if possible on both cg and petsc? > >

1 0

Re: [petsc-dev] [petsc-users] petsc git next branch *is* unwound!
by Jed Brown 02 Oct '14

02 Oct '14

Satish Balay <balay(a)mcs.anl.gov> writes: > You would have to delete both 'next' and 'wdn_mods_next' branches from > all your clones - and recreate them. Do your normal "git remote update" (or git fetch) in your "master" clone (confusing to use the same name to refer to a repository and a branch). I'll call the repository Mirror. Anyway, you should see that all three branches are updated. 'maint' and 'master' should fast-forward, while 'next' will say "forced update". After that, recreate 'next' on the clones just like in Satish's original email.

1 0

Re: [petsc-dev] [petsc-users] petsc git next branch *is* unwound!
by Satish Balay 02 Oct '14

02 Oct '14

You would have to delete both 'next' and 'wdn_mods_next' branches from all your clones - and recreate them. Wrt recreating 'next' [as indicated in my previous e-mail] the following should be sufficient: git fetch origin # add the extra option 'origin' because you have multiple remotes git checkout next Wrt recreating wdn_mods_next - presumably you have 'wdn_mods' in some local branch - that you keep arround that you merge to next to get wdn_mods_next.. git checkout next git checkout -b wdn_mods_next git merge wdn_mods If not - perhaps you can cherry/pick/rebase as needed. Or you can create it by merging 'wdn_mods_master' into 'next' [assuming the 'wdn_mods' part is same for all the 3 branches] git checkout next git checkout -b wdn_mods_next git merge wdn_mods_master Satish On Thu, 2 Oct 2014, Nystrom, William David wrote: > On my local machine I have my master, bare git repo with the following config file > which Jed suggested a year or so ago: > > % cat config > [core] > repositoryformatversion = 0 > filemode = true > bare = true > sharedrepository = 1 > [receive] > denyNonFastforwards = true > [remote "origin"] > url = https://bitbucket.org/petsc/petsc > fetch = +refs/heads/maint:refs/heads/maint > fetch = +refs/heads/master:refs/heads/master > fetch = +refs/heads/next:refs/heads/next > [remote "artab"] > url = ssh://ml-fey.lanl.gov/usr/projects/artab/users/wdn/repos/git/petsc > fetch = +refs/*:refs/* > mirror = true > > And for my workflow, I stay in sync with the official PETSc git repo by periodically > executing the following command: > > git remote -v update origin > > And then I have various git clones from my master git repo where I do actual > work. > > Do I need to do anything special now that the "next" branch has been unwound > with either my master git repo or my git clones? In my master git repo, I have > 3 additional branches - wdn_mods_next, wdn_mods_master and wdn_mods_maint > where I keep any of my own modifications to those respective branches. And I > keep wdn_mods_next in sync with next by periodically executing the following > commands in a git clone with the wdn_mods_next branch checked out: > > git pull origin next > > resolve any conflicts and commit > > git push origin wdn_mods_next:wdn_mods_next > > So, if I do the following set of steps, should I expect them to work now that next > has been unwound? > > 1. cd to my master bare petsc repo > git remote -v update origin > > 2. cd to my git clone of petsc with wdn_mods_next branch checked out > git pull origin next > resolve any conflicts and commit > git push origin wdn_mods_next:wdn_mods_next > > Thanks, > > Dave > > -- > Dave Nystrom > LANL HPC-5 > Phone: 505-667-7913 > Email: wdn(a)lanl.gov > Smail: Mail Stop B272 > Group HPC-5 > Los Alamos National Laboratory > Los Alamos, NM 87545 > > > ________________________________________ > From: petsc-dev-bounces(a)mcs.anl.gov [petsc-dev-bounces(a)mcs.anl.gov] on behalf of Satish Balay [balay(a)mcs.anl.gov] > Sent: Thursday, October 02, 2014 7:38 AM > To: petsc-dev(a)mcs.anl.gov; petsc-users(a)mcs.anl.gov > Subject: Re: [petsc-dev] [petsc-users] petsc git next branch *is* unwound! > > On Thu, 2 Oct 2014, Satish Balay wrote: > > > petsc git users, > > > > If you are using next branch from git repository for integration or > > testing or working with it in some form - i.e if you have 'next' > > listed by: > > > > git branch > > > > Please delete and recreate it. i.e: > > > > git checkout master > > git branch -D next > > git checkout next > > > > From my check - the following feature branches are currently in next > > (not yet merged to master). > > > > Feature branch owners, please remerge your feature branches into to > > next - as you see fit. > > BTW: Some of you might want to rebase/cleanup some of the feature branches > before merging to new next. > > Also some of these feature branches are from pre-petsc-3.5 timeframe. > So a rebase to latest master might be something to consider. [if they > are still in line for a merge to master] > > Satish > > > > > $ comm -12 <(git branch -r --merged next | sort) <(git branch -r --no-merged master | sort) > > origin/barry/cleanup-blaslapack > > origin/barry/remove-dreal > > origin/barry/remove-sidl > > origin/barry/reuse-hwloc > > origin/dmeiser/pullrequest-fix-cusp-bjacobi2 > > origin/dmeiser/pullrequest-remove-thrust-py > > origin/jed/sr-driver4 > > origin/jed/vecghostgetvalues > > origin/karlrupp/fix-viennacl-veccopy > > origin/karpeev/fix-ksp-pcgasm > > origin/knepley/feature-optcontrol-mg > > origin/knepley/feature-plex-generator-args > > origin/knepley/feature-plex-nasm > > origin/knepley/fix-configure-petsc-dep > > origin/knepley/fix-quadrature-order > > origin/madams/sr-driver4 > > origin/maint > > origin/mlange05/fix-gmsh-coordinates > > origin/next > > origin/paulmullowney/aijcusp-ellpack-fix > > origin/prbrune/sf-examplefix > > origin/prbrune/snes-ex19vtkoutput > > origin/sarich/fix-tao-jbearing-bqpip > > origin/shri/ts-dae-semi-explicit > > origin/shri/ts-is-for-differential-variables > > origin/shri/ts-powergrid > > origin/stefano_zampini/matis-preallocation > > origin/stefano_zampini/pcbddc-changeofbasis > > origin/stefano_zampini/pcbddc_deluxe > > origin/tisaac/feature-fe-geom-dim > > origin/tisaac/plex-flexible-projection > > > > [obviously remove maint, next from the above list] > > > > The previous 'next' branch is currently available as 'next-oct-2014' - > > if you need it for any checks/debugging. > > > > Satish > > > > > > > > > >

1 0

Re: [petsc-dev] [petsc-users] petsc git next branch *is* unwound!
by Jed Brown 02 Oct '14

02 Oct '14

"Nystrom, William David" <wdn(a)lanl.gov> writes: > What is meant by the phrase "petsc git next branch is unwound"? What git > commands are run to do this? And how is the next branch different when > it is unwound from immediately before it is unwound? git checkout next git reset --hard master # discarding anything in 'next' git push origin +next # force push So the history of branch testing in 'next' was discarded, but 'master' is not changed.

1 0

Re: [petsc-dev] [petsc-users] petsc git next branch *is* unwound!
by Nystrom, William David 02 Oct '14

02 Oct '14

What is meant by the phrase "petsc git next branch is unwound"? What git commands are run to do this? And how is the next branch different when it is unwound from immediately before it is unwound? Thanks, Dave -- Dave Nystrom LANL HPC-5 Phone: 505-667-7913 Email: wdn(a)lanl.gov Smail: Mail Stop B272 Group HPC-5 Los Alamos National Laboratory Los Alamos, NM 87545 ________________________________________ From: Nystrom, William David Sent: Thursday, October 02, 2014 10:57 AM To: petsc-users; petsc-dev(a)mcs.anl.gov Cc: Nystrom, William David Subject: RE: [petsc-dev] [petsc-users] petsc git next branch *is* unwound! On my local machine I have my master, bare git repo with the following config file which Jed suggested a year or so ago: % cat config [core] repositoryformatversion = 0 filemode = true bare = true sharedrepository = 1 [receive] denyNonFastforwards = true [remote "origin"] url = https://bitbucket.org/petsc/petsc fetch = +refs/heads/maint:refs/heads/maint fetch = +refs/heads/master:refs/heads/master fetch = +refs/heads/next:refs/heads/next [remote "artab"] url = ssh://ml-fey.lanl.gov/usr/projects/artab/users/wdn/repos/git/petsc fetch = +refs/*:refs/* mirror = true And for my workflow, I stay in sync with the official PETSc git repo by periodically executing the following command: git remote -v update origin And then I have various git clones from my master git repo where I do actual work. Do I need to do anything special now that the "next" branch has been unwound with either my master git repo or my git clones? In my master git repo, I have 3 additional branches - wdn_mods_next, wdn_mods_master and wdn_mods_maint where I keep any of my own modifications to those respective branches. And I keep wdn_mods_next in sync with next by periodically executing the following commands in a git clone with the wdn_mods_next branch checked out: git pull origin next resolve any conflicts and commit git push origin wdn_mods_next:wdn_mods_next So, if I do the following set of steps, should I expect them to work now that next has been unwound? 1. cd to my master bare petsc repo git remote -v update origin 2. cd to my git clone of petsc with wdn_mods_next branch checked out git pull origin next resolve any conflicts and commit git push origin wdn_mods_next:wdn_mods_next Thanks, Dave -- Dave Nystrom LANL HPC-5 Phone: 505-667-7913 Email: wdn(a)lanl.gov Smail: Mail Stop B272 Group HPC-5 Los Alamos National Laboratory Los Alamos, NM 87545 ________________________________________ From: petsc-dev-bounces(a)mcs.anl.gov [petsc-dev-bounces(a)mcs.anl.gov] on behalf of Satish Balay [balay(a)mcs.anl.gov] Sent: Thursday, October 02, 2014 7:38 AM To: petsc-dev(a)mcs.anl.gov; petsc-users(a)mcs.anl.gov Subject: Re: [petsc-dev] [petsc-users] petsc git next branch *is* unwound! On Thu, 2 Oct 2014, Satish Balay wrote: > petsc git users, > > If you are using next branch from git repository for integration or > testing or working with it in some form - i.e if you have 'next' > listed by: > > git branch > > Please delete and recreate it. i.e: > > git checkout master > git branch -D next > git checkout next > > From my check - the following feature branches are currently in next > (not yet merged to master). > > Feature branch owners, please remerge your feature branches into to > next - as you see fit. BTW: Some of you might want to rebase/cleanup some of the feature branches before merging to new next. Also some of these feature branches are from pre-petsc-3.5 timeframe. So a rebase to latest master might be something to consider. [if they are still in line for a merge to master] Satish > > $ comm -12 <(git branch -r --merged next | sort) <(git branch -r --no-merged master | sort) > origin/barry/cleanup-blaslapack > origin/barry/remove-dreal > origin/barry/remove-sidl > origin/barry/reuse-hwloc > origin/dmeiser/pullrequest-fix-cusp-bjacobi2 > origin/dmeiser/pullrequest-remove-thrust-py > origin/jed/sr-driver4 > origin/jed/vecghostgetvalues > origin/karlrupp/fix-viennacl-veccopy > origin/karpeev/fix-ksp-pcgasm > origin/knepley/feature-optcontrol-mg > origin/knepley/feature-plex-generator-args > origin/knepley/feature-plex-nasm > origin/knepley/fix-configure-petsc-dep > origin/knepley/fix-quadrature-order > origin/madams/sr-driver4 > origin/maint > origin/mlange05/fix-gmsh-coordinates > origin/next > origin/paulmullowney/aijcusp-ellpack-fix > origin/prbrune/sf-examplefix > origin/prbrune/snes-ex19vtkoutput > origin/sarich/fix-tao-jbearing-bqpip > origin/shri/ts-dae-semi-explicit > origin/shri/ts-is-for-differential-variables > origin/shri/ts-powergrid > origin/stefano_zampini/matis-preallocation > origin/stefano_zampini/pcbddc-changeofbasis > origin/stefano_zampini/pcbddc_deluxe > origin/tisaac/feature-fe-geom-dim > origin/tisaac/plex-flexible-projection > > [obviously remove maint, next from the above list] > > The previous 'next' branch is currently available as 'next-oct-2014' - > if you need it for any checks/debugging. > > Satish > > > >

1 0