Skip to content

Commit a088275

Browse files
[tmva] Fix SOFIE tests exclusion with builtin GSL (use_gsl_cblas=ON)
1 parent 6811d94 commit a088275

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

tmva/sofie/test/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ROOTTEST_ADD_TEST(SofieCompileModels_ONNX
4646
)
4747

4848
# Creating a Google Test
49-
if (BLAS_FOUND) # we need BLAS for compiling the models
49+
if (BLAS_FOUND OR use_gsl_cblas) # we need BLAS for compiling the models
5050
ROOT_EXECUTABLE(TestCustomModelsFromONNX TestCustomModelsFromONNX.cxx
5151
LIBRARIES
5252
Core
@@ -74,7 +74,7 @@ ROOTTEST_ADD_TEST(SofieCompileModels_ROOT
7474
FIXTURES_SETUP sofie-compile-models-root
7575
)
7676

77-
if (BLAS_FOUND)
77+
if (BLAS_FOUND OR use_gsl_cblas)
7878
# Creating a Google Test for Serialisation of RModel
7979
ROOT_EXECUTABLE(TestCustomModelsFromROOT TestCustomModelsFromROOT.cxx
8080
LIBRARIES
@@ -119,7 +119,7 @@ if (ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND NOT broken_onnx)
119119
configure_file(LinearModelGenerator.py LinearModelGenerator.py COPYONLY)
120120
configure_file(RecurrentModelGenerator.py RecurrentModelGenerator.py COPYONLY)
121121

122-
if (BLAS_FOUND)
122+
if (BLAS_FOUND OR use_gsl_cblas)
123123
ROOT_ADD_GTEST(TestSofieModels TestSofieModels.cxx
124124
LIBRARIES
125125
ROOTTMVASofie
@@ -132,7 +132,7 @@ if (ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND NOT broken_onnx)
132132
endif()
133133

134134
# Any features that link against libpython are disabled if built with tpython=OFF
135-
if (tpython AND ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND BLAS_FOUND AND NOT broken_onnx)
135+
if (tpython AND ROOT_TORCH_FOUND AND ROOT_ONNX_FOUND AND (BLAS_FOUND OR use_gsl_cblas) AND NOT broken_onnx)
136136
configure_file(generatePyTorchModels.py generatePyTorchModels.py COPYONLY)
137137

138138
# Test RModelParser_PyTorch
@@ -151,7 +151,7 @@ endif()
151151

152152

153153
# Any features that link against libpython are disabled if built with tpython=OFF
154-
if (tpython AND ROOT_KERAS_FOUND AND BLAS_FOUND)
154+
if (tpython AND ROOT_KERAS_FOUND AND (BLAS_FOUND OR use_gsl_cblas))
155155

156156
configure_file(generateKerasModels.py generateKerasModels.py COPYONLY)
157157
configure_file(scale_by_2_op.hxx scale_by_2_op.hxx COPYONLY)

0 commit comments

Comments
 (0)