Merge pull request #31610 from vespa-engine/toregge/rename-hwaccelrated-library-to-vespa-hwaccelerated

baldersheim · web-flow · commit 1f0e68e758e3 · 2024-06-18T17:08:54.000+02:00
Rename hwaccelrated library to vespa_hwaccelerated.
diff --git 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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ vespa_add_library(vespaeval`
`11`	`11`	`$<TARGET_OBJECTS:eval_streamed>`
`12`	`12`	`INSTALL lib64`
`13`	`13`	`DEPENDS`
`14`		`- hwaccelrated`
	`14`	`+ vespa_hwaccelerated`
`15`	`15`	`onnxruntime`
`16`	`16`	`${VESPA_LLVM_LIB}`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ vespa_add_executable(vespalib_dotproductbenchmark_app`
`4`	`4`	`dotproductbenchmark.cpp`
`5`	`5`	`DEPENDS`
`6`	`6`	`vespalib`
`7`		`- hwaccelrated`
	`7`	`+ vespa_hwaccelerated`
`8`	`8`	`)`
`9`	`9`	`vespa_add_test(NAME vespalib_dotproductbenchmark_app_sparse-ordered COMMAND vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK)`
`10`	`10`	`vespa_add_test(NAME vespalib_dotproductbenchmark_app_sparse-unordered COMMAND vespalib_dotproductbenchmark_app 10 10 1000 1000 BENCHMARK)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ vespa_add_executable(vespalib_hwaccelrated_test_app TEST`
`4`	`4`	`hwaccelrated_test.cpp`
`5`	`5`	`DEPENDS`
`6`	`6`	`vespalib`
`7`		`- hwaccelrated`
	`7`	`+ vespa_hwaccelerated`
`8`	`8`	`)`
`9`	`9`	`vespa_add_test(NAME vespalib_hwaccelrated_test_app COMMAND vespalib_hwaccelrated_test_app)`
`10`	`10`
`@@ -13,5 +13,5 @@ vespa_add_executable(vespalib_hwaccelrated_bench_app`
`13`	`13`	`hwaccelrated_bench.cpp`
`14`	`14`	`DEPENDS`
`15`	`15`	`vespalib`
`16`		`- hwaccelrated`
	`16`	`+ vespa_hwaccelerated`
`17`	`17`	`)`