Skip to content

Commit fb1b3c6

Browse files
committed
passing insert_fraction from config file
1 parent 353654f commit fb1b3c6

File tree

2 files changed

+12
-32
lines changed

2 files changed

+12
-32
lines changed

engine/base_client/search.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ def search_all(
8686
num_queries: int = -1,
8787
insert_fraction: float = 0.0,
8888
):
89+
insert_fraction = self.search_params.get("insert_fraction", 0.0)
8990
parallel = self.search_params.get("parallel", 1)
9091
top = self.search_params.get("top", None)
9192
single_search_params = self.search_params.get("search_params", None)
@@ -267,8 +268,7 @@ def worker_function(self, distance, search_one, insert_one, chunk, result_queue,
267268
def process_chunk(chunk, search_one, insert_one, insert_fraction):
268269
results = []
269270
for i, query in enumerate(chunk):
270-
#if random.random() < insert_fraction:
271-
if random.random() < 0.5:
271+
if random.random() < insert_fraction:
272272
result = insert_one(query)
273273
else:
274274
# Search

experiments/configurations/dbpedia-calibration-mixed.json

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"search_params": [
1616
{
1717
"parallel": 100,
18+
"insert_fraction": 0.1,
1819
"top": 100,
1920
"calibration_param": "ef",
2021
"calibration_precision": 0.95,
@@ -27,9 +28,6 @@
2728
"parallel": 100,
2829
"algorithm": "hnsw",
2930
"data_type": "FLOAT16"
30-
},
31-
"mixed_workload_params": {
32-
"insert_fraction": 0.1
3331
}
3432
},
3533
{
@@ -48,6 +46,7 @@
4846
"search_params": [
4947
{
5048
"parallel": 100,
49+
"insert_fraction": 0.1,
5150
"top": 100,
5251
"calibration_param": "ef",
5352
"calibration_precision": 0.95,
@@ -60,9 +59,6 @@
6059
"parallel": 100,
6160
"algorithm": "hnsw",
6261
"data_type": "FLOAT32"
63-
},
64-
"mixed_workload_params": {
65-
"insert_fraction": 0.1
6662
}
6763
},
6864
{
@@ -82,6 +78,7 @@
8278
{
8379
"algorithm": "svs-vamana",
8480
"parallel": 100,
81+
"insert_fraction": 0.1,
8582
"top": 100,
8683
"calibration_param": "SEARCH_WINDOW_SIZE",
8784
"calibration_precision": 0.95,
@@ -94,9 +91,6 @@
9491
"parallel": 100,
9592
"data_type": "FLOAT16",
9693
"algorithm": "svs-vamana"
97-
},
98-
"mixed_workload_params": {
99-
"insert_fraction": 0.1
10094
}
10195
},
10296
{
@@ -116,6 +110,7 @@
116110
{
117111
"algorithm": "svs-vamana",
118112
"parallel": 100,
113+
"insert_fraction": 0.1,
119114
"top": 100,
120115
"calibration_param": "SEARCH_WINDOW_SIZE",
121116
"calibration_precision": 0.95,
@@ -128,9 +123,6 @@
128123
"parallel": 100,
129124
"data_type": "FLOAT32",
130125
"algorithm": "svs-vamana"
131-
},
132-
"mixed_workload_params": {
133-
"insert_fraction": 0.1
134126
}
135127
},
136128
{
@@ -151,6 +143,7 @@
151143
{
152144
"algorithm": "svs-vamana",
153145
"parallel": 100,
146+
"insert_fraction": 0.1,
154147
"top": 100,
155148
"calibration_param": "SEARCH_WINDOW_SIZE",
156149
"calibration_precision": 0.95,
@@ -163,9 +156,6 @@
163156
"parallel": 100,
164157
"data_type": "FLOAT16",
165158
"algorithm": "svs-vamana"
166-
},
167-
"mixed_workload_params": {
168-
"insert_fraction": 0.1
169159
}
170160
},
171161
{
@@ -186,6 +176,7 @@
186176
{
187177
"algorithm": "svs-vamana",
188178
"parallel": 100,
179+
"insert_fraction": 0.1,
189180
"top": 100,
190181
"calibration_param": "SEARCH_WINDOW_SIZE",
191182
"calibration_precision": 0.95,
@@ -198,9 +189,6 @@
198189
"parallel": 100,
199190
"data_type": "FLOAT32",
200191
"algorithm": "svs-vamana"
201-
},
202-
"mixed_workload_params": {
203-
"insert_fraction": 0.1
204192
}
205193
},
206194
{
@@ -221,6 +209,7 @@
221209
{
222210
"algorithm": "svs-vamana",
223211
"parallel": 100,
212+
"insert_fraction": 0.1,
224213
"top": 100,
225214
"calibration_param": "SEARCH_WINDOW_SIZE",
226215
"calibration_precision": 0.95,
@@ -233,9 +222,6 @@
233222
"parallel": 100,
234223
"data_type": "FLOAT32",
235224
"algorithm": "svs-vamana"
236-
},
237-
"mixed_workload_params": {
238-
"insert_fraction": 0.1
239225
}
240226
},
241227
{
@@ -256,6 +242,7 @@
256242
{
257243
"algorithm": "svs-vamana",
258244
"parallel": 100,
245+
"insert_fraction": 0.1,
259246
"top": 100,
260247
"calibration_param": "SEARCH_WINDOW_SIZE",
261248
"calibration_precision": 0.95,
@@ -268,9 +255,6 @@
268255
"parallel": 100,
269256
"data_type": "FLOAT16",
270257
"algorithm": "svs-vamana"
271-
},
272-
"mixed_workload_params": {
273-
"insert_fraction": 0.1
274258
}
275259
},
276260
{
@@ -291,6 +275,7 @@
291275
{
292276
"algorithm": "svs-vamana",
293277
"parallel": 100,
278+
"insert_fraction": 0.1,
294279
"top": 100,
295280
"calibration_param": "SEARCH_WINDOW_SIZE",
296281
"calibration_precision": 0.95,
@@ -303,9 +288,6 @@
303288
"parallel": 100,
304289
"data_type": "FLOAT16",
305290
"algorithm": "svs-vamana"
306-
},
307-
"mixed_workload_params": {
308-
"insert_fraction": 0.1
309291
}
310292
},
311293
{
@@ -326,6 +308,7 @@
326308
{
327309
"algorithm": "svs-vamana",
328310
"parallel": 100,
311+
"insert_fraction": 0.1,
329312
"top": 100,
330313
"calibration_param": "SEARCH_WINDOW_SIZE",
331314
"calibration_precision": 0.95,
@@ -338,9 +321,6 @@
338321
"parallel": 100,
339322
"data_type": "FLOAT32",
340323
"algorithm": "svs-vamana"
341-
},
342-
"mixed_workload_params": {
343-
"insert_fraction": 0.1
344324
}
345325
}
346326
]

0 commit comments

Comments
 (0)