Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tmva/sofie/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ROOTTEST_ADD_TEST(SofieCompileModels_ONNX
)

# Creating a Google Test
if (BLAS_FOUND) # we need BLAS for compiling the models
if (TARGET ROOT::BLAS) # we need BLAS for compiling the models
ROOT_EXECUTABLE(TestCustomModelsFromONNX TestCustomModelsFromONNX.cxx
LIBRARIES
Core
Expand Down Expand Up @@ -74,7 +74,7 @@ ROOTTEST_ADD_TEST(SofieCompileModels_ROOT
FIXTURES_SETUP sofie-compile-models-root
)

if (BLAS_FOUND)
if (TARGET ROOT::BLAS)
# Creating a Google Test for Serialisation of RModel
ROOT_EXECUTABLE(TestCustomModelsFromROOT TestCustomModelsFromROOT.cxx
LIBRARIES
Expand All @@ -88,7 +88,7 @@ if (BLAS_FOUND)

if (clad)
# Creating a Google Test for the automatic differentiation of Gemm_Call
ROOT_ADD_GTEST(TestGemmDerivative TestGemmDerivative.cxx LIBRARIES Core BLAS::BLAS)
ROOT_ADD_GTEST(TestGemmDerivative TestGemmDerivative.cxx LIBRARIES Core ROOT::BLAS)
endif()
endif()

Expand Down Expand Up @@ -119,20 +119,20 @@ if (ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND NOT broken_onnx)
configure_file(LinearModelGenerator.py LinearModelGenerator.py COPYONLY)
configure_file(RecurrentModelGenerator.py RecurrentModelGenerator.py COPYONLY)

if (BLAS_FOUND)
if (TARGET ROOT::BLAS)
ROOT_ADD_GTEST(TestSofieModels TestSofieModels.cxx
LIBRARIES
ROOTTMVASofie
ROOTTMVASofieParser
BLAS::BLAS
ROOT::BLAS
INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
)
endif()
endif()

# Any features that link against libpython are disabled if built with tpython=OFF
if (tpython AND ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND BLAS_FOUND AND NOT broken_onnx)
if (tpython AND ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND (TARGET ROOT::BLAS) AND NOT broken_onnx)
configure_file(generatePyTorchModels.py generatePyTorchModels.py COPYONLY)

# Test RModelParser_PyTorch
Expand All @@ -142,7 +142,7 @@ if (tpython AND ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND BLAS_FOUND AND NOT brok
TMVA
Python3::NumPy
Python3::Python
BLAS::BLAS
ROOT::BLAS
INCLUDE_DIRS
SYSTEM
${CMAKE_CURRENT_BINARY_DIR}
Expand All @@ -151,7 +151,7 @@ endif()


# Any features that link against libpython are disabled if built with tpython=OFF
if (tpython AND ROOT_KERAS_FOUND AND BLAS_FOUND)
if (tpython AND ROOT_KERAS_FOUND AND (TARGET ROOT::BLAS))

configure_file(generateKerasModels.py generateKerasModels.py COPYONLY)
configure_file(scale_by_2_op.hxx scale_by_2_op.hxx COPYONLY)
Expand All @@ -161,7 +161,7 @@ if (tpython AND ROOT_KERAS_FOUND AND BLAS_FOUND)
ROOTTMVASofie
Python3::NumPy
Python3::Python
BLAS::BLAS
ROOT::BLAS
INCLUDE_DIRS
SYSTEM
${CMAKE_CURRENT_BINARY_DIR}
Expand Down