Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions engine/clients/redis/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def init_client(cls, host, distance, connection_params: dict, search_params: dic
if cls.hybrid_policy != "ADHOC_BF":
cls.knn_conditions = "EF_RUNTIME $EF"
elif cls.algorithm == "SVS-VAMANA":
cls.knn_conditions = "WS_SEARCH $WS_SEARCH"
cls.knn_conditions = "SEARCH_WINDOW_SIZE $SEARCH_WINDOW_SIZE"
cls.data_type = "FLOAT32"
if "search_params" in cls.search_params:
cls.data_type = (
Expand Down Expand Up @@ -97,7 +97,7 @@ def search_one(cls, vector, meta_conditions, top) -> List[Tuple[int, float]]:
if cls.hybrid_policy != "ADHOC_BF":
params_dict["EF"] = cls.search_params["search_params"]["ef"]
if cls.algorithm == "SVS-VAMANA":
params_dict["WS_SEARCH"] = cls.search_params["search_params"]["WS_SEARCH"]
params_dict["SEARCH_WINDOW_SIZE"] = cls.search_params["search_params"]["SEARCH_WINDOW_SIZE"]
results = cls._ft.search(q, query_params=params_dict)

return [(int(result.id), float(result.vector_score)) for result in results.docs]
26 changes: 9 additions & 17 deletions experiments/configurations/dbpedia-calibration.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT16",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200
Expand All @@ -78,7 +77,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT16"
Expand All @@ -99,7 +98,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT32",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200
Expand All @@ -110,7 +108,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT32"
Expand All @@ -131,7 +129,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT16",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200,
Expand All @@ -143,7 +140,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT16"
Expand All @@ -164,7 +161,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT32",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200,
Expand All @@ -176,7 +172,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT32"
Expand All @@ -197,7 +193,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT32",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200,
Expand All @@ -209,7 +204,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT32"
Expand All @@ -230,7 +225,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT16",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200,
Expand All @@ -242,7 +236,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT16"
Expand All @@ -263,7 +257,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT16",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200,
Expand All @@ -275,7 +268,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT16"
Expand All @@ -296,7 +289,6 @@
"algorithm": "svs-vamana",
"data_type": "FLOAT32",
"svs-vamana_config": {
"NUM_THREADS": 16,
"DISTANCE_METRIC": "L2",
"GRAPH_MAX_DEGREE": 32,
"CONSTRUCTION_WINDOW_SIZE": 200,
Expand All @@ -308,7 +300,7 @@
"algorithm": "svs-vamana",
"parallel": 100,
"top": 100,
"calibration_param": "WS_SEARCH",
"calibration_param": "SEARCH_WINDOW_SIZE",
"calibration_precision": 0.95,
"search_params": {
"data_type": "FLOAT32"
Expand All @@ -321,4 +313,4 @@
"algorithm": "svs-vamana"
}
}
]
]