Skip to content

Commit 3b0d01f

Browse files
guitargeekdpiparo
authored andcommitted
[tutorials] Remove vetos that are not needed anymore
* Disabling `exampleFit3D.C` tutorial for `NOT clad` is not needed anymore because #15091 was fixed. * The `df107_SingleTopAnalysis.py` and `df103_NanoAODHiggsAnalysis.*` should now work on macOS too * Disabling the `machine_learning/keras` tutorials was misleading because it suggested that these tutorials only fail on macOS, while they actually fail on on all platforms with TensorFlow>=2.16, which is why `tmva-pymva` was globally disabled in the CI and in the builds.
1 parent 34e55ac commit 3b0d01f

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

tutorials/CMakeLists.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,6 @@ set(need_network analysis/dataframe/df027_SQliteDependencyOverVersion.C)
6868

6969
#---Tutorials disabled depending on the build components-------------
7070

71-
if(NOT clad)
72-
set(clad_veto math/fit/minuit2GausFit.C
73-
# TODO: the next veto should not be necessary!
74-
# The tutorial should also work without clad.
75-
# See https://github.com/root-project/root/issues/15091.
76-
math/fit/exampleFit3D.C
77-
)
78-
endif()
79-
8071
if(MSVC AND NOT win_broken_tests)
8172
# RBatchGenerator tutorials don't work on Windows at the moment.
8273
list(APPEND dataframe_veto machine_learning/RBatchGenerator_NumPy.py)
@@ -143,10 +134,6 @@ if(NOT davix)
143134
legacy/multicore/mp104_processH1.C analysis/parallel/mp_processSelector.C)
144135
endif()
145136

146-
if(MACOSX_VERSION VERSION_EQUAL 10.13)
147-
list(APPEND dataframe_veto analysis/dataframe/df103_NanoAODHiggsAnalysis.*)
148-
endif()
149-
150137
if(NOT geom)
151138
set(geom_veto visualisation/geom/*.C geom/*.C visualisation/geom/gdml/*.C legacy/g3d/shapes.* legacy/g3d/na49view.*)
152139
endif()
@@ -417,10 +404,6 @@ else()
417404
endif()
418405
endif()
419406

420-
if (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64)
421-
set(macm1_veto analysis/dataframe/df107_SingleTopAnalysis.py)
422-
endif()
423-
424407
#---These ones are disabled !!! ------------------------------------
425408
set(extra_veto
426409
legacy/benchmarks.C
@@ -506,8 +489,6 @@ set(all_veto hsimple.C
506489
${xrootd_veto}
507490
${spectrum_veto}
508491
${dataframe_veto}
509-
${macm1_veto}
510-
${clad_veto}
511492
${davix_veto}
512493
)
513494

@@ -827,12 +808,6 @@ if(ROOT_pyroot_FOUND)
827808
if(NOT tmva-pymva)
828809
file(GLOB tmva_veto_py RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} machine_learning/keras/*.py)
829810
list(APPEND pyveto ${tmva_veto_py})
830-
elseif(ROOT_ARCHITECTURE MATCHES macosx)
831-
# Veto also keras tutorial on macos due to issue in disabling eager execution on macos
832-
# TODO: fix these tutorials on macOS
833-
list(APPEND pyveto machine_learning/keras/RegressionKeras.py)
834-
list(APPEND pyveto machine_learning/keras/ApplicationRegressionKeras.py)
835-
list(APPEND pyveto machine_learning/keras/MultiClassKeras.py)
836811
endif()
837812

838813
if (ROOT_KERAS_FOUND)

0 commit comments

Comments
 (0)