Skip to content

Make namedVector compose with multivector in ann-benchmark #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlmanrique merged 1 commit into from
Jun 29, 2026
Merged

Make namedVector compose with multivector in ann-benchmark #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 32 additions & 24 deletions benchmarker/cmd/ann_benchmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,23 @@ func writeChunk(chunk *Batch, client *weaviategrpc.WeaviateClient, cfg *Config)
end := start + cfg.MultiVectorDimensions
multiVec[i] = vector[start:end]
}
name := "multivector"
if cfg.NamedVector != "" {
name = cfg.NamedVector
}
objects[i].Vectors = []*weaviategrpc.Vectors{{
Name: "multivector",
Name: name,
VectorBytes: byteops.Fp32SliceOfSlicesToBytes(multiVec),
Type: weaviategrpc.Vectors_VECTOR_TYPE_MULTI_FP32,
}}
} else if cfg.NamedVector != "" {
objects[i].Vectors = []*weaviategrpc.Vectors{{
Name: cfg.NamedVector,
VectorBytes: encodeVector(vector),
}}
} else {
objects[i].VectorBytes = encodeVector(vector)
}
if cfg.NamedVector != "" {
vectors := make([]*weaviategrpc.Vectors, 1)
vectors[0] = &weaviategrpc.Vectors{
VectorBytes: encodeVector(vector),
Name: cfg.NamedVector,
}
objects[i].Vectors = vectors
}
if cfg.Filter {
nonRefProperties, err := structpb.NewStruct(map[string]interface{}{
"category": strconv.Itoa(chunk.Filters[i]),
Expand Down Expand Up @@ -369,6 +370,17 @@ func createSchema(cfg *Config, client *weaviate.Client) {
vectorIndexConfig["filterStrategy"] = cfg.FilterStrategy

if cfg.NamedVector != "" {
if cfg.MultiVectorDimensions > 0 {
vectorIndexConfig["multivector"] = map[string]interface{}{
"enabled": true,
"muvera": map[string]interface{}{
"enabled": cfg.MuveraEnabled,
"ksim": cfg.MuveraKSim,
"dprojections": cfg.MuveraDProjections,
"repetition": cfg.MuveraRepetition,
},
}
}
vectorConfig := make(map[string]models.VectorConfig)
vectorConfig[cfg.NamedVector] = models.VectorConfig{
Vectorizer: map[string]interface{}{"none": nil},
Expand Down Expand Up @@ -611,15 +623,13 @@ func enableCompression(cfg *Config, client *weaviate.Client, dimensions uint, co
var segments uint
var vectorIndexConfig map[string]interface{}

if cfg.MultiVectorDimensions > 0 {
if cfg.NamedVector != "" {
vectorIndexConfig = classConfig.VectorConfig[cfg.NamedVector].VectorIndexConfig.(map[string]interface{})
classConfig.Vectorizer = ""
} else if cfg.MultiVectorDimensions > 0 {
vectorIndexConfig = classConfig.VectorConfig["multivector"].VectorIndexConfig.(map[string]interface{})
} else {
if cfg.NamedVector == "" {
vectorIndexConfig = classConfig.VectorIndexConfig.(map[string]interface{})
} else {
vectorIndexConfig = classConfig.VectorConfig[cfg.NamedVector].VectorIndexConfig.(map[string]interface{})
classConfig.Vectorizer = ""
}
vectorIndexConfig = classConfig.VectorIndexConfig.(map[string]interface{})
}

switch compressionType {
Expand Down Expand Up @@ -662,18 +672,16 @@ func enableCompression(cfg *Config, client *weaviate.Client, dimensions uint, co
vectorIndexConfig["rq"] = rqConfig
}

if cfg.MultiVectorDimensions > 0 {
if cfg.NamedVector != "" {
vectorConfig := classConfig.VectorConfig[cfg.NamedVector]
vectorConfig.VectorIndexConfig = vectorIndexConfig
classConfig.VectorConfig[cfg.NamedVector] = vectorConfig
} else if cfg.MultiVectorDimensions > 0 {
vectorConfig := classConfig.VectorConfig["multivector"]
vectorConfig.VectorIndexConfig = vectorIndexConfig
classConfig.VectorConfig["multivector"] = vectorConfig
} else {
if cfg.NamedVector == "" {
classConfig.VectorIndexConfig = vectorIndexConfig
} else {
vectorConfig := classConfig.VectorConfig[cfg.NamedVector]
vectorConfig.VectorIndexConfig = vectorIndexConfig
classConfig.VectorConfig[cfg.NamedVector] = vectorConfig
}
classConfig.VectorIndexConfig = vectorIndexConfig
}

err = client.Schema().ClassUpdater().WithClass(classConfig).Do(context.Background())
Expand Down
78 changes: 38 additions & 40 deletions benchmarker/cmd/random_vectors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,63 +137,61 @@ func encodeVector(fs []float32) []byte {

func nearVectorQueryGrpc(cfg *Config, vec []float32, tenant string, filter int) []byte {

var searchRequest *weaviategrpc.SearchRequest
if cfg.MultiVectorDimensions > 0 {
metadata := &weaviategrpc.MetadataRequest{
Certainty: false,
Distance: false,
Uuid: true,
}

var nearVector *weaviategrpc.NearVector
if cfg.MultiVectorDimensions > 0 {
rows := len(vec) / cfg.MultiVectorDimensions
doc := make([][]float32, rows)
for i := 0; i < rows; i++ {
start := i * cfg.MultiVectorDimensions
end := start + cfg.MultiVectorDimensions
doc[i] = vec[start:end]
}
multiVec := []*weaviategrpc.Vectors{{
Name: "multivector",
VectorBytes: byteops.Fp32SliceOfSlicesToBytes(doc),
Type: weaviategrpc.Vectors_VECTOR_TYPE_MULTI_FP32,
}}

searchRequest = &weaviategrpc.SearchRequest{
Collection: cfg.ClassName,
Limit: uint32(cfg.Limit),
NearVector: &weaviategrpc.NearVector{
Vectors: multiVec,
},
Metadata: &weaviategrpc.MetadataRequest{
Certainty: false,
Distance: false,
Uuid: true,
},
name := "multivector"
if cfg.NamedVector != "" {
name = cfg.NamedVector
}

} else {
searchRequest = &weaviategrpc.SearchRequest{
Collection: cfg.ClassName,
Limit: uint32(cfg.Limit),
NearVector: &weaviategrpc.NearVector{
VectorBytes: encodeVector(vec),
},
Metadata: &weaviategrpc.MetadataRequest{
Certainty: false,
Distance: false,
Uuid: true,
},
nearVector = &weaviategrpc.NearVector{
Vectors: []*weaviategrpc.Vectors{{
Name: name,
VectorBytes: byteops.Fp32SliceOfSlicesToBytes(doc),
Type: weaviategrpc.Vectors_VECTOR_TYPE_MULTI_FP32,
}},
}
}

if tenant != "" {
searchRequest.Tenant = tenant
}

if cfg.NamedVector != "" {
searchRequest.NearVector = &weaviategrpc.NearVector{
if cfg.NamedVector != "" {
nearVector.Targets = &weaviategrpc.Targets{
TargetVectors: []string{cfg.NamedVector},
}
}
} else if cfg.NamedVector != "" {
nearVector = &weaviategrpc.NearVector{
Targets: &weaviategrpc.Targets{
TargetVectors: []string{cfg.NamedVector},
},
VectorPerTarget: map[string][]byte{
cfg.NamedVector: encodeVector(vec),
},
}
} else {
nearVector = &weaviategrpc.NearVector{
VectorBytes: encodeVector(vec),
}
}

searchRequest := &weaviategrpc.SearchRequest{
Collection: cfg.ClassName,
Limit: uint32(cfg.Limit),
NearVector: nearVector,
Metadata: metadata,
}

if tenant != "" {
searchRequest.Tenant = tenant
}

if filter >= 0 {
Expand Down
Loading