Skip to content

Commit 84c0de6

Browse files
committed
[CMake] Disable tutorials that require PyMVA in tmva-pymva=OFF builds
1 parent 4fec16a commit 84c0de6

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

tutorials/CMakeLists.txt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,16 +324,22 @@ else()
324324
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_RDataFrame.C)
325325
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_RSofieReader.C)
326326
endif()
327-
if (NOT ROOT_KERAS_FOUND)
327+
if (NOT tmva-pymva OR NOT ROOT_KERAS_FOUND)
328328
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_Keras.C)
329329
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_Keras_HiggsModel.C)
330330
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_RDataFrame.C)
331331
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_RDataFrame_JIT.C)
332332
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_RSofieReader.C)
333333
endif()
334-
if (NOT ROOT_TORCH_FOUND)
334+
if (NOT tmva-pymva OR NOT ROOT_TORCH_FOUND)
335335
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_PyTorch.C)
336336
endif()
337+
# The following tutorials use PyMVA functionality
338+
if (NOT tmva-pymva)
339+
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_RDataFrame.py)
340+
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_Models.py)
341+
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_Inference.py)
342+
endif()
337343
#veto this tutorial since it is added directly
338344
list(APPEND tmva_veto machine_learning/TMVA_SOFIE_GNN_Parser.py)
339345
if (NOT ROOT_SONNET_FOUND OR NOT ROOT_GRAPH_NETS_FOUND)
@@ -825,11 +831,12 @@ if(ROOT_pyroot_FOUND)
825831
list(APPEND pyveto ${tmva_veto_py})
826832
endif()
827833

828-
if(NOT ROOT_KERAS_FOUND)
834+
if(NOT tmva-pymva)
829835
file(GLOB tmva_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} machine_learning/keras/*.py)
830836
list(APPEND pyveto ${tmva_veto_py})
831837
elseif(ROOT_ARCHITECTURE MATCHES macosx)
832-
#veto also keras tutorial on macos due to issue in disabling eager execution on macos
838+
# Veto also keras tutorial on macos due to issue in disabling eager execution on macos
839+
# TODO: fix these tutorials on macOS
833840
list(APPEND pyveto machine_learning/keras/RegressionKeras.py)
834841
list(APPEND pyveto machine_learning/keras/ApplicationRegressionKeras.py)
835842
list(APPEND pyveto machine_learning/keras/MultiClassKeras.py)
@@ -839,7 +846,7 @@ if(ROOT_pyroot_FOUND)
839846
set (machine_learning-TMVA_SOFIE_RDataFrame-py-depends tutorial-machine_learning-TMVA_SOFIE_Keras_HiggsModel)
840847
endif()
841848

842-
if(NOT ROOT_TORCH_FOUND)
849+
if(NOT tmva-pymva)
843850
file(GLOB tmva_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} machine_learning/pytorch/*.py)
844851
list(APPEND pyveto ${tmva_veto_py})
845852
endif()

0 commit comments

Comments
 (0)