Merge pull request #302 from kjvbrt/example_addons_install

Converting examples to use installed addons
HEP-FCC · Aug 15, 2023 · e5f2627 · e5f2627
2 parents f2984b1 + 1c47c00
commit e5f2627
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/addons/FastJet/CMakeLists.txt b/addons/FastJet/CMakeLists.txt
@@ -11,6 +11,12 @@ fccanalyses_addon_build(FastJet
                                  ROOT::MathCore
                         INSTALL_COMPONENT fastjet)
 
+add_custom_command(TARGET FastJet POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy
+                   ${CMAKE_CURRENT_SOURCE_DIR}/python/*
+                   ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 
 install(FILES
    ${CMAKE_CURRENT_LIST_DIR}/ExternalRecombiner.h

diff --git a/addons/ONNXRuntime/CMakeLists.txt b/addons/ONNXRuntime/CMakeLists.txt
@@ -24,6 +24,12 @@ fccanalyses_addon_build(ONNXRuntime
                         EXT_LIBS ROOT::ROOTVecOps ${ONNXRUNTIME_LIBRARIES} nlohmann_json::nlohmann_json
                         INSTALL_COMPONENT onnxruntime)
 
+add_custom_command(TARGET ONNXRuntime POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy
+                   ${CMAKE_CURRENT_SOURCE_DIR}/python/*
+                   ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 if(BUILD_TESTING)
   find_catch_instance()
   if(Catch2_FOUND)

diff --git a/cmake/FCCAnalysesFunctions.cmake b/cmake/FCCAnalysesFunctions.cmake
@@ -38,7 +38,7 @@ function(add_integration_test _testname)
           )
   set_property(TEST fccanalysisrun_${_testname} APPEND PROPERTY ENVIRONMENT
     LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/analyzers/dataframe:$ENV{LD_LIBRARY_PATH}
-    PYTHONPATH=${CMAKE_SOURCE_DIR}/python:$ENV{PYTHONPATH}
+    PYTHONPATH=${CMAKE_SOURCE_DIR}/python:${CMAKE_BINARY_DIR}:$ENV{PYTHONPATH}
     PATH=${CMAKE_SOURCE_DIR}/bin:${CMAKE_BINARY_DIR}:$ENV{PATH}
     ROOT_INCLUDE_PATH=${CMAKE_SOURCE_DIR}/analyzers/dataframe:$ENV{ROOT_INCLUDE_PATH}
     TEST_INPUT_DATA_DIR=${TEST_INPUT_DATA_DIR}

diff --git a/examples/FCCee/higgs/mH-recoil/stage1_flavor.py b/examples/FCCee/higgs/mH-recoil/stage1_flavor.py
@@ -52,8 +52,8 @@ def get_file_path(url, filename):
 weaver_preproc = get_file_path(url_preproc, local_preproc)
 weaver_model = get_file_path(url_model, local_model)
 
-from addons.ONNXRuntime.python.jetFlavourHelper import JetFlavourHelper
-from addons.FastJet.python.jetClusteringHelper import (
+from addons.ONNXRuntime.jetFlavourHelper import JetFlavourHelper
+from addons.FastJet.jetClusteringHelper import (
     ExclusiveJetClusteringHelper,
 )
 
@@ -258,4 +258,4 @@ def output():
         ## outputs jet scores and constituent breakdown
         branchList += jetFlavourHelper.outputBranches()
 
-        return branchList
+        return branchList
diff --git a/examples/FCCee/smearing/smear_jets.py b/examples/FCCee/smearing/smear_jets.py
@@ -90,8 +90,8 @@ def jet_sequence(df, collections, output_branches, tag=""):
 weaver_preproc = get_file_path(url_preproc, local_preproc)
 weaver_model = get_file_path(url_model, local_model)
 
-from addons.ONNXRuntime.python.jetFlavourHelper import JetFlavourHelper
-from addons.FastJet.python.jetClusteringHelper import ExclusiveJetClusteringHelper
+from addons.ONNXRuntime.jetFlavourHelper import JetFlavourHelper
+from addons.FastJet.jetClusteringHelper import ExclusiveJetClusteringHelper
 
 output_branches = []
 

diff --git a/examples/FCCee/weaver/analysis_inference.py b/examples/FCCee/weaver/analysis_inference.py
@@ -31,8 +31,8 @@ def get_file_path(url, filename):
 weaver_preproc = get_file_path(url_preproc, local_preproc)
 weaver_model = get_file_path(url_model, local_model)
 
-from addons.ONNXRuntime.python.jetFlavourHelper import JetFlavourHelper
-from addons.FastJet.python.jetClusteringHelper import ExclusiveJetClusteringHelper
+from addons.ONNXRuntime.jetFlavourHelper import JetFlavourHelper
+from addons.FastJet.jetClusteringHelper import ExclusiveJetClusteringHelper
 
 jetFlavourHelper = None
 jetClusteringHelper = None

diff --git a/examples/FCCee/weaver/stage1.py b/examples/FCCee/weaver/stage1.py
@@ -4,8 +4,8 @@
     variables_event,
 )
 
-from addons.ONNXRuntime.python.jetFlavourHelper import JetFlavourHelper
-from addons.FastJet.python.jetClusteringHelper import ExclusiveJetClusteringHelper
+from addons.ONNXRuntime.jetFlavourHelper import JetFlavourHelper
+from addons.FastJet.jetClusteringHelper import ExclusiveJetClusteringHelper
 
 jetFlavourHelper = None
 jetClusteringHelper = None