[tmva][tutorials] Fix dependency of tutorials

Fix the dependency of Python and C++ tutorials using the Higgs_trained_model.h5 file
lmoneta · Apr 3, 2024 · 3990d95 · 3990d95
1 parent 406832b
commit 3990d95
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
@@ -570,19 +570,11 @@ set (tmva-tmva101_Training-depends tutorial-tmva-tmva100_DataPreparation-py)
 set (tmva-tmva102_Testing-depends tutorial-tmva-tmva101_Training-py)
 set (tmva-tmva003_RReader-depends tutorial-tmva-TMVAClassification)
 set (tmva-tmva004_RStandardScaler-depends tutorial-tmva-tmva003_RReader)
-if (PY_TORCH_FOUND)
-  set (tmva-pytorch-ApplicationClassificationPyTorch-depends tutorial-tmva-pytorch-ClassificationPyTorch-py)
-  set (tmva-pytorch-RegressionPyTorch-depends tutorial-tmva-pytorch-ApplicationClassificationPyTorch-py)
-  set (tmva-pytorch-ApplicationRegressionPyTorch-depends tutorial-tmva-pytorch-RegressionPyTorch-py)
-endif()
 if (PY_KERAS_FOUND)
   set (tmva-TMVA_SOFIE_Keras_HiggsModel-depends tutorial-tmva-TMVA_Higgs_Classification)
   set (tmva-TMVA_SOFIE_RDataFrame-depends tutorial-tmva-TMVA_SOFIE_Keras_HiggsModel)
   set (tmva-TMVA_SOFIE_RDataFrame_JIT-depends tutorial-tmva-TMVA_SOFIE_Keras_HiggsModel)
-  set (tmva-TMVA_SOFIE_Inference-depends tutorial-tmva-TMVA_SOFIE_RDataFrame_JIT)
-  set (tmva-TMVA_SOFIE_RSofieReader-depends tutorial-tmva-TMVA_SOFIE_Inference)
-  set (tmva-keras-ApplicationRegressionKeras-depends tutorial-tmva-keras-RegressionKeras-py)
-  set (tmva-keras-ApplicationClassificationKeras-depends tutorial-tmva-keras-ClassificationKeras-py)
+  set (tmva-TMVA_SOFIE_RSofieReader-depends tutorial-tmva-TMVA_SOFIE_RDataFrame_JIT)
 endif()
 
 #--List long-running tutorials to label them as "longtest"
@@ -806,13 +798,22 @@ if(ROOT_pyroot_FOUND)
   set(pyroot-na49view-depends tutorial-pyroot-geometry-py)
   set(roofit-rf503_wspaceread-depends tutorial-roofit-rf502_wspacewrite-py)
 
-  # Avoid a race condition: make sure Python tutorial is ran after C++ tutorial
+  # Avoid a race condition: make sure Python tutorial is run after C++ tutorial
   set(roofit-rf104_classfactory-depends tutorial-roofit-rf104_classfactory)
   set(roofit-rf512_wsfactory_oper-depends tutorial-roofit-rf512_wsfactory_oper)
   set (tmva-Higgs_CNN_Classification-depends tutorial-tmva-TMVA_Higgs_Classification)
   set (tmva-TMVA_CNN_Classification-depends tutorial-tmva-TMVA_CNN_Classification)
   set (tmva-TMVA_RNN_Classification-depends tutorial-tmva-TMVA_RNN_Classification)
-
+if(PY_KERAS_FOUND)
+  set (tmva-TMVA_SOFIE_Inference-depends tutorial-tmva-TMVA_Higgs_Classification)
+  set (tmva-keras-ApplicationRegressionKeras-depends tutorial-tmva-keras-RegressionKeras-py)
+  set (tmva-keras-ApplicationClassificationKeras-depends tutorial-tmva-keras-ClassificationKeras-py)
+endif()
+if(PY_TORCH_FOUND)
+   set (tmva-pytorch-ApplicationClassificationPyTorch-depends tutorial-tmva-pytorch-ClassificationPyTorch-py)
+   set (tmva-pytorch-RegressionPyTorch-depends tutorial-tmva-pytorch-ApplicationClassificationPyTorch-py)
+   set (tmva-pytorch-ApplicationRegressionPyTorch-depends tutorial-tmva-pytorch-RegressionPyTorch-py)
+endif()
   #----------------------------------------------------------------------
   # List requirements for python tutorials.
   # To add a new requirement, add a glob expression that's named requires_<packageName>,