Skip to content

Commit 1c8b2c4

Browse files
committed
Bumped version for new release, updated dependencies, minor docfix.
1 parent d11997f commit 1c8b2c4

4 files changed

Lines changed: 13 additions & 11 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.14)
22

33
project(knncolle_kmknn
4-
VERSION 0.1.1
4+
VERSION 0.2.0
55
DESCRIPTION "knncolle bindings for KMKNN"
66
LANGUAGES CXX)
77

@@ -22,11 +22,12 @@ option(KNNCOLLE_KMKNN_FETCH_EXTERN "Automatically fetch knncolle_kmknn's externa
2222
if(KNNCOLLE_KMKNN_FETCH_EXTERN)
2323
add_subdirectory(extern)
2424
else()
25-
find_package(knncolle_knncolle 3.0.0 CONFIG REQUIRED)
26-
find_package(ltla_kmeans 4.0.0 CONFIG REQUIRED)
25+
find_package(knncolle_knncolle 3.1.0 CONFIG REQUIRED)
26+
find_package(ltla_kmeans 4.0.6 CONFIG REQUIRED)
27+
find_package(ltla_sanisizer 0.1.5 CONFIG REQUIRED)
2728
endif()
2829

29-
target_link_libraries(knncolle_kmknn INTERFACE knncolle::knncolle ltla::kmeans)
30+
target_link_libraries(knncolle_kmknn INTERFACE knncolle::knncolle ltla::kmeans ltla::sanisizer)
3031

3132
# Tests
3233
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)

cmake/Config.cmake.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@PACKAGE_INIT@
22

33
include(CMakeFindDependencyMacro)
4-
find_dependency(knncolle_knncolle 3.0.0 CONFIG REQUIRED)
5-
find_dependency(ltla_kmeans 4.0.0 CONFIG REQUIRED)
6-
find_dependency(ltla_sanisizer 0.1.0 CONFIG REQUIRED)
4+
find_dependency(knncolle_knncolle 3.1.0 CONFIG REQUIRED)
5+
find_dependency(ltla_kmeans 4.0.6 CONFIG REQUIRED)
6+
find_dependency(ltla_sanisizer 0.1.5 CONFIG REQUIRED)
77

88
include("${CMAKE_CURRENT_LIST_DIR}/knncolle_knncolle_kmknnTargets.cmake")

extern/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ include(FetchContent)
33
FetchContent_Declare(
44
knncolle
55
GIT_REPOSITORY https://github.com/knncolle/knncolle
6-
GIT_TAG master # ^3.0.0
6+
GIT_TAG master # ^3.1.0
77
)
88

99
FetchContent_Declare(
1010
kmeans
1111
GIT_REPOSITORY https://github.com/libscran/kmeans
12-
GIT_TAG master # ^4.0.0
12+
GIT_TAG master # ^4.0.6
1313
)
1414

1515
FetchContent_Declare(
1616
sanisizer
1717
GIT_REPOSITORY https://github.com/LTLA/sanisizer
18-
GIT_TAG master # ^0.1.0
18+
GIT_TAG master # ^0.1.5
1919
)
2020

2121
FetchContent_MakeAvailable(knncolle)

include/knncolle_kmknn/Kmknn.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,8 @@ class KmknnBuilder final : public knncolle::Builder<Index_, Data_, Distance_, Ma
687687
* Specifically, the distance computed by `metric_data` between two `Data_` arrays should be the same as
688688
* the distance computed by `metric_center` between two `KmeansFloat_` arrays with the same contents,
689689
* assuming that the contents can be losslessly converted from `Data_` to `KmeansFloat_`.
690-
* We only accept two separate arguments here to support use cases where `Data_` and `KmeansFloat_` are different types (e.g., integer `Data_` and double-precision `KmeansFloat_`),
690+
* This might seem redundant but we accept two separate arguments here to support use cases
691+
* where `Data_` and `KmeansFloat_` are different types (e.g., integer `Data_` and double-precision `KmeansFloat_`),
691692
* where a more efficient calculation of the same distance may be possible with one of the types.
692693
*/
693694
KmknnBuilder(

0 commit comments

Comments
 (0)