From 9f562dac8c4e6bd03e422bb80d248ffbef02157f Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 4 Nov 2026 17:10:29 +0100 Subject: [PATCH] [tmva] add header to private file_sets --- tmva/sofie/CMakeLists.txt | 91 ++++- tmva/sofie/inc/TMVA/ROperator_Reduce.hxx | 0 tmva/sofie_parsers/CMakeLists.txt | 19 +- tmva/tmva/CMakeLists.txt | 449 +++++++++++++---------- tmva/tmvagui/CMakeLists.txt | 88 +++-- 5 files changed, 408 insertions(+), 239 deletions(-) mode change 100755 => 100644 tmva/sofie/inc/TMVA/ROperator_Reduce.hxx diff --git a/tmva/sofie/CMakeLists.txt b/tmva/sofie/CMakeLists.txt index 84ddfdc7092d3..0d5be051cd468 100644 --- a/tmva/sofie/CMakeLists.txt +++ b/tmva/sofie/CMakeLists.txt @@ -9,17 +9,80 @@ ############################################################################ #Author: Sitong An, Lorenzo Moneta 10/03/2021 - +# Only the headers listed below are copied to the build tree and installed. +set(TMVASOFIE_HEADERS + TMVA/RModel.hxx + TMVA/SOFIE_common.hxx +) +# The ROperator*.hxx headers are an implementation detail of the model +# generation and stay private to this library and ROOTTMVASofieParser, which +# resolve them via the public build-interface include directory of this +# target. +set(TMVASOFIE_EXTRA_HEADERS + TMVA/ROperator.hxx + TMVA/ROperator_ArgMax.hxx + TMVA/ROperator_BasicBinary.hxx + TMVA/ROperator_BasicNary.hxx + TMVA/ROperator_BasicUnary.hxx + TMVA/ROperator_Basic_Is.hxx + TMVA/ROperator_BatchNormalization.hxx + TMVA/ROperator_Cast.hxx + TMVA/ROperator_Clip.hxx + TMVA/ROperator_Comparision.hxx + TMVA/ROperator_Concat.hxx + TMVA/ROperator_Constant.hxx + TMVA/ROperator_Conv.hxx + TMVA/ROperator_ConvTranspose.hxx + TMVA/ROperator_Einsum.hxx + TMVA/ROperator_Elu.hxx + TMVA/ROperator_Erf.hxx + TMVA/ROperator_Expand.hxx + TMVA/ROperator_EyeLike.hxx + TMVA/ROperator_GRU.hxx + TMVA/ROperator_Gather.hxx + TMVA/ROperator_GatherND.hxx + TMVA/ROperator_Gelu.hxx + TMVA/ROperator_Gemm.hxx + TMVA/ROperator_HardSigmoid.hxx + TMVA/ROperator_HardSwish.hxx + TMVA/ROperator_Identity.hxx + TMVA/ROperator_InstanceNormalization.hxx + TMVA/ROperator_LSTM.hxx + TMVA/ROperator_LayerNormalization.hxx + TMVA/ROperator_LeakyRelu.hxx + TMVA/ROperator_NonZero.hxx + TMVA/ROperator_Not.hxx + TMVA/ROperator_PRelu.hxx + TMVA/ROperator_Pad.hxx + TMVA/ROperator_Pool.hxx + TMVA/ROperator_RNN.hxx + TMVA/ROperator_Random.hxx + TMVA/ROperator_Range.hxx + TMVA/ROperator_Reduce.hxx + TMVA/ROperator_Relu.hxx + TMVA/ROperator_Reshape.hxx + TMVA/ROperator_ScatterElements.hxx + TMVA/ROperator_ScatterND.hxx + TMVA/ROperator_Selu.hxx + TMVA/ROperator_Shape.hxx + TMVA/ROperator_Sigmoid.hxx + TMVA/ROperator_Slice.hxx + TMVA/ROperator_Softmax.hxx + TMVA/ROperator_Split.hxx + TMVA/ROperator_SubGraph.hxx + TMVA/ROperator_Swish.hxx + TMVA/ROperator_Tanh.hxx + TMVA/ROperator_Tile.hxx + TMVA/ROperator_TopK.hxx + TMVA/ROperator_Transpose.hxx + TMVA/ROperator_Where.hxx +) + ROOT_STANDARD_LIBRARY_PACKAGE(ROOTTMVASofie - # Only the headers listed below are copied to the build tree and installed. - # The ROperator*.hxx headers are an implementation detail of the model - # generation and stay private to this library and ROOTTMVASofieParser, which - # resolve them via the public build-interface include directory of this - # target. + NO_GLOB_HEADERS HEADERS - TMVA/RModel.hxx - TMVA/SOFIE_common.hxx + ${TMVASOFIE_HEADERS} SOURCES src/RModel.cxx src/SOFIE_common.cxx @@ -28,6 +91,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTTMVASofie Core ) +set(RELATIVE_INC_HEADERS ${TMVASOFIE_HEADERS} ${TMVASOFIE_EXTRA_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(ROOTTMVASofie +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h +) + # Tests are not enabled unconditionally because they require BLAS if(test_tmva_sofie) ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/tmva/sofie/inc/TMVA/ROperator_Reduce.hxx b/tmva/sofie/inc/TMVA/ROperator_Reduce.hxx old mode 100755 new mode 100644 diff --git a/tmva/sofie_parsers/CMakeLists.txt b/tmva/sofie_parsers/CMakeLists.txt index 8c3942e066acc..455427e676801 100644 --- a/tmva/sofie_parsers/CMakeLists.txt +++ b/tmva/sofie_parsers/CMakeLists.txt @@ -13,9 +13,13 @@ # wire-format decoder (src/onnx.hxx), so this package has no external # dependency on protobuf / libprotobuf / protoc. +set(TMVASOFIEPARSER_HEADERS + TMVA/RModelParser_ONNX.hxx +) + ROOT_STANDARD_LIBRARY_PACKAGE(ROOTTMVASofieParser HEADERS - TMVA/RModelParser_ONNX.hxx + ${TMVASOFIEPARSER_HEADERS} SOURCES src/RModelParser_ONNX.cxx src/ParseBasicUnary.cxx @@ -83,3 +87,16 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTTMVASofieParser DEPENDENCIES ROOTTMVASofie ) + +set(RELATIVE_INC_HEADERS ${TMVASOFIEPARSER_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(ROOTTMVASofieParser +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ src/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h + src/onnx.hxx +) diff --git a/tmva/tmva/CMakeLists.txt b/tmva/tmva/CMakeLists.txt index fa195682b7409..ae470825c8d4a 100644 --- a/tmva/tmva/CMakeLists.txt +++ b/tmva/tmva/CMakeLists.txt @@ -23,197 +23,224 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set(TMVA_HEADERS + TMVA/BDTEventWrapper.h + TMVA/BinarySearchTree.h + TMVA/BinarySearchTreeNode.h + TMVA/BinaryTree.h + TMVA/CCPruner.h + TMVA/CCTreeWrapper.h + TMVA/ClassifierFactory.h + TMVA/ClassInfo.h + TMVA/Config.h + TMVA/Configurable.h + TMVA/ConvergenceTest.h + TMVA/CostComplexityPruneTool.h + TMVA/CrossEntropy.h + TMVA/CrossValidation.h + TMVA/CvSplit.h + TMVA/DataInputHandler.h + TMVA/DataLoader.h + TMVA/DataSetFactory.h + TMVA/DataSet.h + TMVA/DataSetInfo.h + TMVA/DataSetManager.h + TMVA/DecisionTree.h + TMVA/DecisionTreeNode.h + TMVA/Envelope.h + TMVA/Event.h + TMVA/ExpectedErrorPruneTool.h + TMVA/Executor.h + TMVA/Factory.h + TMVA/FitterBase.h + TMVA/GeneticAlgorithm.h + TMVA/GeneticFitter.h + TMVA/GeneticGenes.h + TMVA/GeneticPopulation.h + TMVA/GeneticRange.h + TMVA/GiniIndex.h + TMVA/GiniIndexWithLaplace.h + TMVA/HyperParameterOptimisation.h + TMVA/IFitterTarget.h + TMVA/IMethod.h + TMVA/Interval.h + TMVA/IPruneTool.h + TMVA/KDEKernel.h + TMVA/LDA.h + TMVA/LogInterval.h + TMVA/LossFunction.h + TMVA/MCFitter.h + TMVA/MethodANNBase.h + TMVA/MethodBase.h + TMVA/MethodBayesClassifier.h + TMVA/MethodBDT.h + TMVA/MethodBoost.h + TMVA/MethodCategory.h + TMVA/MethodCFMlpANN_def.h + TMVA/MethodCFMlpANN.h + TMVA/MethodCFMlpANN_Utils.h + TMVA/MethodCompositeBase.h + TMVA/MethodCrossValidation.h + TMVA/MethodCuts.h + TMVA/MethodDL.h + TMVA/MethodDNN.h + TMVA/MethodDT.h + TMVA/MethodFDA.h + TMVA/MethodFisher.h + TMVA/MethodHMatrix.h + TMVA/MethodKNN.h + TMVA/MethodLD.h + TMVA/MethodLikelihood.h + TMVA/MethodMLP.h + TMVA/MethodPDEFoam.h + TMVA/MethodPDERS.h + TMVA/MethodRuleFit.h + TMVA/MethodSVM.h + TMVA/MethodTMlpANN.h + TMVA/MinuitFitter.h + TMVA/MinuitWrapper.h + TMVA/MisClassificationError.h + TMVA/ModulekNN.h + TMVA/Monitoring.h + TMVA/MsgLogger.h + TMVA/NeuralNet.h + TMVA/Node.h + TMVA/NodekNN.h + TMVA/OptimizeConfigParameters.h + TMVA/Option.h + TMVA/OptionMap.h + TMVA/Pattern.h + TMVA/PDEFoamCell.h + TMVA/PDEFoamDecisionTreeDensity.h + TMVA/PDEFoamDecisionTree.h + TMVA/PDEFoamDensityBase.h + TMVA/PDEFoamDiscriminantDensity.h + TMVA/PDEFoamDiscriminant.h + TMVA/PDEFoamEventDensity.h + TMVA/PDEFoamEvent.h + TMVA/PDEFoam.h + TMVA/PDEFoamKernelBase.h + TMVA/PDEFoamKernelGauss.h + TMVA/PDEFoamKernelLinN.h + TMVA/PDEFoamKernelTrivial.h + TMVA/PDEFoamMultiTarget.h + TMVA/PDEFoamTargetDensity.h + TMVA/PDEFoamTarget.h + TMVA/PDEFoamVect.h + TMVA/PDF.h + TMVA/QuickMVAProbEstimator.h + TMVA/Ranking.h + TMVA/Reader.h + TMVA/RegressionVariance.h + TMVA/ResultsClassification.h + TMVA/Results.h + TMVA/ResultsMulticlass.h + TMVA/ResultsRegression.h + TMVA/ROCCalc.h + TMVA/ROCCurve.h + TMVA/RootFinder.h + TMVA/RuleCut.h + TMVA/RuleEnsemble.h + TMVA/RuleFitAPI.h + TMVA/RuleFit.h + TMVA/RuleFitParams.h + TMVA/Rule.h + TMVA/SdivSqrtSplusB.h + TMVA/SeparationBase.h + TMVA/SimulatedAnnealingFitter.h + TMVA/SimulatedAnnealing.h + TMVA/SVEvent.h + TMVA/SVKernelFunction.h + TMVA/SVKernelMatrix.h + TMVA/SVWorkingSet.h + TMVA/TActivationChooser.h + TMVA/TActivation.h + TMVA/TActivationIdentity.h + TMVA/TActivationRadial.h + TMVA/TActivationReLU.h + TMVA/TActivationSigmoid.h + TMVA/TActivationTanh.h + TMVA/Timer.h + TMVA/TNeuron.h + TMVA/TNeuronInputAbs.h + TMVA/TNeuronInputChooser.h + TMVA/TNeuronInput.h + TMVA/TNeuronInputSqSum.h + TMVA/TNeuronInputSum.h + TMVA/Tools.h + TMVA/TrainingHistory.h + TMVA/TransformationHandler.h + TMVA/TSpline1.h + TMVA/TSpline2.h + TMVA/TSynapse.h + TMVA/Types.h + TMVA/VariableDecorrTransform.h + TMVA/VariableGaussTransform.h + TMVA/VariableIdentityTransform.h + TMVA/VariableImportance.h + TMVA/VariableInfo.h + TMVA/VariableNormalizeTransform.h + TMVA/VariablePCATransform.h + TMVA/VariableRearrangeTransform.h + TMVA/VariableTransformBase.h + TMVA/VariableTransform.h + TMVA/VarTransformHandler.h + TMVA/Version.h + TMVA/Volume.h +) + +set(TMVA_EXTRA_HEADERS + TMVA/DNN/Adadelta.h + TMVA/DNN/Adagrad.h + TMVA/DNN/Adam.h + TMVA/DNN/BatchNormLayer.h + TMVA/DNN/DLMinimizers.h + TMVA/DNN/DataLoader.h + TMVA/DNN/DeepNet.h + TMVA/DNN/DenseLayer.h + TMVA/DNN/Functions.h + TMVA/DNN/GeneralLayer.h + TMVA/DNN/Layer.h + TMVA/DNN/Minimizers.h + TMVA/DNN/Net.h + TMVA/DNN/Optimizer.h + TMVA/DNN/RMSProp.h + TMVA/DNN/ReshapeLayer.h + TMVA/DNN/SGD.h + TMVA/DNN/TensorDataLoader.h + TMVA/DNN/CNN/ContextHandles.h + TMVA/DNN/CNN/ConvLayer.h + TMVA/DNN/CNN/MaxPoolLayer.h + TMVA/DNN/RNN/GRULayer.h + TMVA/DNN/RNN/LSTMLayer.h + TMVA/DNN/RNN/RNNLayer.h + TMVA/DNN/Architectures/Reference.h + TMVA/DNN/Architectures/Reference/DataLoader.h + TMVA/DNN/Architectures/Reference/TensorDataLoader.h + TMVA/DNN/Architectures/Cpu.h + TMVA/DNN/Architectures/Cpu/CpuBuffer.h + TMVA/DNN/Architectures/Cpu/CpuMatrix.h + TMVA/DNN/Architectures/Cpu/CpuTensor.h +) + +if(tmva-gpu) + list(APPEND TMVA_EXTRA_HEADERS + TMVA/DNN/Architectures/Cuda.h + TMVA/DNN/Architectures/Cuda/CudaBuffers.h + TMVA/DNN/Architectures/Cuda/CudaMatrix.h + TMVA/DNN/Architectures/Cuda/CudaTensor.h + TMVA/DNN/Architectures/Cuda/Device.h + ) + if(tmva-cudnn) + list(APPEND TMVA_EXTRA_HEADERS + TMVA/DNN/Architectures/TCudnn.h + ) + endif() +endif() + ROOT_STANDARD_LIBRARY_PACKAGE(TMVA HEADERS - TMVA/BDTEventWrapper.h - TMVA/BinarySearchTree.h - TMVA/BinarySearchTreeNode.h - TMVA/BinaryTree.h - TMVA/CCPruner.h - TMVA/CCTreeWrapper.h - TMVA/ClassifierFactory.h - TMVA/ClassInfo.h - TMVA/Config.h - TMVA/Configurable.h - TMVA/ConvergenceTest.h - TMVA/CostComplexityPruneTool.h - TMVA/CrossEntropy.h - TMVA/CrossValidation.h - TMVA/CvSplit.h - TMVA/DataInputHandler.h - TMVA/DataLoader.h - TMVA/DataSetFactory.h - TMVA/DataSet.h - TMVA/DataSetInfo.h - TMVA/DataSetManager.h - TMVA/DecisionTree.h - TMVA/DecisionTreeNode.h - TMVA/Envelope.h - TMVA/Event.h - TMVA/ExpectedErrorPruneTool.h - TMVA/Executor.h - TMVA/Factory.h - TMVA/FitterBase.h - TMVA/GeneticAlgorithm.h - TMVA/GeneticFitter.h - TMVA/GeneticGenes.h - TMVA/GeneticPopulation.h - TMVA/GeneticRange.h - TMVA/GiniIndex.h - TMVA/GiniIndexWithLaplace.h - TMVA/HyperParameterOptimisation.h - TMVA/IFitterTarget.h - TMVA/IMethod.h - TMVA/Interval.h - TMVA/IPruneTool.h - TMVA/KDEKernel.h - TMVA/LDA.h - TMVA/LogInterval.h - TMVA/LossFunction.h - TMVA/MCFitter.h - TMVA/MethodANNBase.h - TMVA/MethodBase.h - TMVA/MethodBayesClassifier.h - TMVA/MethodBDT.h - TMVA/MethodBoost.h - TMVA/MethodCategory.h - TMVA/MethodCFMlpANN_def.h - TMVA/MethodCFMlpANN.h - TMVA/MethodCFMlpANN_Utils.h - TMVA/MethodCompositeBase.h - TMVA/MethodCrossValidation.h - TMVA/MethodCuts.h - TMVA/MethodDL.h - TMVA/MethodDNN.h - TMVA/MethodDT.h - TMVA/MethodFDA.h - TMVA/MethodFisher.h - TMVA/MethodHMatrix.h - TMVA/MethodKNN.h - TMVA/MethodLD.h - TMVA/MethodLikelihood.h - TMVA/MethodMLP.h - TMVA/MethodPDEFoam.h - TMVA/MethodPDERS.h - TMVA/MethodRuleFit.h - TMVA/MethodSVM.h - TMVA/MethodTMlpANN.h - TMVA/MinuitFitter.h - TMVA/MinuitWrapper.h - TMVA/MisClassificationError.h - TMVA/ModulekNN.h - TMVA/Monitoring.h - TMVA/MsgLogger.h - TMVA/NeuralNet.h - TMVA/Node.h - TMVA/NodekNN.h - TMVA/OptimizeConfigParameters.h - TMVA/Option.h - TMVA/OptionMap.h - TMVA/Pattern.h - TMVA/PDEFoamCell.h - TMVA/PDEFoamDecisionTreeDensity.h - TMVA/PDEFoamDecisionTree.h - TMVA/PDEFoamDensityBase.h - TMVA/PDEFoamDiscriminantDensity.h - TMVA/PDEFoamDiscriminant.h - TMVA/PDEFoamEventDensity.h - TMVA/PDEFoamEvent.h - TMVA/PDEFoam.h - TMVA/PDEFoamKernelBase.h - TMVA/PDEFoamKernelGauss.h - TMVA/PDEFoamKernelLinN.h - TMVA/PDEFoamKernelTrivial.h - TMVA/PDEFoamMultiTarget.h - TMVA/PDEFoamTargetDensity.h - TMVA/PDEFoamTarget.h - TMVA/PDEFoamVect.h - TMVA/PDF.h - TMVA/QuickMVAProbEstimator.h - TMVA/Ranking.h - TMVA/Reader.h - TMVA/RegressionVariance.h - TMVA/ResultsClassification.h - TMVA/Results.h - TMVA/ResultsMulticlass.h - TMVA/ResultsRegression.h - TMVA/ROCCalc.h - TMVA/ROCCurve.h - TMVA/RootFinder.h - TMVA/RuleCut.h - TMVA/RuleEnsemble.h - TMVA/RuleFitAPI.h - TMVA/RuleFit.h - TMVA/RuleFitParams.h - TMVA/Rule.h - TMVA/SdivSqrtSplusB.h - TMVA/SeparationBase.h - TMVA/SimulatedAnnealingFitter.h - TMVA/SimulatedAnnealing.h - TMVA/SVEvent.h - TMVA/SVKernelFunction.h - TMVA/SVKernelMatrix.h - TMVA/SVWorkingSet.h - TMVA/TActivationChooser.h - TMVA/TActivation.h - TMVA/TActivationIdentity.h - TMVA/TActivationRadial.h - TMVA/TActivationReLU.h - TMVA/TActivationSigmoid.h - TMVA/TActivationTanh.h - TMVA/Timer.h - TMVA/TNeuron.h - TMVA/TNeuronInputAbs.h - TMVA/TNeuronInputChooser.h - TMVA/TNeuronInput.h - TMVA/TNeuronInputSqSum.h - TMVA/TNeuronInputSum.h - TMVA/Tools.h - TMVA/TrainingHistory.h - TMVA/TransformationHandler.h - TMVA/TSpline1.h - TMVA/TSpline2.h - TMVA/TSynapse.h - TMVA/Types.h - TMVA/VariableDecorrTransform.h - TMVA/VariableGaussTransform.h - TMVA/VariableIdentityTransform.h - TMVA/VariableImportance.h - TMVA/VariableInfo.h - TMVA/VariableNormalizeTransform.h - TMVA/VariablePCATransform.h - TMVA/VariableRearrangeTransform.h - TMVA/VariableTransformBase.h - TMVA/VariableTransform.h - TMVA/VarTransformHandler.h - TMVA/Version.h - TMVA/Volume.h - # TMVA/DNN/Adadelta.h - # TMVA/DNN/Adagrad.h - # TMVA/DNN/Adam.h - # TMVA/DNN/BatchNormLayer.h - # TMVA/DNN/DataLoader.h - # TMVA/DNN/DeepNet.h - # TMVA/DNN/DenseLayer.h - # TMVA/DNN/DLMinimizers.h - # TMVA/DNN/Functions.h - # TMVA/DNN/GeneralLayer.h - # TMVA/DNN/ReshapeLayer.h - # TMVA/DNN/RMSProp.h - # TMVA/DNN/SGD.h - # TMVA/DNN/TensorDataLoader.h - # TMVA/DNN/CNN/ContextHandles.h - # TMVA/DNN/CNN/ConvLayer.h - # TMVA/DNN/CNN/MaxPoolLayer.h - # TMVA/DNN/RNN/RNNLayer.h - # TMVA/DNN/Architectures/Reference.h - # TMVA/DNN/Architectures/Reference/DataLoader.h - # TMVA/DNN/Architectures/Reference/TensorDataLoader.h - # TMVA/DNN/Architectures/Cpu.h - # TMVA/DNN/Architectures/Cpu/CpuBuffer.h - # TMVA/DNN/Architectures/Cpu/CpuMatrix.h - # TMVA/DNN/Architectures/Cpu/CpuTensor.h - ${TMVA_EXTRA_HEADERS} + ${TMVA_HEADERS} SOURCES src/BDTEventWrapper.cxx src/BinarySearchTree.cxx @@ -428,18 +455,38 @@ if(tmva-gpu) endif() endif(tmva-gpu) +set(RELATIVE_INC_HEADERS ${TMVA_HEADERS} ${TMVA_EXTRA_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(TMVA +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/TMVA/NeuralNet.icc + inc/LinkDef.h + inc/LinkDef1.h + inc/LinkDef2.h + inc/LinkDef3.h + inc/LinkDef4.h +) + if(dataframe) -ROOT_STANDARD_LIBRARY_PACKAGE(TMVAUtils - NO_INSTALL_HEADERS - HEADERS +set(TMVAUTILS_HEADERS TMVA/RReader.hxx TMVA/RInferenceUtils.hxx TMVA/RBDT.hxx TMVA/RSofieReader.hxx +) - SOURCES +ROOT_STANDARD_LIBRARY_PACKAGE(TMVAUtils + NO_INSTALL_HEADERS + HEADERS + ${TMVAUTILS_HEADERS} - src/RBDT.cxx + SOURCES + src/RBDT.cxx DEPENDENCIES TMVA ROOTDataFrame ROOTVecOps @@ -453,6 +500,20 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TMVAUtils ) # RBDT::LoadXGBoost parses the XGBoost native JSON serialization. target_link_libraries(TMVAUtils PRIVATE nlohmann_json::nlohmann_json) + +set(RELATIVE_INC_HEADERS ${TMVAUTILS_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(TMVAUtils +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDefUtils.h +) + + endif() ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/tmva/tmvagui/CMakeLists.txt b/tmva/tmvagui/CMakeLists.txt index 0fc2887fceb96..5c3f1e81a4120 100644 --- a/tmva/tmvagui/CMakeLists.txt +++ b/tmva/tmvagui/CMakeLists.txt @@ -14,44 +14,48 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set(TMVAGUI_HEADERS + TMVA/BDT.h + TMVA/BDTControlPlots.h + TMVA/BDT_Reg.h + TMVA/BoostControlPlots.h + TMVA/CorrGui.h + TMVA/CorrGuiMultiClass.h + TMVA/MovieMaker.h + TMVA/PlotFoams.h + TMVA/TMVAGui.h + TMVA/TMVAMultiClassGui.h + TMVA/TMVARegGui.h + TMVA/annconvergencetest.h + TMVA/compareanapp.h + TMVA/correlations.h + TMVA/correlationsMultiClass.h + TMVA/correlationscatters.h + TMVA/correlationscattersMultiClass.h + TMVA/deviations.h + TMVA/efficiencies.h + TMVA/efficienciesMulticlass.h + TMVA/likelihoodrefs.h + TMVA/mvaeffs.h + TMVA/mvas.h + TMVA/mvasMulticlass.h + TMVA/mvaweights.h + TMVA/network.h + TMVA/paracoor.h + TMVA/probas.h + TMVA/regression_averagedevs.h + TMVA/rulevis.h + TMVA/rulevisCorr.h + TMVA/rulevisHists.h + TMVA/tmvaglob.h + TMVA/training_history.h + TMVA/variables.h + TMVA/variablesMultiClass.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(TMVAGui HEADERS - TMVA/BDT.h - TMVA/BDTControlPlots.h - TMVA/BDT_Reg.h - TMVA/BoostControlPlots.h - TMVA/CorrGui.h - TMVA/CorrGuiMultiClass.h - TMVA/MovieMaker.h - TMVA/PlotFoams.h - TMVA/TMVAGui.h - TMVA/TMVAMultiClassGui.h - TMVA/TMVARegGui.h - TMVA/annconvergencetest.h - TMVA/compareanapp.h - TMVA/correlations.h - TMVA/correlationsMultiClass.h - TMVA/correlationscatters.h - TMVA/correlationscattersMultiClass.h - TMVA/deviations.h - TMVA/efficiencies.h - TMVA/efficienciesMulticlass.h - TMVA/likelihoodrefs.h - TMVA/mvaeffs.h - TMVA/mvas.h - TMVA/mvasMulticlass.h - TMVA/mvaweights.h - TMVA/network.h - TMVA/paracoor.h - TMVA/probas.h - TMVA/regression_averagedevs.h - TMVA/rulevis.h - TMVA/rulevisCorr.h - TMVA/rulevisHists.h - TMVA/tmvaglob.h - TMVA/training_history.h - TMVA/variables.h - TMVA/variablesMultiClass.h + ${TMVAGUI_HEADERS} SOURCES src/BDTControlPlots.cxx src/BoostControlPlots.cxx @@ -104,3 +108,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TMVAGui Core ${EXTRA_DICT_OPTS} ) + +set(RELATIVE_INC_HEADERS ${TMVAGUI_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(TMVAGui +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h +)