[TDF] Internal renaming and namespace refactoring #575

eguiraud · 2017-05-13T12:08:51Z

Second and last PR to resolve ROOT-8780 ("Less namespace verbosity and more uniform namings for TDataFrame").

phsft-bot · 2017-05-13T12:09:07Z

Starting build on gcc49/centos7, native/mac1012, gcc49/slc6, gcc62/slc6, native/ubuntu14 with CMake flags -Dvc=OFF -Dimt=ON -Dccache=ON

phsft-bot · 2017-05-13T12:16:05Z

Build failed on mac1012/native.
See console output.

phsft-bot · 2017-05-13T12:43:16Z

Build failed on ubuntu14/native.
See console output.

Failing tests:

phsft-bot · 2017-05-13T12:46:17Z

Build failed on centos7/gcc49.
See console output.

Failing tests:

phsft-bot · 2017-05-13T12:55:56Z

Build failed on slc6/gcc62.
See console output.

Failing tests:

phsft-bot · 2017-05-13T12:58:12Z

Build failed on slc6/gcc49.
See console output.

Failing tests:

phsft-bot · 2017-05-13T18:17:21Z

Starting build on gcc49/centos7, native/mac1012, gcc49/slc6, gcc62/slc6, native/ubuntu14 with CMake flags -Dvc=OFF -Dimt=ON -Dccache=ON

phsft-bot · 2017-05-13T18:23:46Z

Build failed on mac1012/native.
See console output.

phsft-bot · 2017-05-13T18:56:35Z

Build failed on slc6/gcc62.
See console output.

Failing tests:

phsft-bot · 2017-05-13T19:03:28Z

Build failed on ubuntu14/native.
See console output.

Failing tests:

phsft-bot · 2017-05-13T19:09:18Z

Build failed on centos7/gcc49.
See console output.

Failing tests:

phsft-bot · 2017-05-13T19:21:05Z

Build failed on slc6/gcc49.
See console output.

Failing tests:

pcanal · 2017-05-13T21:27:24Z

For the header files, I think technically we ought to have the header declaring classes inside a namespace (excluding/ignoring Experimental and possibly Details) in a subdirectory (see include/Math)

Since TDataFrame.hxx (the only user header file If I understood correctly) pull TDataFrame into the ROOT namespace I will keep it in [include]/ROOT but I would move all the other header in ROOT/TDF (and ROOT/Details) to keep things tidier.

eguiraud · 2017-05-14T12:36:16Z

@pcanal the namespaces we use are ROOT::{Detail,Experimental,Internal}::TDF, so I do not totally understand your proposal. Also $ROOTSYS/tree/treeplayer/inc/ROOT/TDF is an awful long pathname, but if that's the rule I will make the necessary changes to comply of course.

pcanal · 2017-05-14T12:46:34Z

It would be $ROOTSYS//ROOT/TDF/DetailsHeader.hxx and would only be used by our own headers not by the user. (and yes the files in git would in tree/treeplayer/inc/ROOT/TDF)

dpiparo · 2017-05-14T16:02:04Z

I am in favour of keeping things tidy. Still I find more informative/maintainable to have names for headers which refer to what they contains rather than a generic "Details".
If we want to change the policy related to paths in general for ROOT it is perhaps worth thinking this through and maybe go for it in November?

phsft-bot · 2017-05-14T17:50:18Z

Starting build on gcc49/centos7, native/mac1012, gcc49/slc6, gcc62/slc6, native/ubuntu14 with CMake flags -Dvc=OFF -Dimt=ON -Dccache=ON

phsft-bot · 2017-05-14T17:55:45Z

Build failed on mac1012/native.
See console output.

phsft-bot · 2017-05-14T18:05:14Z

Starting build on gcc49/centos7, native/mac1012, gcc49/slc6, gcc62/slc6, native/ubuntu14 with CMake flags -Dvc=OFF -Dimt=ON -Dccache=ON

phsft-bot · 2017-05-14T18:10:43Z

Build failed on mac1012/native.
See console output.

phsft-bot · 2017-05-14T18:34:50Z

Build failed on slc6/gcc62.
See console output.

Failing tests:

phsft-bot · 2017-05-14T18:39:07Z

Build failed on ubuntu14/native.
See console output.

Failing tests:

phsft-bot · 2017-05-14T18:54:10Z

Build failed on centos7/gcc49.
See console output.

Failing tests:

eguiraud · 2017-05-14T18:55:47Z

clang-format complains about the usual markdown tables longer than 120 lines (I have not changed them).

Test builds look good enough...mac did not finish due to a seemingly unrelated failure, while root_dataframe_functiontraits is fixed by a related PR in roottest.

phsft-bot · 2017-05-14T19:01:16Z

Build failed on slc6/gcc49.
See console output.

Failing tests:

Inside the ns are: * TCustomColumn[Base] (was TDataFrameBranch[Base]) * TRange (was TDataFrameRange) * TFilter (was TDataFrameFilter) * TDataFrameImpl * BranchNames_t (was in namespace ROOT)

Also rename TDataFrameAction[Base] -> TAction[Base]. Merge Internal::{Operations,TDFV7Utils} into Internal::TDF.

…-8780

- Experimental::TDF employs `TDFInternal` and `TDFDetail` aliases. - Detail::TDF employs `TDFInternal` alias. - Internal::TDF directly imports the contents of Detail::TDF and Experimental::TDF.

phsft-bot · 2017-05-15T13:41:48Z

Starting build on gcc49/centos7, native/mac1012, gcc49/slc6, gcc62/slc6, native/ubuntu14 with CMake flags -Dvc=OFF -Dimt=ON -Dccache=ON

phsft-bot · 2017-05-15T14:15:16Z

Build failed on slc6/gcc62.
See console output.

Failing tests:

phsft-bot · 2017-05-15T14:17:54Z

Build failed on slc6/gcc49.
See console output.

Failing tests:

phsft-bot · 2017-05-15T14:23:05Z

Build failed on ubuntu14/native.
See console output.

Failing tests:

phsft-bot · 2017-05-15T14:29:39Z

Build failed on centos7/gcc49.
See console output.

Failing tests:

phsft-bot · 2017-05-15T14:30:05Z

Build failed on mac1012/native.
See console output.

Failing tests:

eguiraud force-pushed the tdf_naming branch from d1ff559 to 6169759 Compare May 14, 2017 17:50

eguiraud added 4 commits May 15, 2017 15:39

[TDF] Introduce ROOT::Detail::TDF as per ROOT-8780

6e3afca

Inside the ns are: * TCustomColumn[Base] (was TDataFrameBranch[Base]) * TRange (was TDataFrameRange) * TFilter (was TDataFrameFilter) * TDataFrameImpl * BranchNames_t (was in namespace ROOT)

[TDF] Introduce ROOT::Internal::TDF as per ROOT-8780

25147fe

Also rename TDataFrameAction[Base] -> TAction[Base]. Merge Internal::{Operations,TDFV7Utils} into Internal::TDF.

[TDF] Clang-format things

26d4f9a

[TDF] Rename (Detail::TDF::)TDataFrameImpl to TLoopManager

946b682

eguiraud added 13 commits May 15, 2017 15:39

[TDF] Rename (Internal::TDF::)TDataFrameValue to TColumnValue

94b76a6

[TDF] Rename TInterface.hxx to TDFInterface.hxx

83eb003

[TDF] Rename BranchNames_t -> ColumnNames_t

fa035aa

[TDF] Rename (ROOT::Internal::TDF::)Histo to HistoUtils

6ded7d2

[TDF] Rename InterpretCall to JitTransformation

a44635d

[TDF] Rename (ROOT::Internal::TDF::)*Operation to *Helper as per ROOT…

c31fc60

…-8780

[TDF] Clang-format

da33d17

[TDF] Fix docs

14edeae

[TDF] Rename TDFOperations.{hxx,cxx} -> TDFActionHelpers.{hxx,cxx}

17dc69b

[TDF] Rename TDataFrameGuessedType -> TDF::TInferType

d09739d

[TDF] Introduce ns aliases in header files

16456f6

- Experimental::TDF employs `TDFInternal` and `TDFDetail` aliases. - Detail::TDF employs `TDFInternal` alias. - Internal::TDF directly imports the contents of Detail::TDF and Experimental::TDF.

[TDF] Add using namespace directives to source files

1263fe7

[TDF] clang-format all the things

00e33a2

eguiraud force-pushed the tdf_naming branch from 41a5fe0 to 00e33a2 Compare May 15, 2017 13:41

dpiparo merged commit a18336b into root-project:master May 15, 2017

eguiraud deleted the tdf_naming branch May 16, 2017 08:34

phsft-bot mentioned this pull request May 16, 2023

[TCling] C++-use string,vector instead of std. #11027

Draft

[TDF] Internal renaming and namespace refactoring #575

[TDF] Internal renaming and namespace refactoring #575

Uh oh!

Conversation

eguiraud commented May 13, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

phsft-bot commented May 13, 2017

Uh oh!

phsft-bot commented May 13, 2017

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

phsft-bot commented May 13, 2017

Uh oh!

phsft-bot commented May 13, 2017

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

phsft-bot commented May 13, 2017

Failing tests:

Uh oh!

pcanal commented May 13, 2017

Uh oh!

eguiraud commented May 14, 2017

Uh oh!

pcanal commented May 14, 2017

Uh oh!

dpiparo commented May 14, 2017

Uh oh!

phsft-bot commented May 14, 2017

Uh oh!

phsft-bot commented May 14, 2017

Uh oh!

phsft-bot commented May 14, 2017

Uh oh!

phsft-bot commented May 14, 2017

Uh oh!

phsft-bot commented May 14, 2017

Failing tests:

Uh oh!

phsft-bot commented May 14, 2017

Failing tests:

Uh oh!

phsft-bot commented May 14, 2017

Failing tests:

Uh oh!

eguiraud commented May 14, 2017

Uh oh!

phsft-bot commented May 14, 2017

Failing tests:

Uh oh!

phsft-bot commented May 15, 2017

Uh oh!

phsft-bot commented May 15, 2017

Failing tests:

Uh oh!

phsft-bot commented May 15, 2017

Failing tests:

Uh oh!

phsft-bot commented May 15, 2017

Failing tests:

Uh oh!

eguiraud commented May 13, 2017 •

edited

Loading