|
 |
2f8e3d9 |
From 1aa9231becda09a89ec576e4a17ca4d9b6e2f310 Mon Sep 17 00:00:00 2001
|
|
|
2f8e3d9 |
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
|
2f8e3d9 |
Date: Tue, 15 Mar 2022 14:55:37 +0100
|
|
|
2f8e3d9 |
Subject: [PATCH] Link to the blas library found by cmake, not hardcoded
|
|
|
2f8e3d9 |
"blas". Set ROOTIGNOREPREFIX=1 when running built binaries during build. Make
|
|
|
2f8e3d9 |
sure PCH is created before running emitters.
|
|
|
2f8e3d9 |
|
|
|
2f8e3d9 |
---
|
|
|
2f8e3d9 |
tmva/sofie/test/CMakeLists.txt | 14 ++++++++------
|
|
|
2f8e3d9 |
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
2f8e3d9 |
|
|
|
2f8e3d9 |
diff --git a/tmva/sofie/test/CMakeLists.txt b/tmva/sofie/test/CMakeLists.txt
|
|
|
2f8e3d9 |
index e4f9d28748..a3a2c9ae16 100644
|
|
|
2f8e3d9 |
--- a/tmva/sofie/test/CMakeLists.txt
|
|
|
2f8e3d9 |
+++ b/tmva/sofie/test/CMakeLists.txt
|
|
|
2f8e3d9 |
@@ -43,7 +43,7 @@ target_compile_options(emitFromONNX PRIVATE -Wno-unused-parameter -Wno-array-bou
|
|
|
2f8e3d9 |
|
|
|
2f8e3d9 |
# Automatic compilation of headers from onnx files
|
|
|
2f8e3d9 |
add_custom_target(SofieCompileModels_ONNX)
|
|
|
2f8e3d9 |
-add_dependencies(SofieCompileModels_ONNX emitFromONNX)
|
|
|
2f8e3d9 |
+add_dependencies(SofieCompileModels_ONNX emitFromONNX onepcm)
|
|
|
2f8e3d9 |
|
|
|
2f8e3d9 |
# Finding .onnx files to be compiled and creating the appropriate command
|
|
|
2f8e3d9 |
file(GLOB ONNX_FILES "${ONNX_MODELS_DIR}/*.onnx")
|
|
|
2f8e3d9 |
@@ -51,7 +51,7 @@ foreach(onnx_file ${ONNX_FILES})
|
|
|
2f8e3d9 |
get_filename_component(fname ${onnx_file} NAME_WE)
|
|
|
2f8e3d9 |
get_filename_component(fdir ${onnx_file} DIRECTORY)
|
|
|
2f8e3d9 |
add_custom_command(TARGET SofieCompileModels_ONNX POST_BUILD
|
|
|
2f8e3d9 |
- COMMAND ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
|
2f8e3d9 |
+ COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromONNX ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
|
2f8e3d9 |
USES_TERMINAL
|
|
|
2f8e3d9 |
)
|
|
|
2f8e3d9 |
endforeach()
|
|
|
2f8e3d9 |
@@ -60,7 +60,8 @@ endforeach()
|
|
|
2f8e3d9 |
ROOT_ADD_GTEST(TestCustomModelsFromONNX TestCustomModelsFromONNX.cxx
|
|
|
2f8e3d9 |
LIBRARIES
|
|
|
2f8e3d9 |
ROOTTMVASofie
|
|
|
2f8e3d9 |
- blas
|
|
|
2f8e3d9 |
+ ${BLAS_LINKER_FLAGS}
|
|
|
2f8e3d9 |
+ ${BLAS_LIBRARIES}
|
|
|
2f8e3d9 |
INCLUDE_DIRS
|
|
|
2f8e3d9 |
${CMAKE_CURRENT_BINARY_DIR}
|
|
|
2f8e3d9 |
)
|
|
|
2f8e3d9 |
@@ -92,7 +93,7 @@ target_compile_options(emitFromROOT PRIVATE -Wno-unused-parameter -Wno-array-bou
|
|
|
2f8e3d9 |
|
|
|
2f8e3d9 |
# Automatic compilation of headers from root files
|
|
|
2f8e3d9 |
add_custom_target(SofieCompileModels_ROOT)
|
|
|
2f8e3d9 |
-add_dependencies(SofieCompileModels_ROOT emitFromROOT)
|
|
|
2f8e3d9 |
+add_dependencies(SofieCompileModels_ROOT emitFromROOT onepcm)
|
|
|
2f8e3d9 |
|
|
|
2f8e3d9 |
# Finding .onnx files to be parsed and creating the appropriate command
|
|
|
2f8e3d9 |
file(GLOB ONNX_FILES "${ONNX_MODELS_DIR}/*.onnx")
|
|
|
2f8e3d9 |
@@ -100,7 +101,7 @@ foreach(onnx_file ${ONNX_FILES})
|
|
|
2f8e3d9 |
get_filename_component(fname ${onnx_file} NAME_WE)
|
|
|
2f8e3d9 |
get_filename_component(fdir ${onnx_file} DIRECTORY)
|
|
|
2f8e3d9 |
add_custom_command(TARGET SofieCompileModels_ROOT POST_BUILD
|
|
|
2f8e3d9 |
- COMMAND ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
|
2f8e3d9 |
+ COMMAND ${CMAKE_COMMAND} -E env ROOTIGNOREPREFIX=1 ./emitFromROOT ${onnx_file} ${CMAKE_CURRENT_BINARY_DIR}/${fname}
|
|
|
2f8e3d9 |
USES_TERMINAL
|
|
|
2f8e3d9 |
)
|
|
|
2f8e3d9 |
endforeach()
|
|
|
2f8e3d9 |
@@ -109,7 +110,8 @@ endforeach()
|
|
|
2f8e3d9 |
ROOT_ADD_GTEST(TestCustomModelsFromROOT TestCustomModelsFromROOT.cxx
|
|
|
2f8e3d9 |
LIBRARIES
|
|
|
2f8e3d9 |
ROOTTMVASofie
|
|
|
2f8e3d9 |
- blas
|
|
|
2f8e3d9 |
+ ${BLAS_LINKER_FLAGS}
|
|
|
2f8e3d9 |
+ ${BLAS_LIBRARIES}
|
|
|
2f8e3d9 |
INCLUDE_DIRS
|
|
|
2f8e3d9 |
${CMAKE_CURRENT_BINARY_DIR}
|
|
|
2f8e3d9 |
)
|
|
|
2f8e3d9 |
--
|
|
|
2f8e3d9 |
2.35.1
|
|
|
2f8e3d9 |
|