Skip to content

Commit

Permalink
Add ScaNN index param checker (milvus-io#27268)
Browse files Browse the repository at this point in the history
Signed-off-by: chasingegg <[email protected]>
  • Loading branch information
chasingegg authored Sep 21, 2023
1 parent 206cc14 commit ab2d8dd
Show file tree
Hide file tree
Showing 6 changed files with 216 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/util/indexparamcheck/conf_adapter_mgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (mgr *indexCheckerMgrImpl) registerIndexChecker() {
mgr.checkers[IndexFaissIDMap] = newFlatChecker()
mgr.checkers[IndexFaissIvfFlat] = newIVFBaseChecker()
mgr.checkers[IndexFaissIvfPQ] = newIVFPQChecker()
mgr.checkers[IndexScaNN] = newIVFBaseChecker()
mgr.checkers[IndexScaNN] = newScaNNChecker()
mgr.checkers[IndexFaissIvfSQ8] = newIVFSQChecker()
mgr.checkers[IndexFaissBinIDMap] = newBinFlatChecker()
mgr.checkers[IndexFaissBinIvfFlat] = newBinIVFFlatChecker()
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/indexparamcheck/conf_adapter_mgr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func Test_GetConfAdapterMgrInstance(t *testing.T) {
adapter, err = adapterMgr.GetChecker(IndexScaNN)
assert.Equal(t, nil, err)
assert.NotEqual(t, nil, adapter)
_, ok = adapter.(*ivfBaseChecker)
_, ok = adapter.(*scaNNChecker)
assert.Equal(t, true, ok)

adapter, err = adapterMgr.GetChecker(IndexFaissIvfPQ)
Expand Down Expand Up @@ -104,7 +104,7 @@ func TestConfAdapterMgrImpl_GetAdapter(t *testing.T) {
adapter, err = adapterMgr.GetChecker(IndexScaNN)
assert.Equal(t, nil, err)
assert.NotEqual(t, nil, adapter)
_, ok = adapter.(*ivfBaseChecker)
_, ok = adapter.(*scaNNChecker)
assert.Equal(t, true, ok)

adapter, err = adapterMgr.GetChecker(IndexFaissIvfPQ)
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/indexparamcheck/ivf_pq_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (c *ivfPQChecker) checkPQParams(params map[string]string) error {

func (c *ivfPQChecker) checkCPUPQParams(dimension, m int) error {
if (dimension % m) != 0 {
return fmt.Errorf("dimension must be abled to be divided by `m`, dimension: %d, m: %d", dimension, m)
return fmt.Errorf("dimension must be able to be divided by `m`, dimension: %d, m: %d", dimension, m)
}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/indexparamcheck/raft_ivf_pq_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (c *raftIVFPQChecker) checkPQParams(params map[string]string) error {
return nil
}
if dimension%m != 0 {
return fmt.Errorf("dimension must be abled to be divided by `m`, dimension: %d, m: %d", dimension, m)
return fmt.Errorf("dimension must be able to be divided by `m`, dimension: %d, m: %d", dimension, m)
}
return nil
}
Expand Down
41 changes: 41 additions & 0 deletions pkg/util/indexparamcheck/scann_checker.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package indexparamcheck

import (
"fmt"
"strconv"
)

// scaNNChecker checks if a SCANN index can be built.
type scaNNChecker struct {
ivfBaseChecker
}

// CheckTrain checks if SCANN index can be built with the specific index parameters.
func (c *scaNNChecker) CheckTrain(params map[string]string) error {
if err := c.ivfBaseChecker.CheckTrain(params); err != nil {
return err
}

return c.checkScaNNParams(params)
}

func (c *scaNNChecker) checkScaNNParams(params map[string]string) error {
dimStr, dimensionExist := params[DIM]
if !dimensionExist {
return fmt.Errorf("dimension not found")
}

dimension, err := strconv.Atoi(dimStr)
if err != nil { // invalid dimension
return fmt.Errorf("invalid dimension: %s", dimStr)
}

if (dimension % 2) != 0 {
return fmt.Errorf("dimension must be able to be divided by 2, dimension: %d", dimension)
}
return nil
}

func newScaNNChecker() IndexChecker {
return &scaNNChecker{}
}
170 changes: 170 additions & 0 deletions pkg/util/indexparamcheck/scann_checker_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
package indexparamcheck

import (
"strconv"
"testing"

"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
"github.com/milvus-io/milvus/pkg/util/metric"

"github.com/stretchr/testify/assert"
)

func Test_scaNNChecker_CheckTrain(t *testing.T) {
validParams := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.L2,
}

paramsNotMultiplier := map[string]string{
DIM: strconv.Itoa(127),
NLIST: strconv.Itoa(1024),
Metric: metric.L2,
}

validParamsWithoutDim := map[string]string{
NLIST: strconv.Itoa(1024),
Metric: metric.L2,
}

invalidParamsDim := copyParams(validParams)
invalidParamsDim[DIM] = "NAN"

p1 := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.L2,
}
p2 := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.IP,
}
p3 := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.COSINE,
}

p4 := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.HAMMING,
}
p5 := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.JACCARD,
}
p6 := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.SUBSTRUCTURE,
}
p7 := map[string]string{
DIM: strconv.Itoa(128),
NLIST: strconv.Itoa(1024),
Metric: metric.SUPERSTRUCTURE,
}

cases := []struct {
params map[string]string
errIsNil bool
}{
{validParams, true},
{paramsNotMultiplier, false},
{invalidIVFParamsMin(), false},
{invalidIVFParamsMax(), false},
{validParamsWithoutDim, false},
{invalidParamsDim, false},
{p1, true},
{p2, true},
{p3, true},
{p4, false},
{p5, false},
{p6, false},
{p7, false},
}

c := newScaNNChecker()
for _, test := range cases {
err := c.CheckTrain(test.params)
if test.errIsNil {
assert.NoError(t, err)
} else {
assert.Error(t, err)
}
}
}

func Test_scaNNChecker_CheckValidDataType(t *testing.T) {

cases := []struct {
dType schemapb.DataType
errIsNil bool
}{
{
dType: schemapb.DataType_Bool,
errIsNil: false,
},
{
dType: schemapb.DataType_Int8,
errIsNil: false,
},
{
dType: schemapb.DataType_Int16,
errIsNil: false,
},
{
dType: schemapb.DataType_Int32,
errIsNil: false,
},
{
dType: schemapb.DataType_Int64,
errIsNil: false,
},
{
dType: schemapb.DataType_Float,
errIsNil: false,
},
{
dType: schemapb.DataType_Double,
errIsNil: false,
},
{
dType: schemapb.DataType_String,
errIsNil: false,
},
{
dType: schemapb.DataType_VarChar,
errIsNil: false,
},
{
dType: schemapb.DataType_Array,
errIsNil: false,
},
{
dType: schemapb.DataType_JSON,
errIsNil: false,
},
{
dType: schemapb.DataType_FloatVector,
errIsNil: true,
},
{
dType: schemapb.DataType_BinaryVector,
errIsNil: false,
},
}

c := newScaNNChecker()
for _, test := range cases {
err := c.CheckValidDataType(test.dType)
if test.errIsNil {
assert.NoError(t, err)
} else {
assert.Error(t, err)
}
}
}

0 comments on commit ab2d8dd

Please sign in to comment.