Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
785 commits
Select commit Hold shift + click to select a range
26600bf
[TDF] Only call `ProcessLine` if there is something to jit
eguiraud Jul 2, 2017
e5e7e35
[TDF] Rename `Init` to `InitSlot`
eguiraud Jul 2, 2017
78d39e2
[TDF] Rename `InitAllNodes` to `InitNodeSlots`
eguiraud Jul 2, 2017
f2df344
[TDF] Move generic node initialization to `InitNodes` function
eguiraud Jul 2, 2017
120ef5d
[TDF] Define TLoopManager's methods in the same order they are declared
eguiraud Jul 2, 2017
b5a0569
[TDF] Fix issue in interaction of named filters and range logic
eguiraud Jul 2, 2017
9b5110c
[TDF] Handle missing branches more nicely in ColumnName2ColumnTypeName
eguiraud Jul 2, 2017
628c013
Missing newline (breaking echo.C?)
Axel-Naumann Jul 3, 2017
12e1bfe
Remove tomatos
Teemperor Jul 3, 2017
79fd575
Revert "Be more explicit about the type change, so people can ajust t…
Axel-Naumann Jul 3, 2017
d001610
Revert "Make default TTree::Draw() hists double precision (THxD)."
Axel-Naumann Jul 3, 2017
be3668c
TTree::Draw() produces TH1F again.
Axel-Naumann Jul 3, 2017
22c7599
Fix classic build error for missing TypeTraits.hxx header
amadio Jul 3, 2017
df87309
Propagate Intel compiler setup to newer versions
amadio Jul 3, 2017
073dbc0
spell check and doxygen formatting
couet Jul 3, 2017
7b2b5cf
Fix markdown formatting
couet Jul 4, 2017
b107f46
[TDF] Fix classic builds
dpiparo Jun 30, 2017
7b547fa
Remove useless debug printout
dpiparo Jun 30, 2017
f67089f
Fix tutorial for Py3
dpiparo Jul 4, 2017
26ee09d
Force -std=c++14 to enable __STRICT_ANSI__.
Axel-Naumann Jul 4, 2017
e85f021
Fix unused variable warning.
vgvassilev Jul 3, 2017
d870bfc
Support shebang even outside cling driver, e.g. #!/usr/bin/env root -…
Axel-Naumann Jul 4, 2017
281eb7a
[travis] Try pushing the head.
vgvassilev Jul 4, 2017
2a36476
Fix classic build with external Unuran library
amadio Jul 4, 2017
a43d1b3
[Math] Replace std::auto_ptr with std::unique_ptr
amadio Jun 20, 2017
66de0f6
Avoid warnings from mathcore/triangle.c in classic builds
amadio Jul 3, 2017
ff17d24
Windows: Visual Studio 2017 is still returning 199711L for __cplusplus!
marsupial Jun 29, 2017
dddc976
UserInterface: cling is discarding the last line if it does not have …
marsupial Jun 29, 2017
eda1058
Windows: Fix infinite loop when piping to cling with < operator.
marsupial Jun 29, 2017
64c2f35
Fix a problem with option "BOX" with log scale along the Z axis.
couet Jul 4, 2017
32d6bd9
Allow evaluation of templated(Double_v) TF1 on doubles
xvallspl Jun 23, 2017
21ca5fa
Provide several improvements for the vectorized fit.
xvallspl Jun 23, 2017
8065a76
Pad BinData to fill whole Double_v vectors
xvallspl Jun 23, 2017
cbc38d6
Remove now useless HAS_VECCORE guards
xvallspl Jun 28, 2017
325133e
Remove more R__HAS_VECCORE guards
xvallspl Jun 29, 2017
3edf89d
Reduce time it takes to run test
xvallspl Jun 29, 2017
008e5a0
Fromm Frederich Munch: Fix CxxStdCompiledWith for Visual Studio, whic…
bellenot Jul 4, 2017
a935928
Improve TTree:Draw doc.
couet Jul 4, 2017
0cd8468
Allow passing arguments as options after the -- option
Jun 7, 2017
8f2f92d
Fix Windows exception handling for newer LLVM interfaces. Block it’s …
marsupial Jun 29, 2017
e79fbe8
Adjust Y axis title offset default for 3D axis.
couet Jul 5, 2017
cb5dc30
Fix tests on platforms with __float128 without forcing C++14.
marsupial Jul 4, 2017
98b7242
UserInterface: Enforce destruction order with TextInputHolder.
marsupial Jun 28, 2017
70caa74
TextInput: Remove unused method.
marsupial Jun 19, 2017
98a0ed0
Make sure doxygen will generate links to tutorials
couet Jul 5, 2017
c597953
Fix fatal error LNK1120: 1 unresolved externals (Windows)
bellenot Jul 5, 2017
4f322bb
[travis] Reimplement the sync procedure.
vgvassilev Jul 5, 2017
cb4dad9
Formatting.
marsupial Jul 4, 2017
ca0a796
Windows: Don’t enable GNU keywords by default.
marsupial Jul 4, 2017
429c064
Don’t change the C++ version from underneath clang, tell it what is d…
marsupial Jul 4, 2017
5801f79
Prefer local LangOptions variable rather than CI->getLangOpts().
marsupial Jul 4, 2017
50eecf7
[net] Fix compiler warning in civetweb
amadio Jul 5, 2017
90f563d
Fix typo in TClass.h
amadio Jun 27, 2017
18d6cce
[TDF] Fix FillN with no weights
dpiparo Jul 5, 2017
34a2af1
[TDF] Simplify the filling with arrays of values
dpiparo Jul 5, 2017
94c788d
[TDF] Fix compilation error when reading 66+ columns in the same node
eguiraud Jul 5, 2017
b7d7dca
Update build badges to point to new Jenkins instance
amadio Jul 5, 2017
5ba88aa
Avoid useless construction/destruction of imtHelper in TTree::Fill()
amadio Jul 5, 2017
936e653
Fix typos in TFileMerger documentation
amadio Jul 6, 2017
ff12fef
Fix a mismatch between the markers' colors and the color palette..
couet Jul 6, 2017
ea7f680
Fix typo in an example
couet Jul 6, 2017
6336cfd
Allow CompilerOptions:: DefaultLanguage to be queried earlier in init…
marsupial Jul 5, 2017
dffa883
Don't run Gnu.C test on Windows...
bellenot Jul 6, 2017
7f762ea
Dont pass -fPIC flag on Windows (unsupported option)
bellenot Jul 6, 2017
88eaa53
Revert a change which might cause problem on ARM.
couet Jul 7, 2017
fd11f91
Include event weights in DNN training. (#738)
simonpf Jul 7, 2017
aa45d60
Fix minor bugs in FitUtil.h
xvallspl Jul 4, 2017
9aa0554
[travis] Do not checkout a specific commit.
vgvassilev Jul 8, 2017
6b7e0e4
Fix an uninitialised variable.
couet Jul 10, 2017
0c205c8
Remove extraneous character from FitUtil.h header
amadio Jul 10, 2017
c885488
Direct reference to tutorials to allow doxygen indexing.
couet Jul 10, 2017
1c03651
Update example output format.
couet Jul 10, 2017
971ef8a
Fixed build-time deadlock in navigator registration.
agheata Jul 10, 2017
2223e00
Remove typo (thanks pamputt)
dpiparo Jul 10, 2017
c126c98
Fix ROOT-8850 avoiding to reset a shared_ptr which went out of scope
dpiparo Jul 10, 2017
abd8f30
[TDF] Simplify and restructure tutorial
dpiparo Jul 10, 2017
fca8c11
Add missing TMVA files to classic build scripts
amadio Jul 10, 2017
6cdb5a0
Fix TReentrantRWLock on macOS
amadio Jul 10, 2017
9d147f0
[TDF] Showcase jitted filters
dpiparo Jul 10, 2017
c4978f1
Enable builtin GSL when mathcore=ON, but external GSL is not found
amadio Jul 10, 2017
1a7aef8
Remove unused capture. Silence a warning.
vgvassilev Jul 11, 2017
767323b
Add missing include to TMatrixTUtils.h
amadio Jul 11, 2017
15e0c3f
Revert "Enable builtin GSL when mathcore=ON, but external GSL is not …
amadio Jul 11, 2017
bc1f116
Simplify TF1
xvallspl Jul 4, 2017
c0add1a
Introduce a private delegated TF1 constructor
xvallspl Jul 4, 2017
05c289c
Make ftype an enum for clarity
xvallspl Jul 4, 2017
4b9e044
Delete constructor, std::function taken by ref
xvallspl Jul 6, 2017
5910156
Merge function pointer and functor pointer
xvallspl Jul 6, 2017
d3ecd13
Tell icc to compile with 02 as other compilers
vgvassilev Jul 12, 2017
e72ff50
TThreadedObject: detach slots' histograms from directories
dpiparo Jul 12, 2017
6f213b1
Fix for the modules build
xvallspl Jul 12, 2017
96bdfc2
Fix GCC7 compiler warning (int in bool context)
amadio Jul 12, 2017
0ef4f35
Avoid compiler warning in rootcling and rootcling_stage1
amadio Jul 12, 2017
1ffa810
Supress warnings from external package dCache
amadio Jul 12, 2017
c019516
Remove unused options from interpreter/llvm/Module.mk
amadio Jul 12, 2017
655fbed
Disable warnings from LLVM in classic builds
amadio Jul 12, 2017
632a8df
Enable -fno-strict-aliasing for all compilers in classic build
amadio Jul 12, 2017
233fbde
Add -Wno-nonnull-compare to proof/proofd in classic builds
amadio Jul 12, 2017
eff0d95
Supress Qt warnings in gui/qtgsi in classic builds
amadio Jul 12, 2017
b33404c
Make stressEntryList Test2() more robust against rounding errors
amadio Jul 12, 2017
8a646b5
Add missing dependencies to ROOT_GENERATE_DICTIONARY
Teemperor Jul 7, 2017
b74835e
Use pid in temp. file names to mitigate race conditions.
Teemperor Jul 11, 2017
82ecb5f
Fixed dependencies between rootcling invocations and linking.
Teemperor Jul 11, 2017
c6bfed1
Add BUILTINS arg to ROOT_GENERATE_DICTIONARY
Teemperor Jul 11, 2017
a9d16cc
Add ROOTCLING_ targets that allow more parallel rootcling invocations.
Teemperor Jul 12, 2017
923774f
[TDF] Fix memory leak in non-jitted actions
eguiraud Jul 11, 2017
75b7fc1
[travis] Pull the alt master into the master branch.
vgvassilev Jul 12, 2017
80fe261
Remove deprecated header and source files.
vgvassilev Jul 2, 2017
e888be8
Fix block comments greedily looking for the next asterisk.
marsupial Jul 10, 2017
3b4e9d1
When looking for the end of a block comment, really don’t bother with…
marsupial Jul 10, 2017
62c562b
[TDF] Add convenience overload for Reduce.
eguiraud Jul 12, 2017
0dc2f3d
Update LinkDef3.h
xvallspl Jul 13, 2017
d9e1394
Correctly escape regex dot in RootNewMacros.cmake
Teemperor Jul 13, 2017
fe1e35c
Fix race condition when generating RGL module.
Teemperor Jul 13, 2017
7f74c2f
Enable rootcling warnings and fix existing warnings.
Teemperor Jul 13, 2017
2695039
Fix race condition when building RCastor
Teemperor Jul 13, 2017
69b3194
[TDF] Update user guide
eguiraud Jul 12, 2017
7c8998c
[TDF] Rename GetDefault{Branches,ColumnNames}, fDefault{Branches,Colu…
eguiraud Jul 5, 2017
8b7eda7
[TDF] Use "column" instead of "branch" in Reduce action
eguiraud Jul 12, 2017
39d506b
[TDF] Use SelectColumns instead of PickBranchNames
eguiraud Jul 5, 2017
5c4c89e
[TDF] Use SelectColumns instead of GetBranchNames in Take
eguiraud Jul 12, 2017
e300221
[TDF] Use SelectColumn instead of GetBranchNames in Histo and Fill ac…
eguiraud Jul 13, 2017
62c0b5a
[TDF] Use SelectColumns instead of GetBranchNames in Min,Max,Mean
eguiraud Jul 13, 2017
445cd72
[TDF] Remove the GetBranchNames function
eguiraud Jul 13, 2017
8e9c8c6
[TDF] Delete GetDefaultBranchNames
eguiraud Jul 13, 2017
1f44cbe
[TDF] Rename GetUsedBranchNames -> FindUsedColumnNames. Complete ROOT…
eguiraud Jul 13, 2017
bc822b3
Pass ROOT CMake variables to LZ4 build.
bbockelm Jul 13, 2017
8a6ec5c
Further optimise TThreadedObject for histograms
dpiparo Jul 14, 2017
7bee0aa
Refine template specialisation for histograms
dpiparo Jul 14, 2017
b990365
Simplify template specialisation for histograms
dpiparo Jul 14, 2017
7c533e4
Remove unused classes from the selection
dpiparo Jul 14, 2017
3115ba9
Flip also kMustCleanup bit of histograms cloned by the TThreadedObject
dpiparo Jul 14, 2017
c782ca8
Fixed more race conditions in the build system.
Teemperor Jul 13, 2017
387ac2b
Refactor sfinae in TThreadedObject for the treatment of histograms
dpiparo Jul 14, 2017
cad38ee
Detach model of TThreadedObject from ROOT memory management
dpiparo Jul 14, 2017
0d54727
Correctly escape CMake regex
Teemperor Jul 14, 2017
bba80a1
thisroot.sh: prefer local variables
veprbl Jul 14, 2017
102fb9d
Always pass -fcolor-diagnostics to clang.
Teemperor Jul 14, 2017
cc8c0c5
Use final instead of virtual keyword for DeclCollector.
marsupial Jun 15, 2017
f2a8d10
Update DeclCollectorPPAdapter to allow unloading of #undef command.
marsupial Jul 15, 2016
77afad9
Fixes for CERN-LLVM.
marsupial Jun 13, 2017
69dc304
Hide DeclCollectorPPAdapter and use DeclCollector for setup.
marsupial Jun 15, 2017
f71070a
Fix typo.
vgvassilev Jul 16, 2017
3451bca
[TDF] Add `FindUnknownColumns` helper function
eguiraud Jul 16, 2017
4dd8165
[TDF] Validate column names in CreateAction
eguiraud Jul 16, 2017
f05b7e9
[TDF] Validate columns in filters
eguiraud Jul 16, 2017
541edd8
[TDF] Validate columns in `Define`s
eguiraud Jul 16, 2017
c970f84
[TDF] Validate columns in Foreach[Slot], Reduce, Take
eguiraud Jul 16, 2017
face721
[hist] Remove unused class from LinkDef.h
amadio Jul 17, 2017
8b0280b
Fix CMake errors on non-english systems (ROOT-8917).
Teemperor Jul 18, 2017
a780e91
TMVA BDT grad boost (#706)
ashlaban Jul 18, 2017
93381a6
webgui: introduce FindDrawable method in CanvasPainter
linev Jun 29, 2017
4a39ba3
webgui: introduce context menu handling in drawable
linev Jun 29, 2017
9af69b9
webgui: use std::vector for menu items
linev Jun 29, 2017
1170d90
webgui: let execute commands specified as menu item
linev Jun 29, 2017
ced189e
webgui: small adjustments in TObjectDrawable.cxx
linev Jul 17, 2017
3e6b348
webgui: put menuitem in additional Detail namespace
linev Jul 17, 2017
444533f
webgui: add enumeration for checked state in TMenuItem
linev Jul 17, 2017
536a763
webgui: adjust TMenuItem class
linev Jul 17, 2017
0ea5f72
webgui: adjust menu handling methods in TDrawable and derived classes
linev Jul 17, 2017
54e08b5
webgui: avoid string copy in canvas painter
linev Jul 17, 2017
8e16eb5
webgui: adjust formatting of the new code
linev Jul 18, 2017
5c6fc08
webgui: introduce CEF-related code
linev Jun 30, 2017
da84a8c
webgui: provide Qt5 implementation
linev Jun 30, 2017
a2d3f79
webgui: add gitignore rules
linev Jun 30, 2017
ee61242
add MAC handler - not yet included into makefiles
linev Jun 30, 2017
cf71e75
webgui: add CEF license file
linev Jul 17, 2017
8b496a8
webgui: change copyright in rootqt5 code
linev Jul 17, 2017
5c27931
webgui: adjust qt5 project file for the rootqt5
linev Jul 17, 2017
a9abd9b
webgui: separate webpage and webview classes, provide copyright
linev Jul 17, 2017
c6f14ef
webgui: apply clang format for the CEF and Qt5 code
linev Jul 18, 2017
7e01ddd
webgui: reformat not-yet-used mac source
linev Jul 18, 2017
d50c97e
add eclipse settings files to gitignore
linev Jul 18, 2017
848be2c
Fixes regression and corresponding tests (#758)
xvallspl Jul 19, 2017
b7d95be
webgui: introduce TMenuItems class
linev Jul 18, 2017
5a06d16
webgui: introduced TCheckedMenuItem class
linev Jul 18, 2017
e260a7c
webgui: provide central method to fill object menu items
linev Jul 18, 2017
12d6a73
webgui: provide all arguments with menu items
linev Jul 18, 2017
57a6423
webgui: enable usage of CEF in canvas painter
linev Jul 19, 2017
4703ecb
webgui: enable usage of qt5-based canvas
linev Jul 19, 2017
a3c7da7
webgui: create qt5 scheme handler for each new canvas
linev Jul 19, 2017
04c2eee
webgui: create qt5 scheme handler per THttpServer instance
linev Jul 19, 2017
ae3cfb8
webgui: update build procedure and readme
linev Jul 19, 2017
73b3cb1
Remove extra closing brace
ellert Jul 14, 2017
8b6579f
TMVA Multiclass gui updates (#707)
ashlaban Jul 20, 2017
62661d1
TH1 KolmogorovTest infinite loop (#705)
ashlaban Jul 21, 2017
bda9803
[Math] Avoid unused variable warning
amadio Jul 21, 2017
02373d9
[Hist] Disable autoloading of unsupported ROOT7 THist variadic templates
amadio Jul 21, 2017
e8352d3
Veto Lengendre.py if no mathmore
peremato Jul 21, 2017
00ee06d
Don't let clang-format to put if condition and body on the same line
amadio Jul 21, 2017
a17afb5
If we are not explicitly asking for vectorisation, fall back to ROOT …
vgvassilev Jul 10, 2017
ce22c1c
Silence warnings coming from the Vc headers.
vgvassilev Jul 14, 2017
9a2165b
Add the specific diag types as clang pragmas only.
vgvassilev Jul 23, 2017
99a0d6a
fix Clang name in cmake file
gouarin Jul 23, 2017
ce55f2b
Increased tolerance (icc17 compiler)
peremato Jul 21, 2017
c24682c
Appease gcc unknown pragma warnings.
vgvassilev Jul 24, 2017
869d289
[Math] Avoid unused variable warnings in testLogLExecPolicy
amadio Jul 24, 2017
1b9b6b0
[TMVA] Use absolute error for small floating point differences
amadio Jul 24, 2017
73202c2
[TMVA] Use dx proportional to sqrt(epsilon) as step for derivatives
amadio Jul 24, 2017
3640c9c
Set fCanLoadClassInfo to false to avoid calls to LoadClassInfo()
amadio Jul 6, 2017
da59a53
Simplify implementation of TClass::LoadClassInfo()
amadio Jun 27, 2017
da343cf
Avoid locking unnecessarily when fCurrentInfo != nullptr
amadio Jun 27, 2017
2778000
Construct string before locking mutex when getting StreamerInfo
amadio Jun 27, 2017
0212be7
Improve readability of if condition in TClass
amadio Jul 14, 2017
32bc000
[TDF] Fix bug in parallel Snapshot
eguiraud Jul 24, 2017
a4edf43
Improve doc as requested here https://sft.its.cern.ch/jira/browse/ROO…
couet Jul 25, 2017
33e3b83
[TMVA] Use less samples and dimensions to avoid timing out
amadio Jul 25, 2017
62fb775
Fix CMake warnings regarding LINK_INTERFACE_LIBRARIES property.
Teemperor Jul 25, 2017
c2c7c63
Protect TThreadExecutor against uninitializations.
xvallspl Jul 25, 2017
3382515
webgui: first try to redirect http requests in CEF
linev Jul 19, 2017
7656631
webgui: register and use custom scheme in the CEF for communication
linev Jul 19, 2017
060e5b7
webgui: open http port only when required
linev Jul 19, 2017
d064ab8
webgui: remove direct dependency of canvas painter from CEF includes
linev Jul 20, 2017
395ce57
webgui: introduce special CEF handler for offscreen mode
linev Jul 20, 2017
5acf28f
webgui: show console CEF log output
linev Jul 20, 2017
ef78c04
webgui: first succesfull try to communicate with JS code in CEF
linev Jul 20, 2017
9d45522
webgui: use CefMessageRouter to communicate between main process and JS
linev Jul 20, 2017
e61c090
webgui: install CEF MessageRouter only in batch mode
linev Jul 20, 2017
fcdf658
webgui: add batch mode to canvas painter
linev Jul 20, 2017
88e96f3
webgui: first async version of svg image create
linev Jul 20, 2017
b89910d
jsroot: support SVG image creation for web canvas
linev Jul 20, 2017
0046fc3
webgui: add support of png image generation
linev Jul 21, 2017
aed13cd
jsroot: add PNG generation support for web canvas
linev Jul 21, 2017
90e72fc
http: extend THttpCallArg::SetPostData() functionality
linev Jul 21, 2017
409855d
http: support web-socket emulator
linev Jul 21, 2017
2183450
webgui: use CEF messaging for websockets emulations
linev Jul 21, 2017
203bf2f
webgui: introduce BaseHandler class
linev Jul 21, 2017
8979ec4
webgui: support cef messaging also in gui mode
linev Jul 21, 2017
2772e26
webgui: rename SimpleHandler to GuiHandler
linev Jul 21, 2017
4dadf76
webgui: add Window part of gui handler (just for the future)
linev Jul 21, 2017
405cc37
jsroot: add support of CEF messaging
linev Jul 21, 2017
2897eab
webgui: usual clang-format
linev Jul 21, 2017
e821abe
webgui: clang-format
linev Jul 21, 2017
deccc57
[llvm] Backport D35536 to prevent nulling TUScope.
Teemperor Jul 19, 2017
a9d1feb
[llvm] Backport patch D34510 for merging anonymous structs.
Teemperor Jul 19, 2017
ab8c6d0
[llvm] Backport D33366 to prevent that alloc functions are hidden.
Teemperor Jul 19, 2017
a771711
webgui: use QWebViewPage to render web graphics without creating window
linev Jul 24, 2017
2d83698
webgui: correctly set batch mode in URL for qt5 canvas
linev Jul 26, 2017
1987435
jsroot: correctly handle "batch_mode" parameter in webcanvas URL
linev Jul 26, 2017
5a4c3b2
webgui: clang-format for modified sources
linev Jul 26, 2017
968d4c6
Adjust the Y axis title position in case of automatic placement.
couet Jul 26, 2017
a64a272
FitSlicesX and FitSlicesY cannot be in the context menu of TH2D
couet Jul 26, 2017
7fffaa7
Disabled MT fit testing while bugfixing
xvallspl Jul 26, 2017
b12abc3
Remove method, with parameters not being basic type, from context menu.
couet Jul 26, 2017
973b85f
Remove method, with parameters not being basic type, from context menu.
couet Jul 26, 2017
94f0040
Remove methods, with parameters not being basic type, from context menu.
couet Jul 26, 2017
5dd437b
[PyMVA] Fix TensorFlow backend for PyKeras
stwunsch Jul 26, 2017
4a89b47
[PyMVA] Make PyKeras tests compatible with Keras v1.x and v2.x API
stwunsch Jul 26, 2017
3628b3c
Disable rebuilding unnecessarily when git HEAD changes.
Teemperor Jul 26, 2017
4cb07bc
Fix that LLVM currently rebuilds unnecessarily when git HEAD changes.
Teemperor Jul 26, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -3
AlignAfterOpenBracket: Align
Expand All @@ -12,7 +11,7 @@ AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: true
# This option is "deprecated and is retained for backwards compatibility."
# AlwaysBreakAfterDefinitionReturnType: None
Expand Down
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ project.xcworkspace
# CLion
.idea/*

# QtCreator
CMakeLists.txt.user

# Eclipse
.settings/*

# Vim
*.swp

Expand Down Expand Up @@ -80,6 +86,10 @@ project.xcworkspace
# /core/lzma/src/
/core/lzma/src/xz-5.2.1

# /core/lz4/src
/core/lz4/src/*.tar.gz
/core/lz4/src/lz4-*

# /core/metautils/src/
/core/metautils/src/stlLoader_set.cc
/core/metautils/src/stlLoader_map2.cc
Expand Down
34 changes: 25 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,27 @@ matrix:
compiler: clang

- os: linux
env: TOOL=clang-tidy
env: TOOL=clang-tidy-analyzer
addons:
apt:
sources: *sources
packages: ['clang-3.9', 'clang-tidy-3.9', 'libstdc++-6-dev']
compiler: clang

- os: linux
env: TOOL=clang-tidy-modernize
addons:
apt:
sources: *sources
packages: ['clang-3.9', 'clang-tidy-3.9', 'libstdc++-6-dev']
compiler: clang

allow_failures:
# clang-tidy is still experimental
- env: TOOL=clang-tidy
# clang-tidy-modernize is still experimental
- env: TOOL=clang-tidy-modernize
install:
- |
if [[ $TOOL == 'clang-tidy' ]]; then
if [[ $TOOL == clang-tidy* ]]; then
export BUILD_DEPS="${TRAVIS_BUILD_DIR}/deps"
mkdir ${BUILD_DEPS} && cd ${BUILD_DEPS}
CMAKE_URL="https://cmake.org/files/v3.6/cmake-3.6.0-Linux-x86_64.tar.gz"
Expand All @@ -74,7 +82,7 @@ script:
- echo "Copying and generating header files." && echo -en "travis_fold:start:install.headers"
- |
# We need to put in place all relevant headers before running clang-tidy.
if [[ $TOOL == 'clang-tidy' ]]; then
if [[ $TOOL == clang-tidy* ]]; then
mkdir ../build
cd ../build
export CC=clang-3.9
Expand Down Expand Up @@ -119,21 +127,29 @@ script:
echo "$RESULT_OUTPUT"
exit 1
fi
elif [[ $TOOL == 'clang-tidy' ]]; then
elif [[ $TOOL == clang-tidy* ]]; then
CLANG_TIDY_CHECKS='-*'
if [[ $TOOL == clang-tidy-analyzer ]]; then
CLANG_TIDY_CHECKS+='clang-analyzer-*,-clang-analyzer-alpha*'
elif [[ $TOOL == clang-tidy-modernize ]]; then
CLANG_TIDY_CHECKS+='modernize*'
fi

echo "Running clang-tidy-3.9 only against the changes in branch $TRAVIS_BRANCH."

cd ../root/
# Workaround for travis issue: travis-ci/travis-ci#6069
git remote set-branches --add origin master
git fetch
RESULT_OUTPUT="$(git diff -U0 origin/master | clang-tidy-diff-3.9.py -p1 -clang-tidy-binary $(which clang-tidy-3.9) -checks=-*,clang-analyzer-*)"
RESULT_OUTPUT="$(git diff -U0 origin/master | clang-tidy-diff-3.9.py -p1 -clang-tidy-binary $(which clang-tidy-3.9) \
-checks=$CLANG_TIDY_CHECKS)"
if [[ $? -eq 0 ]]; then
echo "clang-tidy passed."
echo "$TOOL passed."
exit 0
else
echo "To reproduce it locally please run"
echo -e "\tgit checkout $TRAVIS_BRANCH"
echo -e "Command: git diff -U0 $TRAVIS_BRANCH..origin/master | clang-tidy-diff.py -p1 -clang-tidy-binary \$(which clang-tidy) -checks=-*,clang-analyzer-*"
echo -e "Command: git diff -U0 $TRAVIS_BRANCH..origin/master | clang-tidy-diff.py -p1 -clang-tidy-binary \$(which clang-tidy) -checks=$CLANG_TIDY_CHECKS"
echo "$RESULT_OUTPUT"
exit 1
fi
Expand Down
82 changes: 49 additions & 33 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ include(cmake/modules/CaptureCommandLine.cmake)
project(ROOT)
set(IntegratedBuild ON)

#---Set the locale to default C to prevent issued due to localization of commands---------------
# This is necessary as we for example call `clang -v` and parse its output. But on a localized
# program, the output parsing is much more error prone as certrain strings we're looking for
# could be missing or be in a different order. To prevent those errors, let's just force all
# output to use the default C locale which is more or less identical on all systems.
set(ENV{LANG} C)

#---Set pathes where to put the libraries, executables and headers------------------------------
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
Expand Down Expand Up @@ -63,6 +70,14 @@ if(coverage)
set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
endif()

#--- Enable build timing -----------------------------------------------------------------------
if (build_timing)
# FIXME: This currently will override the use of ccache if -Dbuild_timing=On -Dccache=On is passed.
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_COMMAND} -E time")
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CMAKE_COMMAND} -E time")
#set_property(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM "${CMAKE_COMMAND} -E time")
endif()

#---Enable CTest package -----------------------------------------------------------------------
#include(CTest)
if(testing)
Expand Down Expand Up @@ -171,36 +186,42 @@ if(cxxmodules)
# for glew.h to it its trick.
set(ROOT_CXXMODULES_COMMONFLAGS "${ROOT_CXXMODULES_COMMONFLAGS} -isystem ${CMAKE_SOURCE_DIR}/graf3d/glew/isystem")
endif()
endif(cxxmodules)

add_custom_target(copymodulemap DEPENDS "${CMAKE_BINARY_DIR}/include/module.modulemap")
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/include/module.modulemap"
DEPENDS build/unix/module.modulemap "${CMAKE_BINARY_DIR}/include/module.modulemap.extra"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/build/unix/module.modulemap" "${CMAKE_BINARY_DIR}/include/module.modulemap"
COMMAND cat "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" >> "${CMAKE_BINARY_DIR}/include/module.modulemap"
)

add_dependencies(move_artifacts copymodulemap)

# Provide our own modulemap for implementations other than libcxx.
if (NOT libcxx)
# Write a empty overlay file to the output directory that CMake can run its compiler tests.
# We will create the actual overlay later in the configuration.
file(WRITE ${CMAKE_BINARY_DIR}/include/modulemap.overlay.yaml "{'version' : 0, 'roots' : []}")
set(__vfs_overlay "-ivfsoverlay ${CMAKE_BINARY_DIR}/include/modulemap.overlay.yaml")
add_custom_target(copymodulemap DEPENDS "${CMAKE_BINARY_DIR}/include/module.modulemap")
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/include/module.modulemap"
DEPENDS build/unix/module.modulemap "${CMAKE_BINARY_DIR}/include/module.modulemap.extra"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/build/unix/module.modulemap" "${CMAKE_BINARY_DIR}/include/module.modulemap"
COMMAND cat "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" >> "${CMAKE_BINARY_DIR}/include/module.modulemap"
)
install(FILES "${CMAKE_BINARY_DIR}/include/module.modulemap" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers)

add_dependencies(move_artifacts copymodulemap)

# Provide our own modulemap for implementations other than libcxx.
if (NOT libcxx)
# Write a empty overlay file to the output directory that CMake can run its compiler tests.
# We will create the actual overlay later in the configuration.
file(WRITE ${CMAKE_BINARY_DIR}/include/modulemap.overlay.yaml "{'version' : 0, 'roots' : []}")
set(__vfs_overlay "-ivfsoverlay ${CMAKE_BINARY_DIR}/include/modulemap.overlay.yaml")

if (cxxmodules)
set(ROOT_CXXMODULES_COMMONFLAGS "${ROOT_CXXMODULES_COMMONFLAGS} ${__vfs_overlay}")
endif(cxxmodules)

# Only use the first path from the HEADERS_LOCATION (which is separated by colons).
get_property(__libcpp_full_paths GLOBAL PROPERTY ROOT_CLING_CXX_HEADERS_LOCATION)
string(REGEX MATCHALL "[^:]+" __libcpp_full_paths_list "${__libcpp_full_paths}")
list(GET __libcpp_full_paths_list 0 __libcpp_full_path)
# Only use the first path from the HEADERS_LOCATION (which is separated by colons).
get_property(__libcpp_full_paths GLOBAL PROPERTY ROOT_CLING_CXX_HEADERS_LOCATION)
string(REGEX MATCHALL "[^:]+" __libcpp_full_paths_list "${__libcpp_full_paths}")
list(GET __libcpp_full_paths_list 0 __libcpp_full_path)

configure_file(${CMAKE_SOURCE_DIR}/build/unix/modulemap.overlay.yaml.in ${CMAKE_BINARY_DIR}/include/modulemap.overlay.yaml @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/build/unix/modulemap.overlay.yaml.in ${CMAKE_BINARY_DIR}/include/modulemap.overlay.yaml @ONLY)

configure_file(${CMAKE_SOURCE_DIR}/build/unix/stl.cppmap ${CMAKE_BINARY_DIR}/include/stl.cppmap)
configure_file(${CMAKE_SOURCE_DIR}/build/unix/libc.modulemap ${CMAKE_BINARY_DIR}/include/libc.modulemap)
endif()
configure_file(${CMAKE_SOURCE_DIR}/build/unix/stl.cppmap ${CMAKE_BINARY_DIR}/include/stl.cppmap)
configure_file(${CMAKE_SOURCE_DIR}/build/unix/libc.modulemap ${CMAKE_BINARY_DIR}/include/libc.modulemap)
endif()

if (cxxmodules)
# These vars are useful when we want to compile things without cxxmodules.
set(ROOT_CXXMODULES_CXXFLAGS "${ROOT_CXXMODULES_COMMONFLAGS} -fcxx-modules" CACHE STRING "Useful to filter out the modules-related cxxflags.")
if (NOT APPLE)
Expand Down Expand Up @@ -248,11 +269,10 @@ ROOT_ADD_TEST_SUBDIRECTORY(tutorials)
# Take all the modulemap contents we collected from the packages and append them to our modulemap.
# We have to delay this because the ROOT_CXXMODULES_EXTRA_MODULEMAP_CONTENT is filled in the
# add_subdirectory calls above.
if(cxxmodules)
get_property(__modulemap_extra_content GLOBAL PROPERTY ROOT_CXXMODULES_EXTRA_MODULEMAP_CONTENT)
string(REPLACE ";" "" __modulemap_extra_content "${__modulemap_extra_content}")
file(WRITE "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" "${__modulemap_extra_content}")
endif(cxxmodules)
get_property(__modulemap_extra_content GLOBAL PROPERTY ROOT_CXXMODULES_EXTRA_MODULEMAP_CONTENT)
string(REPLACE ";" "" __modulemap_extra_content "${__modulemap_extra_content}")
file(WRITE "${CMAKE_BINARY_DIR}/include/module.modulemap.extra" "${__modulemap_extra_content}")


get_property(__allHeaders GLOBAL PROPERTY ROOT_HEADER_TARGETS)
add_custom_target(move_headers ALL DEPENDS ${__allHeaders})
Expand Down Expand Up @@ -379,10 +399,6 @@ if(testing)
add_subdirectory(roottest)
endif()
endif()
if(clingtest)
message("-- cling test suite enabled: llvm / clang symbols in libCling will be exported!")
set(CLING_INCLUDE_TESTS ON)
endif()
endif()

#---Packaging-------------------------------------------------------------------------------------
Expand Down
14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ MODULES = build interpreter/llvm interpreter/cling core/foundation \
core/clingutils core/dictgen core/metacling \
core/pcre core/clib \
core/textinput core/base core/cont core/meta core/thread \
io/rootpcm io/io math/mathcore net/net core/zip core/lzma \
io/rootpcm io/io math/mathcore net/net core/zip core/lzma core/lz4 \
math/matrix \
core/newdelete hist/hist hist/unfold tree/tree graf2d/freetype \
graf2d/mathtext graf2d/graf graf2d/gpad graf3d/g3d \
Expand Down Expand Up @@ -587,7 +587,7 @@ COREDICTHDEP = $(BASEDICTH) $(CONTH) $(METAH) $(SYSTEMDH) \
$(ZIPDICTH) $(CLIBHH) $(FOUNDATIONH) $(TEXTINPUTH)
COREDICTH = $(BASEDICTH) $(CONTH) $(METAH) $(SYSTEMDICTH) \
$(ZIPDICTH) $(CLIBHH) $(FOUNDATIONH) $(TEXTINPUTH)
COREO = $(BASEO) $(CONTO) $(FOUNDATIONO) $(METAO) $(SYSTEMO) $(ZIPO) $(LZMAO) \
COREO = $(BASEO) $(CONTO) $(FOUNDATIONO) $(METAO) $(SYSTEMO) $(ZIPO) $(LZMAO) $(LZ4O) \
$(CLIBO) $(TEXTINPUTO)

CORELIB := $(LPATH)/libCore.$(SOEXT)
Expand All @@ -606,6 +606,14 @@ CORELIBEXTRA += $(LZMALIB)
STATICEXTRALIBS += $(LZMALIB)
endif

ifneq ($(BUILTINLZ4),yes)
CORELIBEXTRA += $(LZ4LIBDIR) $(LZ4CLILIB)
STATICEXTRALIBS += $(LZ4LIBDIR) $(LZ4CLILIB)
else
CORELIBEXTRA += $(LZ4LIB)
STATICEXTRALIBS += $(LZ4LIB)
endif

##### In case shared libs need to resolve all symbols (e.g.: aix, win32) #####

ifeq ($(EXPLICITLINK),yes)
Expand Down Expand Up @@ -1237,7 +1245,7 @@ ifeq ($(CXXMODULES),yes)
ROOTPCHCXXFLAGS := $(filter-out $(ROOT_CXXMODULES_CXXFLAGS),$(ROOTPCHCXXFLAGS))
endif

$(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
$(ROOTPCH): $(MAKEPCH) $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(MAKEPCHINPUT) $(ORDER_) $(ALLLIBS)
@$(MAKEPCHINPUT) $(ROOT_SRCDIR) "$(MODULES)" $(CLINGETCPCH) -- $(ROOTPCHCXXFLAGS) $(SYSTEMDEF)
@ROOTIGNOREPREFIX=1 $(MAKEPCH) $@

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ an open system that can be dynamically extended by linking external
libraries. This makes ROOT a premier platform on which to build data
acquisition, simulation and data analysis systems.

[![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](http://www.gnu.org/licenses/lgpl-2.1) [![Test coverage](https://root.cern/files/img/coverage-badge.svg)](https://phsft-jenkins.cern.ch/job/root-nightly-master-coverage/cobertura)
[![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](http://www.gnu.org/licenses/lgpl-2.1) [![Test coverage](https://root.cern/files/img/coverage-badge.svg)](https://epsft-jenkins.cern.ch/job/root-nightly-master-coverage/cobertura)

## Build Status
| Branch | Continuous | Nightly |
|--------|------------|---------|
| master | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-master)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-master/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-master)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-master/) |
| master-noimt | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-master-noimt)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-master-noimt/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-master-noimt)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-master-noimt/) |
| v5-34-00-patches | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-v5-34-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-v5-34-00-patches/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-v5-34-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-v5-34-00-patches/) |
| v6-08-00-patches | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-v6-08-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-incremental-v6-08-00-patches/) | [![Build Status](https://phsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-v6-08-00-patches)](https://phsft-jenkins.cern.ch/view/ROOT/job/root-nightly-v6-08-00-patches/) |
| master | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-master)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-incremental-master/) | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-master)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-nightly-master/) |
| master-noimt | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-master-noimt)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-incremental-master-noimt/) | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-master-noimt)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-nightly-master-noimt/) |
| v5-34-00-patches | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-v5-34-00-patches)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-incremental-v5-34-00-patches/) | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-v5-34-00-patches)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-nightly-v5-34-00-patches/) |
| v6-08-00-patches | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-incremental-v6-08-00-patches)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-incremental-v6-08-00-patches/) | [![Build Status](https://epsft-jenkins.cern.ch/buildStatus/icon?job=root-nightly-v6-08-00-patches)](https://epsft-jenkins.cern.ch/view/ROOT/job/root-nightly-v6-08-00-patches/) |

## Live Demo
[![](https://swanserver.web.cern.ch/swanserver/images/badge_swan_white_150.png)](http://cern.ch/swanserver/cgi-bin/go?projurl=https://github.com/cernphsft/rootbinder.git)
Expand Down
18 changes: 13 additions & 5 deletions README/CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ N: Mohammad Al-Turany
E: m.al-turany@gsi.de
D: QTGSI classes

N: Guilherme Amadio
E: guilherme.amadio@cern.ch
D: TDataFrame, build system, parallel writing

N: Eric Anciant
E: eric.anciant@sodern.fr
D: TQuaternion class
Expand Down Expand Up @@ -353,16 +357,12 @@ D: rootdrawtree and TSimpleAnalysis

N: Enrico Guiraud
E: enrico.guiraud@gmail.com
D: author of the multiproc module
D: Multiproc runtime, TDataFrame

N: Thorsten Glebe
E: T.Glebe@mpi-hd.mpg.de
D: Original author of the Smatrix package

N: Sergei Gleyzer
E: Sergei.Gleyzer@cern.ch
D: TMVA

N: Piotr Golonka
E: Piotr.Golonka@cern.ch
D: class TMCParticle
Expand Down Expand Up @@ -908,6 +908,10 @@ N: Evgueni Tcherniaev
E: Evgueni.Tcherniaev@cern.ch
D: Paint3DAlgorithms used by the LEGO and SURF options

N: Enric Tejedor
E: enric.tejedor@cern.ch
D: IO, Parallelisation, Jupyter integration, TDataFrame

N: Jan Therhaag
E: therhaag@users.sourceforge.net
D: author of the TMVA package
Expand All @@ -928,6 +932,10 @@ N: Georg Troska
E: georg.troska@tu-dortmund.de
D: Enhancement of the CANDLE drawing option

N: Xavier Valls
E: xavier.valls.pla@cern.ch
D: Interfaces to the MP and MT runtimes, parallelisation, vectorisation of fits

N: Alexandre V. Vaniachine
E: AVVaniachine@lbl.gov
D: byteswapping assembler code for the i486 and up
Expand Down
12 changes: 6 additions & 6 deletions README/ReleaseNotes/empty.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ The following people have contributed to this new version:
## Core Libraries


## I/O Libraries


## TTree Libraries


## Histogram Libraries


Expand All @@ -50,9 +56,6 @@ The following people have contributed to this new version:
## RooFit Libraries


## TTree Libraries


## 2D Graphics Libraries


Expand All @@ -62,9 +65,6 @@ The following people have contributed to this new version:
## Geometry Libraries


## I/O Libraries


## Database Libraries


Expand Down
Loading