diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-06-18 17:08:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 17:08:54 +0200 |
| commit | 1f0e68e758e3779aab26b8389b142acf20239406 (patch) | |
| tree | 341ead43e3ba7cc49e828f2496e92ccb3ebc0318 | |
| parent | 2594759347edb62f8a973e67c96e96b3f2ebc729 (diff) | |
| parent | 0d979ae6c23463412b53badc4efa996cfdfbb372 (diff) | |
Merge pull request #31610 from vespa-engine/toregge/rename-hwaccelrated-library-to-vespa-hwacceleratedv8.360.19
Rename hwaccelrated library to vespa_hwaccelerated.
| -rw-r--r-- | eval/src/vespa/eval/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespalib/src/tests/dotproduct/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespalib/src/tests/hwaccelrated/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/eval/src/vespa/eval/CMakeLists.txt b/eval/src/vespa/eval/CMakeLists.txt index f1fd4dec281..d3dcc97bdb2 100644 --- a/eval/src/vespa/eval/CMakeLists.txt +++ b/eval/src/vespa/eval/CMakeLists.txt @@ -11,7 +11,7 @@ vespa_add_library(vespaeval $<TARGET_OBJECTS:eval_streamed> INSTALL lib64 DEPENDS - hwaccelrated + vespa_hwaccelerated onnxruntime ${VESPA_LLVM_LIB} ) diff --git a/vespalib/src/tests/dotproduct/CMakeLists.txt b/vespalib/src/tests/dotproduct/CMakeLists.txt index cd01b44644e..41f8ba5c1cf 100644 --- a/vespalib/src/tests/dotproduct/CMakeLists.txt +++ b/vespalib/src/tests/dotproduct/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(vespalib_dotproductbenchmark_app dotproductbenchmark.cpp DEPENDS vespalib - hwaccelrated + vespa_hwaccelerated ) 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 2b322a025d0..2064dc8e7ef 100644 --- a/vespalib/src/tests/hwaccelrated/CMakeLists.txt +++ b/vespalib/src/tests/hwaccelrated/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(vespalib_hwaccelrated_test_app TEST hwaccelrated_test.cpp DEPENDS vespalib - hwaccelrated + vespa_hwaccelerated ) vespa_add_test(NAME vespalib_hwaccelrated_test_app COMMAND vespalib_hwaccelrated_test_app) @@ -13,5 +13,5 @@ vespa_add_executable(vespalib_hwaccelrated_bench_app hwaccelrated_bench.cpp DEPENDS vespalib - hwaccelrated + vespa_hwaccelerated ) diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt b/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt index 0e318a6b8f5..e2485543b33 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/hwaccelrated/CMakeLists.txt @@ -6,7 +6,7 @@ else() unset(ACCEL_FILES) endif() -vespa_add_library(hwaccelrated OBJECT +vespa_add_library(vespa_hwaccelerated SOURCES iaccelrated.cpp generic.cpp @@ -17,4 +17,4 @@ vespa_add_library(hwaccelrated OBJECT 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) +vespa_add_target_package_dependency(vespa_hwaccelerated BLAS) |