File tree Expand file tree Collapse file tree
.github/workflows/root-ci-config/buildconfig Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -68,7 +68,6 @@ roofit_multiprocess=OFF
6868root7=ON
6969rootbench=OFF
7070roottest=ON
71- test_roofit_hs3testsuite=ON
7271runtime_cxxmodules=ON
7372shadowpw=OFF
7473shared=ON
@@ -78,6 +77,8 @@ sqlite=ON
7877ssl=ON
7978test_distrdf_dask=ON
8079test_distrdf_pyspark=ON
80+ test_roofit_hs3testsuite=ON
81+ test_tmva_sofie=ON
8182testing=ON
8283tmva-cpu=ON
8384tmva-gpu=OFF
Original file line number Diff line number Diff line change @@ -29,6 +29,7 @@ runtime_cxxmodules=OFF
2929ssl=OFF
3030test_distrdf_dask=OFF
3131test_distrdf_pyspark=OFF
32+ test_tmva_sofie=OFF
3233use_gsl_cblas=ON
3334vdt=OFF
3435x11=OFF
Original file line number Diff line number Diff line change @@ -191,6 +191,7 @@ option(minimal "Enable only required options by default" OFF)
191191option (rootbench "Build rootbench if rootbench exists in root or if it is a sibling directory (implies testing=ON)" OFF )
192192option (roottest "Build roottest (implies testing=ON)" OFF )
193193option (test_roofit_hs3testsuite "Setup and use the HS3 conformance test suite (requires network)" OFF )
194+ option (test_tmva_sofie "Enable SOFIE tests (requires BLAS library that can be found with CMake's FindBLAS)" ON )
194195option (testing "Enable testing with CTest" OFF )
195196option (asan "Build ROOT with address sanitizer instrumentation (see core/sanitizer for details)" OFF )
196197option (_wheel_build "ROOT is being packaged as a wheel, do not install .dist-info metadata" OFF )
Original file line number Diff line number Diff line change @@ -1013,16 +1013,14 @@ endif()
10131013# SOFIE itself has no external dependencies: ONNX models are read with a small
10141014# self-contained protobuf wire-format decoder (tmva/sofie_parsers/src/onnx.hxx).
10151015
1016- if (tmva)
1017- if (testing)
1018- message (STATUS "Looking for BLAS as an optional testing dependency of TMVA-SOFIE" )
1019- find_package (BLAS )
1020- if (NOT BLAS_FOUND)
1021- if (fail-on -missing)
1022- message (FATAL_ERROR "BLAS not found, but it's required for TMVA-SOFIE testing" )
1023- else ()
1024- message (WARNING "BLAS not found: TMVA-SOFIE will not be fully tested" )
1025- endif ()
1016+ if (tmva AND testing AND test_tmva_sofie)
1017+ message (STATUS "Looking for BLAS as an optional testing dependency of TMVA-SOFIE" )
1018+ find_package (BLAS )
1019+ if (NOT BLAS_FOUND)
1020+ if (fail-on -missing)
1021+ message (FATAL_ERROR "BLAS not found, but it's required for TMVA-SOFIE testing" )
1022+ else ()
1023+ message (WARNING "BLAS not found: TMVA-SOFIE will not be fully tested" )
10261024 endif ()
10271025 endif ()
10281026endif ()
Original file line number Diff line number Diff line change @@ -109,4 +109,7 @@ if(sofie_root_support)
109109 target_compile_definitions (ROOTTMVASofie PRIVATE SOFIE_SUPPORT_ROOT_BINARY )
110110endif ()
111111
112- ROOT_ADD_TEST_SUBDIRECTORY (test )
112+ # Tests are not enabled unconditionally because they require BLAS
113+ if (test_tmva_sofie)
114+ ROOT_ADD_TEST_SUBDIRECTORY (test )
115+ endif ()
You can’t perform that action at this time.
0 commit comments