Merge branch 'rm-optional-Allen' into 'master'

Add flag making Allen dependency optional

See merge request !953

CMakeLists.txt

@@ -16,10 +16,6 @@ project(Moore VERSION 53.0
 
 # Enable testing with CTest/CDash
 include(CTest)
-# CTest module adds a default timeout of 1500 seconds, but our tests may take more time.
-set(DART_TESTING_TIMEOUT 0 CACHE STRING
-    "Maximum time allowed before CTest will kill the test."
-    FORCE)
 
 list(PREPEND CMAKE_MODULE_PATH
     ${PROJECT_SOURCE_DIR}/cmake

Hlt/Hlt1Conf/CMakeLists.txt

@@ -17,3 +17,16 @@ gaudi_install(PYTHON)
 
 gaudi_add_tests(pytest ${CMAKE_CURRENT_SOURCE_DIR}/python)
 gaudi_add_tests(QMTest)
+
+if(NOT Allen_FOUND)
+    set(allen_tests
+        Hlt1Conf.persistency.make_allen_tck
+        Hlt1Conf.persistency.assign_allen_tck
+        Hlt1Conf.persistency.allen_mdf_write
+        Hlt1Conf.persistency.mdf_read_decs_allen
+        Hlt1Conf.persistency.hlt2_read_hlt1_filtered_mdf
+    )
+    foreach(test_name IN LISTS allen_tests)
+        set_property(TEST ${test_name} PROPERTY DISABLED TRUE)
+    endforeach()
+endif()

Hlt/Moore/python/Moore/config.py

@@ -25,7 +25,6 @@ from PyConf.Algorithms import (
     AddressKillerAlg,
     LoKi__HDRFilter as HltDecReportsFilter,
 )
-from Allen.config import setup_allen_non_event_data_service
 from PyConf.components import force_location, setup_component
 from PyConf.control_flow import CompositeNode, NodeLogic
 from PyConf.application import (
@@ -44,10 +43,6 @@ from PyConf.application import configure_input, configure
 from .lines import HltLine, SpruceLine, HltLuminosityLine  # noqa: forward import
 from .persistence import persist_line_outputs
 from .selreports import make_selreports
-from RecoConf.hlt1_allen import (
-    SEQUENCE as ALLEN_SEQUENCE,
-    call_allen,
-)
 
 log = logging.getLogger(__name__)
 
@@ -464,7 +459,8 @@ def moore_control_flow(options, streams, process, allen_hlt1):
             # Use a regex instead of individual OR functors to avoid
             # super deep function stack in generated C++
             stream_filter_code = f"HLT_PASS_RE('^{line_regex}$')"
-            streamFilter = HltDecReportsFilter(Code=stream_filter_code, Location=decreports_loc)
+            streamFilter = HltDecReportsFilter(
+                Code=stream_filter_code, Location=decreports_loc)
 
             stream_node = CompositeNode(
                 stream + "_" + 'moore',
@@ -552,6 +548,8 @@ def get_allen_hlt1_decision_ids():
     """Read Allen HLT1 decision IDs using the JSON sequence file.
 
     """
+    from RecoConf.hlt1_allen import SEQUENCE as ALLEN_SEQUENCE
+
     config_file_path = ALLEN_SEQUENCE
     try:
         with open(os.path.expandvars(config_file_path)) as config_file:
@@ -569,6 +567,9 @@ def get_allen_hlt1_decision_ids():
 
 
 def allen_control_flow(options):
+    from Allen.config import setup_allen_non_event_data_service
+    from RecoConf.hlt1_allen import call_allen
+
     options.finalize()
 
     setup_allen_non_event_data_service()
@@ -648,6 +649,8 @@ def run_allen_reconstruction(options,
 
     """
 
+    from Allen.config import setup_allen_non_event_data_service
+
     setup_allen_non_event_data_service(dump_binaries=dump_binaries)
     return run_reconstruction(
         options, make_reconstruction, public_tools=public_tools)

Hlt/RecoConf/CMakeLists.txt

@@ -12,3 +12,14 @@
 gaudi_install(PYTHON)
 
 gaudi_add_tests(QMTest)
+
+if(NOT Allen_FOUND)
+    set(allen_tests
+        RecoConf.decoding.hlt1_ut_decoding
+        RecoConf.decoding.hlt1_ut_decoding_v4r2
+        RecoConf.decoding.hlt1_velo_decoding
+    )
+    foreach(test_name IN LISTS allen_tests)
+        set_property(TEST ${test_name} PROPERTY DISABLED TRUE)
+    endforeach()
+endif()

Hlt/RecoConf/options/hlt1_ut_hits.py

@@ -11,7 +11,7 @@
 from PyConf.Algorithms import TestUTHits
 from PyConf.application import (configure_input, configure)
 from PyConf.control_flow import (CompositeNode, NodeLogic)
-from Moore.config import setup_allen_non_event_data_service
+from Allen.config import setup_allen_non_event_data_service
 from RecoConf.hlt1_allen import make_allen_output
 from RecoConf.hlt1_tracking import make_PrStorePrUTHits_hits
 from RecoConf.data_from_file import mc_unpacker

Hlt/RecoConf/python/RecoConf/mc_checking.py

@@ -23,7 +23,7 @@ from PyConf.Algorithms import (
     PrLHCbID2MCParticle, PrLHCbID2MCParticleVPUTFTMU, PrTrackAssociator,
     PrTrackChecker, PrUTHitChecker, TrackListRefiner, TrackResChecker,
     PrMultiplicityChecker, TrackIPResolutionCheckerNT, MCParticle2MCHitAlg,
-    PrTrackerDumper, PVDumper, PrimaryVertexChecker,
+    PrTrackerDumper, PrimaryVertexChecker,
     LHCb__Converters__RecVertex__v2__fromVectorLHCbRecVertices as
     FromVectorLHCbRecVertex, TracksToSelection, TrackSelectionMerger)
 from PyConf.Tools import (IdealStateCreator, LoKi__Hybrid__MCTool,
@@ -522,6 +522,7 @@ def tracker_dumper(odin_location=make_odin,
 
 
 def pv_dumper(odin_location=make_odin, output_dir="dump/MC_info/PVs"):
+    from PyConf.Algorithms import PVDumper
     return PVDumper(
         MCVerticesLocation=mc_unpackers()["MCVertices"],
         MCPropertyLocation=make_data_with_FetchDataFromFile(

cmake/MooreDependencies.cmake

@@ -21,17 +21,25 @@ if(NOT COMMAND lhcb_find_package)
   endif()
 endif()
 
+option(Moore_WITH_Allen "Require Allen for building Moore" TRUE)
+
 # -- Public dependencies
 lhcb_find_package(Phys 33.0 REQUIRED)
-lhcb_find_package(Allen REQUIRED)
+if(Moore_WITH_Allen)
+    lhcb_find_package(Allen REQUIRED)
+endif()
 
-# Allen uses old-style CMake configuration
-get_filename_component(ALLEN_PROJECT_ROOT "${Allen_DIR}" DIRECTORY)
-get_filename_component(ALLEN_PROJECT_ROOT "${ALLEN_PROJECT_ROOT}" DIRECTORY)
-lhcb_env(PRIVATE SET ALLEN_PROJECT_ROOT ${ALLEN_PROJECT_ROOT})
-lhcb_env(PREPEND PYTHONPATH ${Allen_DIR}/python)
-lhcb_env(PREPEND LD_LIBRARY_PATH ${Allen_DIR}/lib)
-lhcb_env(SET ALLEN_INSTALL_DIR ${Allen_DIR})
+if(Allen_FOUND)
+    # Allen uses old-style CMake configuration
+    get_filename_component(ALLEN_PROJECT_ROOT "${Allen_DIR}" DIRECTORY)
+    get_filename_component(ALLEN_PROJECT_ROOT "${ALLEN_PROJECT_ROOT}" DIRECTORY)
+    lhcb_env(PRIVATE SET ALLEN_PROJECT_ROOT ${ALLEN_PROJECT_ROOT})
+    lhcb_env(PREPEND PYTHONPATH ${Allen_DIR}/python)
+    lhcb_env(PREPEND LD_LIBRARY_PATH ${Allen_DIR}/lib)
+    lhcb_env(SET ALLEN_INSTALL_DIR ${Allen_DIR})
+else()
+    message(STATUS "Building Moore without Allen. Some tests will be disabled.")
+endif()
 
 find_data_package(AppConfig 3.0 REQUIRED)
 find_data_package(FieldMap 5.0 REQUIRED)