Nasos,

I've pulled a change in 'ublas_devel' for a cosmetic change (1 line) https://github.com/jdurancomas/ublas/commit/5e3e6b01cbb55f10ac411777d15903c4899af225. At which branch do I should pull the request?

Joaquim Duran


2013/10/18 Nasos Iliopoulos <nasos_i@hotmail.com>
Joaquim,
please see below


On 10/18/2013 09:32 AM, Joaquim Duran wrote:
I was thinking that was used for local development, as the ublas repository could be cloned without the whole boost one. At this time, you could use qtcreator to edit and build the benchmarks. Based on the options of configuration of the project in qtcreator, it could save all development files in a folder, avoiding to spread the these files in the project.

Currently, I've committed the changes in 'ublas_devel' but I can apply the patch to ublas_feature0010_ide_dev_support before to pull a request to ublas. To test the changes: https://github.com/jdurancomas/ublas/tree/ublas_develop

Just a question: Does the next integration will be ublas from GSOC and then the rest of changes will we integrated?

No, anything (GSOC included of course) that is ready and has regression tests will be integrated on case by case basis.

That's why  we need branch granularity down to the feature level, so that integration of individual features is more rapid and they don't have to wait for larger ones in develop to be integrated first. So for any self-contained changes please make them in appropriate branches. Let me know if you need branches to be created for specific features or bugs.

Boost should have had moved to github by now, but it seems that there are still issues. We can always of course merge into svn from the github master. In that case pulling back into github will be an issue as we will have to resolve  virtual conflicts.

Please look at this for the model followed (or planned to be followed) in boost. Please note that the ublas github repo already implements that model:

http://nvie.com/posts/a-successful-git-branching-model/

The only deference is that we have two "masters" one is the "develop" (that is kept at the github side) and the other is "master" that is supposed to be synced with boost svn until the migration to github is complete.

Best,
Nasos



Joaquim Duran



2013/10/18 Nasos Iliopoulos <nasos_i@hotmail.com>
Joaquim,
that's great.
Please note that the IDEs folder is not there for building but rather serve as aides for the development  (we only need that for testing and benchmarking, since uBlas is a header only library). Currently I am basically using it as a file manager, but may eventually incorporate a custom build target that is using boost build for tests and benchmarks.

We will probably though need to deploy some parts as shared lib in the future as we incorporate the distributed ublas from GSOC.

BTW, which branch are you working on? The IDE development has its own branch (https://github.com/jdurancomas/ublas/tree/ublas_feature0010_ide_dev_support/IDEs)

-Nasos


On 10/17/2013 07:46 PM, Joaquim Duran wrote:
Dear all,

In the 'ublas_develop' there are .pro files to develop the library using qtcreator. In my clone of ublas, I've improved the .pro files. Currently, It is possible to create the brenchX executables and compile the tests (but not linking, yet).

Please, take a look to changes, and I can pull a request.

Thanks and best Regards,
Joaquim Duran



_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas
Sent to: athanasios.iliopoulos.ctr.gr@nrl.navy.mil


_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas
Sent to: jduran.gm@gmail.com



_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas
Sent to: athanasios.iliopoulos.ctr.gr@nrl.navy.mil


_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas
Sent to: jduran.gm@gmail.com