Skip to content

Commit 5457d8f

Browse files
committed
fix APPLE case
1 parent 2d82b54 commit 5457d8f

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

root/tmva/sofie/CMakeLists.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
get_filename_component(fname ${model} NAME)
1515
configure_file(${model} ${out_dir}/${fname} COPYONLY)
1616
endforeach()
17-
17+
1818
# Looking for ONNXRuntime
1919
## to find OONX run time configure cmake with
2020
## -DONNXRuntime_INCLUDE_DIRS=..onxruntime_location.../include -DONNXRuntime_LIBRARIES=.../lib
2121
find_package(ONNXRuntime)
2222
if(ONNXRuntime_FOUND)
2323
message(STATUS "Found ONNXRuntime (library is ${ONNXRuntime_LIBRARY}, libraries ${ONNXRuntime_LIBRARIES})")
24-
24+
2525
# Configuring ONNXRuntimeInference_Template.cxx.in
2626
set(FUNC_NAME "BM_ONNXRuntime_Inference")
2727
set(CAPTURE_STR "BENCHMARK_CAPTURE(${FUNC_NAME}, @1,\t@2)@3")
@@ -56,9 +56,9 @@
5656
if(ROOT_tmva_FOUND AND ROOT_tmva-sofie_FOUND)
5757

5858

59-
### this is not used
59+
### this is not used
6060
if (Use_SOFIE_TEMPLATE)
61-
61+
6262
# Configuring SOFIEInference_Template.cxx.in
6363
set(FUNC_NAME "BM_SOFIE_Inference")
6464
set(CAPTURE_STR "BENCHMARK_CAPTURE(${FUNC_NAME}, @1,\t@2)@3")
@@ -96,8 +96,8 @@ if (Use_SOFIE_TEMPLATE)
9696
string(REPLACE ";" "\n" INCLUDE_HEADERS "${ALL_INCLUDES}") # String[] -> String
9797
string(REPLACE ";" ",\n" FUNC_TUPLES "${ALL_FUNCS}") # String[] -> String
9898
configure_file(SOFIEInference_Template.cxx.in SOFIEInference.cxx @ONLY)
99-
100-
99+
100+
101101
endif()
102102

103103

@@ -106,17 +106,17 @@ endif()
106106

107107
# configure_file(input_models/compiled/Linear_16.hxx Linear_16.hxx COPYONLY)
108108
# configure_file(input_models/compiled/Linear_16.dat Linear_16.dat COPYONLY)
109-
109+
110110
# configure_file(input_models/compiled/Linear_32.hxx Linear_32.hxx COPYONLY)
111111
# configure_file(input_models/compiled/Linear_32.dat Linear_32.dat COPYONLY)
112-
112+
113113
# configure_file(input_models/compiled/Linear_64.hxx Linear_64.hxx COPYONLY)
114114
# configure_file(input_models/compiled/Linear_64.dat Linear_64.dat COPYONLY)
115-
116-
115+
116+
117117
# configure_file(input_models/compiled/Conv_d100_L1_B1.hxx Conv_d100_L1_B1.hxx COPYONLY)
118118
# configure_file(input_models/compiled/Conv_d100_L1_B1.dat Conv_d100_L1_B1.dat COPYONLY)
119-
119+
120120
# configure_file(input_models/compiled/Conv_d100_L14_B1.hxx Conv_d100_L14_B1.hxx COPYONLY)
121121
# configure_file(input_models/compiled/Conv_d100_L14_B1.dat Conv_d100_L14_B1.dat COPYONLY)
122122
# configure_file(input_models/compiled/Conv_d100_L14_B32.hxx Conv_d100_L14_B32.hxx COPYONLY)
@@ -147,7 +147,7 @@ foreach(onnx_file ${ONNX_FILES})
147147
#get_filename_component(fname ${onnx_file} NAME_WE)
148148
#get_filename_component(fdir ${onnx_file} DIRECTORY)
149149
add_custom_command(TARGET SofieCompileModels POST_BUILD
150-
COMMAND ./emitFromONNX ${onnx_file}
150+
COMMAND ./emitFromONNX ${onnx_file}
151151
USES_TERMINAL
152152
)
153153
endforeach()
@@ -171,39 +171,39 @@ set(SOFIE_BLAS_LIBS ${BLAS_LIBRARIES})
171171
RB_ADD_GBENCHMARK(SOFIEInference
172172
SOFIEInference.cxx
173173
LABEL short
174-
LIBRARIES TMVA ROOTTMVASofie ${SOFIE_BLAS_LIBS}
174+
LIBRARIES TMVA ROOTTMVASofie ${SOFIE_BLAS_LIBS}
175175
)
176176

177177
add_dependencies(SOFIEInference SofieCompileModels)
178178

179179
RB_ADD_GBENCHMARK(RDF_SOFIE_Inference
180180
RDF_SOFIE_Inference.cxx
181181
LABEL short
182-
LIBRARIES Core Hist Imt RIO Tree TreePlayer ROOTDataFrame ROOTVecOps TMVA ROOTTMVASofie ${SOFIE_BLAS_LIBS}
182+
LIBRARIES Core Hist Imt RIO Tree TreePlayer ROOTDataFrame ROOTVecOps TMVA ROOTTMVASofie ${SOFIE_BLAS_LIBS}
183183
)
184-
184+
185185
add_dependencies(RDF_SOFIE_Inference SofieCompileModels)
186186

187187
#
188-
# add optimization flags for best performances (factor 3 on simple Conv1 test)
188+
# add optimization flags for best performances (factor 3 on simple Conv1 test)
189189
#
190190
#if (ROOT_PLATFORM MATCHES "linux|macosx" AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
191191
## assume we run only on linux/macos with gnu or gcc
192192
set(gnu-flags $<$<CXX_COMPILER_ID:GNU>:-fno-signaling-nans>)
193-
if ($APPLE)
193+
if (APPLE)
194194
target_compile_options(SOFIEInference PRIVATE ${gnu-flags} -ffast-math -fno-trapping-math -O3)
195195
target_compile_options(RDF_SOFIE_Inference PRIVATE ${gnu-flags} -ffast-math -fno-trapping-math -O3)
196196
else()
197197
target_compile_options(SOFIEInference PRIVATE ${gnu-flags} -march=native -ffast-math -fno-trapping-math -O3)
198198
target_compile_options(RDF_SOFIE_Inference PRIVATE ${gnu-flags} -march=native -ffast-math -fno-trapping-math -O3)
199199
endif()
200200

201-
endif() # endif blas
201+
endif() # endif blas
202202
endif() # endif TMVA/SOFIE
203203

204204
find_package(LWTNN QUIET)
205205
if (LWTNN_FOUND)
206-
206+
207207
message(STATUS "Found LWTNN (library is ${LWTNN_LIBRARY}, libraries ${LWTNN_LIBRARIES})")
208208
configure_file(input_models/higgs_model_dense.json higgs_model_dense.json COPYONLY)
209209
configure_file(input_models/Generator.json.gz Generator.json.gz COPYONLY)

0 commit comments

Comments
 (0)