[Insight-developers] ITKData and branches

Gaëtan Lehmann gaetan.lehmann at jouy.inra.fr
Sat Oct 16 15:53:34 EDT 2010 

Le 16 oct. 10 à 20:40, Marcus D. Hanwell a écrit :

> On Sat, Oct 16, 2010 at 1:57 PM, Bill Lorensen <bill.lorensen at gmail.com 
> > wrote:
> Data includes baselines for testing. We should make it as easy as
> possible to add new baselines, thus promoting more testing. Our old
> method was good.
>
> Perhaps, the baselines should be part of ITK proper. Currently
> baselines represent 16 meg out of the 73 meg in data.
>
> I honestly think that the solution in place is ideal, and would love  
> to have ParaView and VTK use this approach. Keeping the binary data  
> in a separate git submodule that is pinned by the submodule pointer  
> gives you the best of both worlds. Is there some part of the process  
> that is particularly unwieldy? You need to add, commit and push in  
> the submodule, and then the extra step is simply moving the pointer  
> forward in the ITK repository.
>

I can see some disadvantages:

* Compared to what we had before with cvs, this is a lot more commands  
to run.
Previously we had

   cvs add Testing/Code/...
   cvs add Testing/Data/...
   cvs ci

and now

   cd Testing/Data
   git add ...
   git commit
   git push
   cd -
   git add Testing/Data
   git add Testing/Code/...
   git commit
   git push

* A submodule for the baseline means that
   - we have to push the baseline in ITKData but the related patch may  
not survive the reviewing process and so we'll have useless baseline  
stored in ITKData.
   - or we don't publish the baseline when publishing a test in gerrit

* Not everyone have write access to ITKData and this repository is not  
cloned on github or gitorious, so preparing and publishing some tests  
for a non itk developer is less easy.

It's easy to see the immediate problems, but I fail to see the long  
term advantage of this solution, excepted the repository size.
I quite sure it has been done that way for a good reason :-)

> The submodule commands are under active development, and are  
> improving with each release at the moment.
>

Great. I think the aliases recently submitted are making things a lot  
easier.
I hope we'll see the same kind of improvement for ITKData!

Gaëtan


> Marcus
>
> On Sat, Oct 16, 2010 at 1:51 PM, Luis Ibanez  
> <luis.ibanez at kitware.com> wrote:
> > An alternative mechanism is to store the Testing/Data
> > in MIDAS and use the MIDASApp to pull the data in.
> >
> >
> >      Luis
> >
> >
> > -------------------------------------------------------------
> > On Sat, Oct 16, 2010 at 12:11 PM, Bill Lorensen <bill.lorensen at gmail.com 
> >
> > wrote:
> >>
> >> I'm concerned the the mechanism for updating ITKData is too  
> complicated:
> >> http://www.itk.org/Wiki/ITK/Git#Updating_Data
> >>
> >> 2010/10/16 Luis Ibanez <luis.ibanez at kitware.com>:
> >> > Hi Gaetan,
> >> >
> >> > Given that ITK and ITKData are two separate Git
> >> > repositories, I would suspect that the branch that
> >> > you created in ITK does not necessarily create a
> >> > branch in the ITKData subdirectory.
> >> >
> >> > Marcus (in CC) may be able to help us here.
> >> >
> >> >
> >> >     Luis
> >> >
> >> >
> >> >
> >> >  
> ----------------------------------------------------------------------------
> >> > 2010/10/16 Gaëtan Lehmann <gaetan.lehmann at jouy.inra.fr>
> >> >>
> >> >> Le 16 oct. 10 à 15:27, Bill Lorensen a écrit :
> >> >>
> >> >>> Did you follow the instructions here:
> >> >>> http://www.itk.org/Wiki/ITK/Git#Updating_Data
> >> >>>
> >> >>> I have not tried them.
> >> >>>
> >> >>
> >> >> Yes, at the exception of the push step, because my code is not  
> in ITK
> >> >> yet.
> >> >> So my commits are only local for now.
> >> >>
> >> >>> Bill
> >> >>>
> >> >>> 2010/10/16 Gaëtan Lehmann <gaetan.lehmann at jouy.inra.fr>:
> >> >>>>
> >> >>>> Hi,
> >> >>>>
> >> >>>> As I said in another mail, I'm moving some code from the  
> insight
> >> >>>> journal
> >> >>>> to
> >> >>>> ITK. This includes new tests and test images.
> >> >>>>
> >> >>>> I switch to master to update my repository and created an  
> new branch
> >> >>>> to
> >> >>>> fix
> >> >>>> a bug, and when I turned back to my working branch, my test  
> images
> >> >>>> and
> >> >>>> my
> >> >>>> commits in Testing/Data were gone.
> >> >>>>
> >> >>>> Is it the normal behavior?
> >> >>>> I've restored everything from a backup, so everything is ok  
> this
> >> >>>> time,
> >> >>>> but
> >> >>>> I'd like to understand what is going on to avoid this kind of
> >> >>>> problem.
> >> >>>>
> >> >>>> Gaëtan
> >> >>>>
> >> >>>>
> >> >>>> --
> >> >>>> Gaëtan Lehmann
> >> >>>> Biologie du Développement et de la Reproduction
> >> >>>> INRA de Jouy-en-Josas (France)
> >> >>>> tel: +33 1 34 65 29 66    fax: 01 34 65 29 09
> >> >>>> http://voxel.jouy.inra.fr  http://www.itk.org
> >> >>>> http://www.mandriva.org  http://www.bepo.fr
> >> >>>>
> >> >>>>
> >> >>>> _______________________________________________
> >> >>>> Powered by www.kitware.com
> >> >>>>
> >> >>>> Visit other Kitware open-source projects at
> >> >>>> http://www.kitware.com/opensource/opensource.html
> >> >>>>
> >> >>>> Kitware offers ITK Training Courses, for more information  
> visit:
> >> >>>> http://kitware.com/products/protraining.html
> >> >>>>
> >> >>>> Please keep messages on-topic and check the ITK FAQ at:
> >> >>>> http://www.itk.org/Wiki/ITK_FAQ
> >> >>>>
> >> >>>> Follow this link to subscribe/unsubscribe:
> >> >>>> http://www.itk.org/mailman/listinfo/insight-developers
> >> >>>>
> >> >>>>
> >> >>
> >> >> --
> >> >> Gaëtan Lehmann
> >> >> Biologie du Développement et de la Reproduction
> >> >> INRA de Jouy-en-Josas (France)
> >> >> tel: +33 1 34 65 29 66    fax: 01 34 65 29 09
> >> >> http://voxel.jouy.inra.fr  http://www.itk.org
> >> >> http://www.mandriva.org  http://www.bepo.fr
> >> >>
> >> >>
> >> >> _______________________________________________
> >> >> Powered by www.kitware.com
> >> >>
> >> >> Visit other Kitware open-source projects at
> >> >> http://www.kitware.com/opensource/opensource.html
> >> >>
> >> >> Kitware offers ITK Training Courses, for more information visit:
> >> >> http://kitware.com/products/protraining.html
> >> >>
> >> >> Please keep messages on-topic and check the ITK FAQ at:
> >> >> http://www.itk.org/Wiki/ITK_FAQ
> >> >>
> >> >> Follow this link to subscribe/unsubscribe:
> >> >> http://www.itk.org/mailman/listinfo/insight-developers
> >> >>
> >> >
> >> >
> >
> >
>

-- 
Gaëtan Lehmann
Biologie du Développement et de la Reproduction
INRA de Jouy-en-Josas (France)
tel: +33 1 34 65 29 66    fax: 01 34 65 29 09
http://voxel.jouy.inra.fr  http://www.itk.org
http://www.mandriva.org  http://www.bepo.fr

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 203 bytes
Desc: Ceci est une signature ?lectronique PGP
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20101016/89de2add/attachment.pgp>

More information about the Insight-developers mailing list