Skip to content

Commit 68035c4

Browse files
committed
[proof] Remove Proof
1 parent e994358 commit 68035c4

File tree

346 files changed

+318
-105114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

346 files changed

+318
-105114
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ interpreter/cling/tools/packaging @vgvassilev
3232
/misc/ @dpiparo
3333
/montecarlo/ @dpiparo
3434
/net/ @gganis
35-
/proof/ @gganis
3635
/roofit/ @lmoneta @guitargeek
3736
/rootx/ @dpiparo
3837
/sql/ @pcanal @linev

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,6 @@ add_subdirectory (misc)
409409
add_subdirectory (main)
410410
add_subdirectory (bindings)
411411
add_subdirectory (sql)
412-
if(proof)
413-
add_subdirectory(proof)
414-
endif()
415412
if(tmva)
416413
add_subdirectory(tmva)
417414
endif()

README/README.AUTH

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ table (column Sfx) to the specified protocol: for example
2626

2727
TFile *f = TFile::Open("roots://host.doma.in/~fserv/TheFile.root","read")
2828

29-
requires the use of the SRP method, and
30-
31-
gROOT->Proof("proofk://lxplus079.cern.ch")
32-
33-
asks for Kerberos authentication in starting a proof session on node
34-
lxplus079.cern.ch.
29+
requires the use of the SRP method.
3530

3631
Defaults can be changed on {host, user} base via the file $HOME/.rootauthrc;
3732
the header of the file $ROOTSYS/etc/system.rootauthrc, automatically generated
@@ -77,52 +72,6 @@ the server sends back the list of the remaining methods accepted (if any); the
7772
client compares the server list with its own list of remaining methods and
7873
makes a new attempt if the overlap of the two lists is not empty; and so on.
7974

80-
81-
Slave/Data servers authentication during a PROOF session
82-
========================================================
83-
84-
During a PROOF session there is the potential problem of Master/Slave or
85-
Slave/Data_Server authentication. For slaves, the list of methods to be tried
86-
is specified in the proof.conf file as a list of methods short names. However,
87-
before build the corresponding entry in THostAuth (see below) TProofServ checks
88-
that the method can be applied, i.e. that there exist valid credentials.
89-
The way the latter are transmitted depends on the method and on the
90-
Client/Master authentication method.
91-
92-
* UsrPwd: to authenticate 'usrpwd' to slaves, the master needs the relevant
93-
entry in the .netrc or .rootnetrc files; however, if the
94-
client/master authentication was also 'usrpwd', the password is
95-
already present on the master process and is used for later clear
96-
authentications.
97-
98-
* SRP: to authenticate 'SRP' to slaves, the master needs the relevant entry
99-
in the .netrc or .rootnetrc files; the syntax is the same as for
100-
'usrpwd' authentication with the keyword 'secure' at the place of
101-
'machine'. However, if the client/master authentication was also
102-
'SRP', the master can receive the password from the client; the
103-
password is sent encrypted with the internal RSA key generated for
104-
the session. To use this option, set 'Proofd.SendSRPPwd 1' in your
105-
.rootrc (default is 0).
106-
107-
* Krb5/Globus to authenticate Krb5/Globus to slaves, the master needs globus
108-
credentials; this is possible (and automatic) only if the
109-
client/master authentication was also Krb5/Globus.
110-
111-
* UidGid to authenticate 'uidgid' to slaves, the user must have the same
112-
(uid,gid) on master and slaves.
113-
114-
Negotiation is active also between master and slaves, so asking for 'uidgid'
115-
first may accelerate the authentication process if the server accepts it.
116-
117-
The method actually used is listed by gProof->Print("a").
118-
119-
If the slaves need to access data servers which are not part of the proof
120-
cluster, the login info vis-a-vis of these may be specified with the proofserv
121-
card in the .rootauthrc files (see below and etc/system.rootauthrc for
122-
details); the collected information is then transmitted to all the active
123-
slaves upon creation.
124-
125-
12675
Entries in .rootrc
12776
==================
12877

@@ -243,8 +192,6 @@ classes to display/modify/create THostAuth interactively.
243192
<opt> = "s" list of active security context (default)
244193
"h" the content of the instantiated THostAuth objects in
245194
standard list
246-
"p" the content of the instantiated THostAuth objects in
247-
the proof list
248195

249196
Example:
250197

@@ -308,13 +255,13 @@ Info in <THostAuth::Print>: + Method: 1 (SRP) Ok:0 Ko:0 Dets:pt:no ru:1 us:gani
308255
Info in <THostAuth::Print>: +------------------------------------------------------------------+
309256
Info in <::Print>: +---------------------------- END ---------------------------------+
310257

311-
This is the list build following the 'proofserv' directives in .rootauthrc
258+
This is the list build following the directives in .rootauthrc
312259

313260
* THostAuth *TAuthenticate::GetHostAuth(<host_fqdn>,<user>,<opt>,<kExact>);
314261

315262
Returns a pointer to the THostAuth object pertaining to (host,user) if it
316263
exist, 0 otherwise. If <opt>="R" (default) the search is performed in the
317-
standard list, if <opt>="P" in the proof list. The last argument <kExact>
264+
standard list. The last argument <kExact>
318265
is a pointer to an integer: if defined (.ne. 0) the pointed location is
319266
filled with 1 if the match is exact, with 0 if an matching entry with wild
320267
cards was found.

README/README.SELECTOR

Lines changed: 16 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,17 @@ derives from the TSelector class and implements the member functions
1010
with specific analysis algorithms. When running the analysis, ROOT
1111
calls the member functions in a well defined sequence and with well
1212
defined arguments. By following the model this analysis class can be
13-
used to process data sequentialy on a local workstation and in batch
14-
or in parallel using PROOF.
13+
used to process data sequentially.
1514

1615
ROOT can generate a skeleton class for a given TTree. This skeleton
1716
class is a good a starting point for the analysis class. It is
1817
recommended that users follow this method.
1918

20-
When running with PROOF a number of "slave" processes are used to
21-
analyze the events. The user creates a PROOF session from the client
22-
workstation which allocates a number of slaves. The slaves instantiate
23-
an object of the users analysis class. Each slave processes a fraction
24-
of the events as determined by the relative performance of the servers
25-
on which the slaves are running. The PROOF system takes care of distributing
26-
the work. It calls the TSelector functions in each slave. It also
27-
distributes the input list to the slaves. This is a TList with streamable
28-
objects provided in the client. After processing the events PROOF combines
29-
the partial results of the slaves and returns the consolidated objects
30-
(e.g. histograms) to the client session.
31-
3219
The two sequences below show the order in which the TSelector member
3320
functions are called when either processing a tree or chain on a single
34-
workstation or when using PROOF to process trees or collections of keyed
35-
objects on a distributed system. When running on a sequential query
36-
the user calls TTree::Process() and TChain::Process(), when using PROOF
37-
the user calls TDSet::Process() (a few other entry points are available
38-
as well). Each of the member functions is described in detail after the
21+
workstation. When running on a sequential query
22+
the user calls TTree::Process() and TChain::Process().
23+
Each of the member functions is described in detail after the
3924
call sequences.
4025

4126

@@ -57,29 +42,6 @@ Init()
5742
SlaveTerminate()
5843
Terminate()
5944

60-
61-
Distributed, parallel query, using PROOF:
62-
63-
++ CLIENT Session ++ ++ (n) SLAVES ++
64-
Begin()
65-
SlaveBegin()
66-
Init()
67-
Notify()
68-
Process()
69-
...
70-
Process()
71-
...
72-
Init()
73-
Notify()
74-
Process()
75-
...
76-
Process()
77-
...
78-
SlaveTerminate()
79-
Terminate()
80-
81-
82-
8345
==============================================================================
8446
Main Framework Functions
8547
==============================================================================
@@ -89,18 +51,12 @@ The Begin() and SlaveBegin() member functions
8951

9052
The Begin() function is called at the start of the query. It always runs
9153
in the client ROOT session. The SlaveBegin() function is either called
92-
in the client or when running with PROOF, on each of the slaves.
54+
in the client.
9355
All initialization that is needed for Process() (see below) must therefore
9456
be put in SlaveBegin(). Code which needs to access the local client
9557
environment, e.g. graphics or the filesystem must be put in Begin().
96-
When running with PROOF the input list (fInput) is distributed to the
97-
slaves after Begin() returns and before SlaveBegin() is called.
98-
This way objects on the client can be made available to the
99-
TSelector instances in the slaves.
10058

101-
The tree argument is deprecated. (In the case of PROOF the tree is not
102-
available on the client and 0 will be passed. The Init() function should
103-
be used to implement operations depending on the tree)
59+
The tree argument is deprecated.
10460

10561
Signature:
10662

@@ -115,8 +71,7 @@ The Init() member function
11571
The Init() function is called when the selector needs to initialize
11672
a new tree or chain. Typically here the branch addresses of the tree
11773
will be set. It is normally not necessary to make changes to the generated
118-
code, but the routine can be extended by the user if needed. Init() will
119-
be called many times when running with PROOF.
74+
code, but the routine can be extended by the user if needed.
12075

12176
Signature:
12277

@@ -127,8 +82,8 @@ The Notify() member function
12782
----------------------------
12883

12984
The Notify() function is called when a new file is opened. This can be either
130-
for a new TTree in a TChain or when when a new TTree is started when using
131-
PROOF. Typically here the branch pointers will be retrieved. It is normaly
85+
for a new TTree in a TChain.
86+
Typically here the branch pointers will be retrieved. It is normally
13287
not necessary to make changes to the generated code, but the routine
13388
can be extended by the user if needed.
13489

@@ -140,13 +95,11 @@ Signature:
14095
The Process() member function
14196
-----------------------------
14297

143-
The Process() function is called for each entry in the tree (or possibly
144-
keyed object in the case of PROOF) to be processed. The entry argument
98+
The Process() function is called for each entry in the tree
99+
to be processed. The entry argument
145100
specifies which entry in the currently loaded tree is to be processed.
146101
It can be passed to either TTree::GetEntry() or TBranch::GetEntry()
147-
to read either all or the required parts of the data. When processing
148-
keyed objects with PROOF, the object is already loaded and is available
149-
via the fObject pointer.
102+
to read either all or the required parts of the data.
150103

151104
This function should contain the "body" of the analysis. It can contain
152105
simple or elaborate selection criteria, run algorithms on the data
@@ -161,11 +114,7 @@ The SlaveTerminate() and Terminate() member functions
161114
-----------------------------------------------------
162115

163116
The SlaveTerminate() function is called after all entries or objects
164-
have been processed. When running with PROOF it is executed by
165-
each of the slaves. It can be used to do post processing before the
166-
partial results of the slaves are merged. After SlaveTerminate()
167-
the objects in the fOutput lists in the slaves are combined by the
168-
PROOF system and returned to the client ROOT session.
117+
have been processed.
169118
The Terminate() function is the last function to be called during
170119
a query. It always runs on the client, it can be used to present
171120
the results graphically or save the results to file.
@@ -198,8 +147,7 @@ Signature:
198147
The SetInputList() member function
199148
----------------------------------
200149

201-
Setter for the input list of objects to be transfered to the
202-
remote PROOF servers. The input list is transfered after the execution
150+
The input list is transfered after the execution
203151
of the Begin() function, so objects can still be added in Begin() to
204152
this list. These objects are then available during the selection process
205153
(e.g. predefined histograms, etc.). Does not transfer ownership.
@@ -214,10 +162,8 @@ The GetOutputList() member function
214162

215163
Getter for the output list of objects to be transfered back to the
216164
client. The output list on each slave is transfered back to the client
217-
session after the execution of the SlaveTerminate() function. The PROOF
218-
master server merges the objects from the slave output lists in a single
219-
output list (merging partial objects into a single one). Ownership remains
220-
with the selector. Each query will clear this list.
165+
session after the execution of the SlaveTerminate() function.
166+
Ownership remains with the selector. Each query will clear this list.
221167

222168
Signature:
223169

README/ReleaseNotes/empty.md

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -69,62 +69,24 @@ The following people have contributed to this new version:
6969

7070
## Deprecation and Removal
7171

72+
## Python Interface
7273

73-
## Core Libraries
74+
## I/O
7475

76+
## Core
7577

76-
## I/O Libraries
78+
## Histograms
7779

80+
## Math
7881

79-
## TTree Libraries
82+
## RooFit
8083

84+
## Graphics and GUI
8185

82-
## Histogram Libraries
86+
## Geometry
8387

88+
## Documentation and Examples
8489

85-
## Math Libraries
86-
87-
88-
## RooFit Libraries
89-
90-
## Graphics Backends
91-
92-
## 2D Graphics Libraries
93-
94-
95-
## 3D Graphics Libraries
96-
97-
98-
## Geometry Libraries
99-
100-
101-
## Database Libraries
102-
103-
104-
## Networking Libraries
105-
106-
107-
## GUI Libraries
108-
109-
110-
## Montecarlo Libraries
111-
112-
113-
## PROOF Libraries
114-
115-
116-
## Language Bindings
117-
118-
119-
## JavaScript ROOT
120-
121-
122-
## Tutorials
123-
124-
125-
## Class Reference Guide
126-
127-
128-
## Build, Configuration and Testing Infrastructure
90+
## Build, Configuration and Testing
12991

13092

README/ReleaseNotes/v638/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* The build options `mysql`, `odbc` and `pgsql`, that were deprecated in ROOT 6.36, are now removed.
66
* The `TGLWSIncludes.h` header is deprecated and will be removed in ROOT 6.40
77
* The `ROOT::Math::TDataPointN` class that can be used with the `ROOT::Math::KDETree` was removed. Use the templated `TDataPoint<N>` instead.
8+
* The Parallel ROOT Facility, `PROOF`, has been removed from the repository.
89

910
## Core Libraries
1011
* Behavior change: when selecting a template instantiation for a dictionary, all the template arguments have to be fully defined - the forward declarations are not enough any more. The error prompted by the dictionary generator will be `Warning: Unused class rule: MyTemplate<MyFwdDeclaredClass>`.

bindings/jupyroot/python/JupyROOT/helpers/cppcompleter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ class CppCompleter(object):
8686
TROOT::IsLineProcessing
8787
TROOT::IsModified
8888
TROOT::IsOnHeap
89-
TROOT::IsProofServ
9089
TROOT::IsRootFile
9190
TROOT::IsSortable
9291
TROOT::IsWebDisplay

0 commit comments

Comments
 (0)