Skip to content

[ci] Set r=ON where possible #20305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[ci] Set r=ON where possible #20305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
152798a
[Math] Fix variable length array warning in RMinimzer
guitargeek Nov 6, 2025
3e860a5
[r] Avoid suggest-override warnings in R bindings
guitargeek Nov 6, 2025
28a5dfa
[ci] Set `r=ON` where possible
guitargeek Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/alma10.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ builtin_vdt=ON
builtin_zlib=ON
builtin_zstd=ON
pythia8=ON
r=OFF
tmva-sofie=ON
2 changes: 1 addition & 1 deletion .github/workflows/root-ci-config/buildconfig/global.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ opengl=ON
pyroot=ON
pythia8=OFF
qt6web=OFF
r=OFF
r=ON
roofit=ON
roofit_multiprocess=ON
root7=ON
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/mac-beta.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ builtin_zstd=ON
check_connection=ON
cocoa=ON
minuit2_omp=OFF
r=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
x11=OFF
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/mac14.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ builtin_zstd=ON
cocoa=ON
fortran=OFF
minuit2_omp=OFF
r=OFF
test_distrdf_dask=OFF
test_distrdf_pyspark=OFF
tmva-sofie=ON
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/mac15.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ builtin_zeromq=ON
builtin_zstd=ON
cocoa=ON
minuit2_omp=OFF
r=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
tmva-sofie=ON
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/mac26.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ builtin_zstd=ON
check_connection=ON
cocoa=ON
minuit2_omp=OFF
r=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
x11=OFF
1 change: 1 addition & 0 deletions .github/workflows/root-ci-config/buildconfig/windows10.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ minuit2_mpi=OFF
minuit2_omp=OFF
pyroot2=OFF
pyroot3=ON
r=OFF
roofit_multiprocess=OFF
runtime_cxxmodules=OFF
ssl=OFF
Expand Down
1 change: 1 addition & 0 deletions bindings/r/inc/RExports.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#pragma GCC diagnostic ignored "-Woverloaded-virtual"
#pragma GCC diagnostic ignored "-Wextra"
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wsuggest-override"
// disable warning for macos
#if defined(__APPLE__)
#pragma GCC diagnostic ignored "-Wnonportable-include-path"
Expand Down
2 changes: 1 addition & 1 deletion bindings/r/inc/TRDataFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ namespace ROOT {
print(df[label]);
}
}
ClassDef(TRDataFrame, 0) //
ClassDefOverride(TRDataFrame, 0) //
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion bindings/r/inc/TRFunctionExport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ namespace ROOT {
f = new TRInternalFunction(fun);
}

ClassDef(TRFunctionExport, 0) //
ClassDefOverride(TRFunctionExport, 0) //
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion bindings/r/inc/TRFunctionImport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ namespace ROOT {
return (*f)();
}
#include<TRFunctionImport__oprtr.h>
ClassDef(TRFunctionImport, 0) //
ClassDefOverride(TRFunctionImport, 0) //
};

template<> inline TRObject::operator TRFunctionImport()
Expand Down
2 changes: 1 addition & 1 deletion bindings/r/inc/TRInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ namespace ROOT {
*/
static TRInterface *InstancePtr();

ClassDef(TRInterface, 0)
ClassDefOverride(TRInterface, 0)
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion bindings/r/inc/TRObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ namespace ROOT {
return T();
}
}
ClassDef(TRObject, 0) //
ClassDefOverride(TRObject, 0) //
};

}
Expand Down
5 changes: 2 additions & 3 deletions math/rtools/src/RMinimizer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ namespace ROOT {
TVectorD mingradfunction(TVectorD y){
unsigned int size = y.GetNoElements();
const double * yy = y.GetMatrixArray();
double z[size];
gGradFunction->Gradient(yy,z);
TVectorD zz(size,z);
TVectorD zz(size);
gGradFunction->Gradient(yy,zz.data());
return zz;
}

Expand Down
30 changes: 15 additions & 15 deletions tmva/rmva/inc/TMVA/MethodC50.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,34 @@ namespace TMVA {


~MethodC50(void);
void Train();
void Train() override;
// options treatment
void Init();
void DeclareOptions();
void ProcessOptions();
void Init() override;
void DeclareOptions() override;
void ProcessOptions() override;
// create ranking
const Ranking *CreateRanking()
const Ranking *CreateRanking() override
{
return nullptr; // = 0;
}


Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;

// performs classifier testing
virtual void TestClassification();
void TestClassification() override;


Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
virtual void MakeClass(const TString &classFileName = TString("")) const; //required for model persistence
Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;
void MakeClass(const TString &classFileName = TString("")) const override; //required for model persistence
using MethodBase::ReadWeightsFromStream;
// the actual "weights"
virtual void AddWeightsXMLTo(void * /*parent*/) const {} // = 0;
virtual void ReadWeightsFromXML(void * /*weight*/) {} // = 0;
virtual void ReadWeightsFromStream(std::istream &) {} //= 0; // backward compatibility
void AddWeightsXMLTo(void * /*parent*/) const override {} // = 0;
void ReadWeightsFromXML(void * /*weight*/) override {} // = 0;
void ReadWeightsFromStream(std::istream &) override {} //= 0; // backward compatibility

// signal/background classification response for all current set of data
virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;

void ReadModelFromFile();
private :
Expand Down Expand Up @@ -109,9 +109,9 @@ namespace TMVA {


// get help message text
void GetHelpMessage() const;
void GetHelpMessage() const override;

ClassDef(MethodC50, 0)
ClassDefOverride(MethodC50, 0)
};
} // namespace TMVA
#endif
28 changes: 14 additions & 14 deletions tmva/rmva/inc/TMVA/MethodRSNNS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,36 +45,36 @@ namespace TMVA {


~MethodRSNNS(void);
void Train();
void Train() override;
// options treatment
void Init();
void DeclareOptions();
void ProcessOptions();
void Init() override;
void DeclareOptions() override;
void ProcessOptions() override;
// create ranking
const Ranking *CreateRanking()
const Ranking *CreateRanking() override
{
return nullptr; // = 0;
}


Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;

// performs classifier testing
virtual void TestClassification();
void TestClassification() override;


Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;

using MethodBase::ReadWeightsFromStream;
// the actual "weights"
virtual void AddWeightsXMLTo(void * /*parent*/) const {} // = 0;
virtual void ReadWeightsFromXML(void * /*wghtnode*/) {} // = 0;
virtual void ReadWeightsFromStream(std::istream &) {} //= 0; // backward compatibility
void AddWeightsXMLTo(void * /*parent*/) const override {} // = 0;
void ReadWeightsFromXML(void * /*wghtnode*/) override {} // = 0;
void ReadWeightsFromStream(std::istream &) override {} //= 0; // backward compatibility

void ReadModelFromFile();

// signal/background classification response for all current set of data
virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;

private :
DataSetManager *fDataSetManager; // DSMTEST
Expand Down Expand Up @@ -115,9 +115,9 @@ namespace TMVA {
ROOT::R::TRFunctionImport asfactor;
ROOT::R::TRObject *fModel;
// get help message text
void GetHelpMessage() const;
void GetHelpMessage() const override;

ClassDef(MethodRSNNS, 0)
ClassDefOverride(MethodRSNNS, 0)
};
} // namespace TMVA
#endif
28 changes: 14 additions & 14 deletions tmva/rmva/inc/TMVA/MethodRSVM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,35 @@ namespace TMVA {


~MethodRSVM(void);
void Train();
void Train() override;
// options treatment
void Init();
void DeclareOptions();
void ProcessOptions();
void Init() override;
void DeclareOptions() override;
void ProcessOptions() override;
// create ranking
const Ranking *CreateRanking()
const Ranking *CreateRanking() override
{
return nullptr; // = 0;
}


Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;

// performs classifier testing
virtual void TestClassification();
void TestClassification() override;


Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;

using MethodBase::ReadWeightsFromStream;
// the actual "weights"
virtual void AddWeightsXMLTo(void * /*parent*/) const {} // = 0;
virtual void ReadWeightsFromXML(void * /*wghtnode*/) {} // = 0;
virtual void ReadWeightsFromStream(std::istream &) {} //= 0; // backward compatibility
void AddWeightsXMLTo(void * /*parent*/) const override {} // = 0;
void ReadWeightsFromXML(void * /*wghtnode*/) override {} // = 0;
void ReadWeightsFromStream(std::istream &) override {} //= 0; // backward compatibility
void ReadModelFromFile();

// signal/background classification response for all current set of data
virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;

private :
DataSetManager *fDataSetManager; // DSMTEST
Expand Down Expand Up @@ -130,9 +130,9 @@ namespace TMVA {
ROOT::R::TRFunctionImport asfactor;
ROOT::R::TRObject *fModel;
// get help message text
void GetHelpMessage() const;
void GetHelpMessage() const override;

ClassDef(MethodRSVM, 0)
ClassDefOverride(MethodRSVM, 0)
};
} // namespace TMVA
#endif
30 changes: 15 additions & 15 deletions tmva/rmva/inc/TMVA/MethodRXGB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,36 +45,36 @@ namespace TMVA {


~MethodRXGB(void);
void Train();
void Train() override;
// options treatment
void Init();
void DeclareOptions();
void ProcessOptions();
void Init() override;
void DeclareOptions() override;
void ProcessOptions() override;
// create ranking
const Ranking *CreateRanking()
const Ranking *CreateRanking() override
{
return nullptr; // = 0;
}


Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets);
Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) override;

// performs classifier testing
virtual void TestClassification();
void TestClassification() override;


Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr);
virtual void MakeClass(const TString &classFileName = TString("")) const; //required for model persistence
Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) override;
void MakeClass(const TString &classFileName = TString("")) const override; //required for model persistence
using MethodBase::ReadWeightsFromStream;
// the actual "weights"
virtual void AddWeightsXMLTo(void * /*parent*/) const {} // = 0;
virtual void ReadWeightsFromXML(void * /*wghtnode*/) {} // = 0;
virtual void ReadWeightsFromStream(std::istream &) {} //= 0; // backward compatibility
void AddWeightsXMLTo(void * /*parent*/) const override {} // = 0;
void ReadWeightsFromXML(void * /*wghtnode*/) override {} // = 0;
void ReadWeightsFromStream(std::istream &) override {} //= 0; // backward compatibility

void ReadModelFromFile();

// signal/background classification response for all current set of data
virtual std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false);
std::vector<Double_t> GetMvaValues(Long64_t firstEvt = 0, Long64_t lastEvt = -1, Bool_t logProgress = false) override;

private :
DataSetManager *fDataSetManager; // DSMTEST
Expand Down Expand Up @@ -104,9 +104,9 @@ namespace TMVA {


// get help message text
void GetHelpMessage() const;
void GetHelpMessage() const override;

ClassDef(MethodRXGB, 0)
ClassDefOverride(MethodRXGB, 0)
};
} // namespace TMVA
#endif
22 changes: 1 addition & 21 deletions tmva/rmva/inc/TMVA/RMethodBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,7 @@ namespace TMVA {
RMethodBase(Types::EMVA methodType,
DataSetInfo &dsi,
const TString &weightFile, ROOT::R::TRInterface &_r = ROOT::R::TRInterface::Instance());

// default destructur
virtual ~RMethodBase() {};
virtual void Train() = 0;
// options treatment
virtual void Init() = 0;
virtual void DeclareOptions() = 0;
virtual void ProcessOptions() = 0;
// create ranking
virtual const Ranking *CreateRanking() = 0;

virtual Double_t GetMvaValue(Double_t *errLower = nullptr, Double_t *errUpper = nullptr) = 0;

Bool_t HasAnalysisType(Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets) = 0;
protected:
// the actual "weights"
virtual void AddWeightsXMLTo(void *parent) const = 0;
virtual void ReadWeightsFromXML(void *wghtnode) = 0;
virtual void ReadWeightsFromStream(std::istream &) = 0; // backward compatibility
virtual void ReadWeightsFromStream(TFile &) {} // backward compatibility


void LoadData();//Read data from Data() Aand DataInfo() to Dataframes and Vectors
protected:
Expand All @@ -97,7 +77,7 @@ namespace TMVA {
ROOT::R::TRDataFrame fDfSpectators;

private:
ClassDef(RMethodBase, 0) // Virtual base class for all TMVA method
ClassDefOverride(RMethodBase, 0) // Virtual base class for all TMVA method

};
} // namespace TMVA
Expand Down
Loading