|
0 |
--- a/CMakeLists.txt
|
|
1 |
+++ b/CMakeLists.txt
|
|
2 |
@@ -34,13 +34,8 @@
|
|
3 |
CACHE PATH "Confu-style dependencies binary directory")
|
|
4 |
|
|
5 |
IF(NOT DEFINED PSIMD_SOURCE_DIR)
|
|
6 |
- MESSAGE(STATUS "Downloading PSimd to ${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd (define PSIMD_SOURCE_DIR to avoid it)")
|
|
7 |
- CONFIGURE_FILE(cmake/DownloadPSimd.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download/CMakeLists.txt")
|
|
8 |
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
|
9 |
- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download")
|
|
10 |
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build .
|
|
11 |
- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download")
|
|
12 |
- SET(PSIMD_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd" CACHE STRING "PSimd source directory")
|
|
13 |
+ find_file(PSIMD_HEADER "/usr/include/psimd.h")
|
|
14 |
+ message("Found psimd: ${PSIMD_HEADER}")
|
|
15 |
ENDIF()
|
|
16 |
|
|
17 |
IF(FP16_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
|
|
18 |
@@ -54,13 +49,10 @@
|
|
19 |
ENDIF()
|
|
20 |
|
|
21 |
IF(FP16_BUILD_BENCHMARKS AND NOT DEFINED GOOGLEBENCHMARK_SOURCE_DIR)
|
|
22 |
- MESSAGE(STATUS "Downloading Google Benchmark to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark (define GOOGLEBENCHMARK_SOURCE_DIR to avoid it)")
|
|
23 |
- CONFIGURE_FILE(cmake/DownloadGoogleBenchmark.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark-download/CMakeLists.txt")
|
|
24 |
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
|
25 |
- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark-download")
|
|
26 |
- EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build .
|
|
27 |
- WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark-download")
|
|
28 |
- SET(GOOGLEBENCHMARK_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark" CACHE STRING "Google Benchmark source directory")
|
|
29 |
+ add_library(benchmark SHARED IMPORTED)
|
|
30 |
+ find_library(BENCHMARK_LIBRARY benchmark)
|
|
31 |
+ message("-- Found benchmark: ${BENCHMARK_LIBRARY}")
|
|
32 |
+ set_target_properties(benchmark PROPERTIES IMPORTED_LOCATION "${BENCHMARK_LIBRARY}")
|
|
33 |
ENDIF()
|
|
34 |
|
|
35 |
# ---[ FP16 library
|
|
36 |
@@ -89,13 +81,6 @@
|
|
37 |
include/fp16/avx2.py
|
|
38 |
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fp16)
|
|
39 |
|
|
40 |
-# ---[ Configure psimd
|
|
41 |
-IF(NOT TARGET psimd)
|
|
42 |
- ADD_SUBDIRECTORY(
|
|
43 |
- "${PSIMD_SOURCE_DIR}"
|
|
44 |
- "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd")
|
|
45 |
-ENDIF()
|
|
46 |
-
|
|
47 |
IF(FP16_BUILD_TESTS)
|
|
48 |
# ---[ Build google test
|
|
49 |
IF(NOT TARGET gtest)
|
|
50 |
@@ -154,28 +139,28 @@
|
|
51 |
ADD_EXECUTABLE(ieee-element-bench bench/ieee-element.cc)
|
|
52 |
TARGET_COMPILE_DEFINITIONS(ieee-element-bench PRIVATE FP16_COMPARATIVE_BENCHMARKS=1)
|
|
53 |
TARGET_INCLUDE_DIRECTORIES(ieee-element-bench PRIVATE ${PROJECT_SOURCE_DIR})
|
|
54 |
- TARGET_LINK_LIBRARIES(ieee-element-bench fp16 psimd benchmark)
|
|
55 |
+ TARGET_LINK_LIBRARIES(ieee-element-bench fp16 benchmark pthread)
|
|
56 |
|
|
57 |
ADD_EXECUTABLE(alt-element-bench bench/alt-element.cc)
|
|
58 |
- TARGET_LINK_LIBRARIES(alt-element-bench fp16 psimd benchmark)
|
|
59 |
+ TARGET_LINK_LIBRARIES(alt-element-bench fp16 benchmark pthread)
|
|
60 |
|
|
61 |
ADD_EXECUTABLE(from-ieee-array-bench bench/from-ieee-array.cc)
|
|
62 |
FP16_TARGET_ENABLE_CXX11(from-ieee-array-bench)
|
|
63 |
TARGET_COMPILE_DEFINITIONS(from-ieee-array-bench PRIVATE FP16_COMPARATIVE_BENCHMARKS=1)
|
|
64 |
TARGET_INCLUDE_DIRECTORIES(from-ieee-array-bench PRIVATE ${PROJECT_SOURCE_DIR})
|
|
65 |
- TARGET_LINK_LIBRARIES(from-ieee-array-bench fp16 psimd benchmark)
|
|
66 |
+ TARGET_LINK_LIBRARIES(from-ieee-array-bench fp16 benchmark pthread)
|
|
67 |
|
|
68 |
ADD_EXECUTABLE(from-alt-array-bench bench/from-alt-array.cc)
|
|
69 |
FP16_TARGET_ENABLE_CXX11(from-alt-array-bench)
|
|
70 |
- TARGET_LINK_LIBRARIES(from-alt-array-bench fp16 psimd benchmark)
|
|
71 |
+ TARGET_LINK_LIBRARIES(from-alt-array-bench fp16 benchmark pthread)
|
|
72 |
|
|
73 |
ADD_EXECUTABLE(to-ieee-array-bench bench/to-ieee-array.cc)
|
|
74 |
FP16_TARGET_ENABLE_CXX11(to-ieee-array-bench)
|
|
75 |
TARGET_COMPILE_DEFINITIONS(to-ieee-array-bench PRIVATE FP16_COMPARATIVE_BENCHMARKS=1)
|
|
76 |
TARGET_INCLUDE_DIRECTORIES(to-ieee-array-bench PRIVATE ${PROJECT_SOURCE_DIR})
|
|
77 |
- TARGET_LINK_LIBRARIES(to-ieee-array-bench fp16 psimd benchmark)
|
|
78 |
+ TARGET_LINK_LIBRARIES(to-ieee-array-bench fp16 benchmark pthread)
|
|
79 |
|
|
80 |
ADD_EXECUTABLE(to-alt-array-bench bench/to-alt-array.cc)
|
|
81 |
FP16_TARGET_ENABLE_CXX11(to-alt-array-bench)
|
|
82 |
- TARGET_LINK_LIBRARIES(to-alt-array-bench fp16 psimd benchmark)
|
|
83 |
+ TARGET_LINK_LIBRARIES(to-alt-array-bench fp16 benchmark pthread)
|
|
84 |
ENDIF()
|