-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add new procewdure for AOSS (opensearch-project#243)
AOSS doesn't allow users to pass value to "_id". Hence, create a new procedure and param to support user defined field "id" as unique field to identify document from index. Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
- Loading branch information
Showing
11 changed files
with
190 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
vectorsearch/params/aoss/10million/faiss-cohere-768-dp.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"target_index_name": "target_index", | ||
"target_field_name": "target_field", | ||
"target_index_body": "indices/faiss-index.json", | ||
"target_index_dimension": 768, | ||
"target_index_space_type": "innerproduct", | ||
"id_field_name": "id", | ||
|
||
"target_index_bulk_size": 100, | ||
"target_index_bulk_index_data_set_format": "hdf5", | ||
"target_index_bulk_index_data_set_corpus": "cohere-10m", | ||
"target_index_bulk_indexing_clients": 10, | ||
|
||
"hnsw_ef_search": 256, | ||
"hnsw_ef_construction": 256, | ||
|
||
"query_k": 100, | ||
"query_body": { | ||
"docvalue_fields" : ["id"], | ||
"stored_fields" : "_none_" | ||
}, | ||
|
||
"query_data_set_format": "hdf5", | ||
"query_data_set_corpus": "cohere-10m", | ||
"query_count": 10000 | ||
} |
28 changes: 28 additions & 0 deletions
28
vectorsearch/params/aoss/10million/nmslib-cohere-768-dp.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{ | ||
"target_index_name": "target_index", | ||
"target_field_name": "target_field", | ||
"target_index_body": "indices/nmslib-index.json", | ||
"target_index_dimension": 768, | ||
"target_index_space_type": "innerproduct", | ||
"id_field_name": "id", | ||
|
||
"target_index_bulk_size": 100, | ||
"target_index_bulk_index_data_set_format": "hdf5", | ||
"target_index_bulk_index_data_set_corpus": "cohere-10m", | ||
"target_index_bulk_indexing_clients": 10, | ||
|
||
"hnsw_ef_search": 256, | ||
"hnsw_ef_construction": 256, | ||
|
||
"query_k": 100, | ||
"query_body": { | ||
"docvalue_fields" : ["id"], | ||
"stored_fields" : "_none_" | ||
}, | ||
|
||
"query_data_set_format": "hdf5", | ||
"query_data_set_corpus": "cohere-10m", | ||
"neighbors_data_set_corpus": "cohere-10m", | ||
"neighbors_data_set_format": "hdf5", | ||
"query_count": 10000 | ||
} |
26 changes: 26 additions & 0 deletions
26
vectorsearch/params/aoss/1million/faiss-cohere-768-dp.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"target_index_name": "target_index", | ||
"target_field_name": "target_field", | ||
"target_index_body": "indices/faiss-index.json", | ||
"target_index_dimension": 768, | ||
"target_index_space_type": "innerproduct", | ||
"id_field_name": "id", | ||
|
||
"target_index_bulk_size": 100, | ||
"target_index_bulk_index_data_set_format": "hdf5", | ||
"target_index_bulk_index_data_set_corpus": "cohere-1m", | ||
"target_index_bulk_indexing_clients": 10, | ||
|
||
"hnsw_ef_search": 256, | ||
"hnsw_ef_construction": 256, | ||
|
||
"query_k": 100, | ||
"query_body": { | ||
"docvalue_fields" : ["id"], | ||
"stored_fields" : "_none_" | ||
}, | ||
|
||
"query_data_set_format": "hdf5", | ||
"query_data_set_corpus": "cohere-1m", | ||
"query_count": 10000 | ||
} |
28 changes: 28 additions & 0 deletions
28
vectorsearch/params/aoss/1million/nmslib-cohere-768-dp.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{ | ||
"target_index_name": "target_index", | ||
"target_field_name": "target_field", | ||
"target_index_body": "indices/nmslib-index.json", | ||
"target_index_dimension": 768, | ||
"target_index_space_type": "innerproduct", | ||
"id_field_name": "id", | ||
|
||
"target_index_bulk_size": 100, | ||
"target_index_bulk_index_data_set_format": "hdf5", | ||
"target_index_bulk_index_data_set_corpus": "cohere-1m", | ||
"target_index_bulk_indexing_clients": 10, | ||
|
||
"hnsw_ef_search": 256, | ||
"hnsw_ef_construction": 256, | ||
|
||
"query_k": 100, | ||
"query_body": { | ||
"docvalue_fields" : ["id"], | ||
"stored_fields" : "_none_" | ||
}, | ||
|
||
"query_data_set_format": "hdf5", | ||
"query_data_set_corpus":"cohere-1m", | ||
"neighbors_data_set_corpus":"cohere-1m", | ||
"neighbors_data_set_format":"hdf5", | ||
"query_count": 10000 | ||
} |
30 changes: 30 additions & 0 deletions
30
vectorsearch/test_procedures/aoss/index-only-schedule.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ | ||
"operation": { | ||
"name": "delete-target-index", | ||
"operation-type": "delete-index", | ||
"only-if-exists": true, | ||
"index": "{{ target_index_name | default('target_index') }}" | ||
} | ||
}, | ||
{ | ||
"operation": { | ||
"name": "create-target-index", | ||
"operation-type": "create-index", | ||
"index": "{{ target_index_name | default('target_index') }}" | ||
} | ||
}, | ||
{ | ||
"operation": { | ||
"name": "custom-vector-bulk", | ||
"operation-type": "bulk-vector-data-set", | ||
"index": "{{ target_index_name | default('target_index') }}", | ||
"field": "{{ target_field_name | default('target_field') }}", | ||
"bulk_size": {{ target_index_bulk_size | default(500)}}, | ||
"data_set_format": "{{ target_index_bulk_index_data_set_format | default('hdf5') }}", | ||
"data_set_path": "{{ target_index_bulk_index_data_set_path }}", | ||
"data_set_corpus": "{{ target_index_bulk_index_data_set_corpus }}", | ||
"num_vectors": {{ target_index_num_vectors | default(-1) }}, | ||
"id-field-name": "{{ id_field_name }}" | ||
}, | ||
"clients": {{ target_index_bulk_indexing_clients | default(1)}} | ||
} |
20 changes: 20 additions & 0 deletions
20
vectorsearch/test_procedures/aoss/search-only-schedule.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
{ | ||
"operation": { | ||
"name": "prod-queries", | ||
"operation-type": "vector-search", | ||
"index": "{{ target_index_name | default('target_index') }}", | ||
"detailed-results": true, | ||
"k": {{ query_k | default(100) }}, | ||
"field" : "{{ target_field_name | default('target_field') }}", | ||
"data_set_format" : "{{ query_data_set_format | default('hdf5') }}", | ||
"data_set_path" : "{{ query_data_set_path }}", | ||
"data_set_corpus" : "{{ query_data_set_corpus }}", | ||
"neighbors_data_set_path" : "{{ neighbors_data_set_path }}", | ||
"neighbors_data_set_corpus" : "{{ neighbors_data_set_corpus }}", | ||
"neighbors_data_set_format" : "{{ neighbors_data_set_format | default('hdf5') }}", | ||
"num_vectors" : {{ query_count | default(-1) }}, | ||
"id-field-name": "{{ id_field_name }}", | ||
"body": {{ query_body | default ({}) | tojson }} | ||
}, | ||
"clients": {{ search_clients | default(1)}} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters