diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-06-14 15:24:22 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-06-14 15:36:49 +0000 |
| commit | 48c002e4e7874dd78f24d0249811e0f5c1f6d799 (patch) | |
| tree | 920a71976699d699363376d2d07915e063063bde /vespalib | |
| parent | 8e7f6da2fe1034de0dd6d4a52edf7053d88eca47 (diff) | |
Split hwaccelrated out into separate library since it depends on cblas which might be noise when part of dependencies.
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/tests/dotproduct/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | vespalib/src/tests/hwaccelrated/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/vespalib/src/tests/dotproduct/CMakeLists.txt b/vespalib/src/tests/dotproduct/CMakeLists.txt index ff25f14e02c..cd01b44644e 100644 --- a/vespalib/src/tests/dotproduct/CMakeLists.txt +++ b/vespalib/src/tests/dotproduct/CMakeLists.txt @@ -4,6 +4,7 @@ vespa_add_executable(vespalib_dotproductbenchmark_app dotproductbenchmark.cpp DEPENDS vespalib + hwaccelrated ) vespa_add_test(NAME vespalib_dotproductbenchmark_app_sparse-ordered COMMAND vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK) vespa_add_test(NAME vespalib_dotproductbenchmark_app_sparse-unordered COMMAND vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK) diff --git a/vespalib/src/tests/hwaccelrated/CMakeLists.txt b/vespalib/src/tests/hwaccelrated/CMakeLists.txt index b5e8f7daa2c..2b322a025d0 100644 --- a/vespalib/src/tests/hwaccelrated/CMakeLists.txt +++ b/vespalib/src/tests/hwaccelrated/CMakeLists.txt @@ -4,6 +4,7 @@ vespa_add_executable(vespalib_hwaccelrated_test_app TEST hwaccelrated_test.cpp DEPENDS vespalib + hwaccelrated ) vespa_add_test(NAME vespalib_hwaccelrated_test_app COMMAND vespalib_hwaccelrated_test_app) @@ -12,4 +13,5 @@ vespa_add_executable(vespalib_hwaccelrated_bench_app hwaccelrated_bench.cpp DEPENDS vespalib + hwaccelrated ) diff --git a/vespalib/src/vespa/vespalib/CMakeLists.txt b/vespalib/src/vespa/vespalib/CMakeLists.txt index 3206baa703b..ac5459c10e9 100644 --- a/vespalib/src/vespa/vespalib/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/CMakeLists.txt @@ -11,7 +11,6 @@ vespa_add_library(vespalib $<TARGET_OBJECTS:vespalib_vespalib_encoding> $<TARGET_OBJECTS:vespalib_vespalib_fuzzy> $<TARGET_OBJECTS:vespalib_vespalib_geo> - $<TARGET_OBJECTS:vespalib_vespalib_hwaccelrated> $<TARGET_OBJECTS:vespalib_vespalib_io> $<TARGET_OBJECTS:vespalib_vespalib_locale> $<TARGET_OBJECTS:vespalib_vespalib_metrics> @@ -38,8 +37,6 @@ vespa_add_library(vespalib ${VESPA_GCC_LIB} ) -set(BLA_VENDOR OpenBLAS) -vespa_add_target_package_dependency(vespalib BLAS) vespa_add_target_package_dependency(vespalib OpenSSL) vespa_add_target_package_dependency(vespalib RE2) diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt b/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt index 33545fdb2fe..0e318a6b8f5 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt @@ -6,12 +6,15 @@ else() unset(ACCEL_FILES) endif() -vespa_add_library(vespalib_vespalib_hwaccelrated OBJECT +vespa_add_library(hwaccelrated OBJECT SOURCES iaccelrated.cpp generic.cpp ${ACCEL_FILES} DEPENDS + INSTALL lib64 ) set_source_files_properties(avx2.cpp PROPERTIES COMPILE_FLAGS "-O3 -march=haswell") set_source_files_properties(avx512.cpp PROPERTIES COMPILE_FLAGS "-O3 -march=skylake-avx512 -mprefer-vector-width=512") +set(BLA_VENDOR OpenBLAS) +vespa_add_target_package_dependency(hwaccelrated BLAS) |