Merge branch 'onnxSanitization' into 'master'

Control/AthOnnxruntimeService to accommodate onnxruntime service

See merge request atlas/athena!38336

Control/AthOnnxruntimeService/CMakeLists.txt

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package's name.
+atlas_subdir( AthOnnxruntimeService )
+
+# External dependencies.
+find_package( onnxruntime )
+
+# Component(s) in the package.
+atlas_add_library( AthOnnxruntimeServiceLib
+   AthOnnxruntimeService/*.h
+   INTERFACE
+   PUBLIC_HEADERS AthOnnxruntimeService
+   INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
+   LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} GaudiKernel )
+
+atlas_add_component( AthOnnxruntimeService
+   src/*.h src/*.cxx src/components/*.cxx
+   INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
+   LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} AthOnnxruntimeServiceLib AthenaBaseComps GaudiKernel)
+
+
+

Control/AthenaExamples/AthExOnnxRuntime/src/ONNXRuntimeSvc.h → Control/AthOnnxruntimeService/src/ONNXRuntimeSvc.h

 // Dear emacs, this is -*- c++ -*-
 // Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#ifndef ATHEXONNXRUNTIME_ONNXRUNTIMESVC_H
-#define ATHEXONNXRUNTIME_ONNXRUNTIMESVC_H
+#ifndef ATHONNXRUNTIMESERVICE_ONNXRUNTIMESVC_H
+#define ATHONNXRUNTIMESERVICE_ONNXRUNTIMESVC_H
 
 // Local include(s).
-#include "AthExOnnxRuntime/IONNXRuntimeSvc.h"
+#include "AthOnnxruntimeService/IONNXRuntimeSvc.h"
 
 // Framework include(s).
 #include "AthenaBaseComps/AthService.h"
@@ -56,4 +56,4 @@ namespace AthONNX {
 
 } // namespace AthONNX
 
-#endif // ATHEXONNXRUNTIME_ONNXRUNTIMESVC_H
+#endif // ATHONNXRUNTIMESERVICE_ONNXRUNTIMESVC_H

Control/AthOnnxruntimeService/src/components/AthOnnxruntimeService_entries.cxx

+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+// Local include(s).
+#include "../ONNXRuntimeSvc.h"
+
+// Declare the package's components.
+DECLARE_COMPONENT( AthONNX::ONNXRuntimeSvc )
+

Control/AthenaExamples/AthExOnnxRuntime/CMakeLists.txt

@@ -8,7 +8,6 @@ find_package( onnxruntime )
 
 # Component(s) in the package.
 atlas_add_library( AthExOnnxRuntimeLib
-   AthExOnnxRuntime/*.h
    INTERFACE
    PUBLIC_HEADERS AthExOnnxRuntime
    INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
@@ -17,7 +16,7 @@ atlas_add_library( AthExOnnxRuntimeLib
 atlas_add_component( AthExOnnxRuntime
    src/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} AthExOnnxRuntimeLib AthenaBaseComps GaudiKernel PathResolver )
+   LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} AthExOnnxRuntimeLib AthenaBaseComps GaudiKernel PathResolver AthOnnxruntimeServiceLib)
 
 # Install files from the package.
 atlas_install_joboptions( share/*.py )

Control/AthenaExamples/AthExOnnxRuntime/share/AthExOnnxRuntime_jobOptions.py

@@ -5,8 +5,8 @@ from AthenaCommon.AlgSequence import AlgSequence
 algSequence = AlgSequence()
 
 # Set up the job.
-from AthExOnnxRuntime.AthExOnnxRuntimeConf import AthONNX__ONNXRuntimeSvc, \
-                                                  AthONNX__CxxApiAlgorithm
+from AthExOnnxRuntime.AthExOnnxRuntimeConf import AthONNX__CxxApiAlgorithm
+from AthOnnxruntimeService.AthOnnxruntimeServiceConf import AthONNX__ONNXRuntimeSvc
 
 from AthenaCommon.AppMgr import ServiceMgr
 ServiceMgr += AthONNX__ONNXRuntimeSvc( OutputLevel = DEBUG )

Control/AthenaExamples/AthExOnnxRuntime/src/CxxApiAlgorithm.h

@@ -4,7 +4,7 @@
 #define ATHEXONNXRUNTIME_CXXAPIALGORITHM_H
 
 // Local include(s).
-#include "AthExOnnxRuntime/IONNXRuntimeSvc.h"
+#include "AthOnnxruntimeService/IONNXRuntimeSvc.h"
 
 // Framework include(s).
 #include "AthenaBaseComps/AthReentrantAlgorithm.h"

Control/AthenaExamples/AthExOnnxRuntime/src/components/AthExOnnxRuntime_entries.cxx

@@ -2,8 +2,6 @@
 
 // Local include(s).
 #include "../CxxApiAlgorithm.h"
-#include "../ONNXRuntimeSvc.h"
 
 // Declare the package's components.
 DECLARE_COMPONENT( AthONNX::CxxApiAlgorithm )
-DECLARE_COMPONENT( AthONNX::ONNXRuntimeSvc )