Skip to content

Commit

Permalink
add inner product distance type for ngt (#2454) (#2458)
Browse files Browse the repository at this point in the history
Signed-off-by: kpango <kpango@vdaas.org>
Co-authored-by: Yusuke Kato <kpango@vdaas.org>
  • Loading branch information
vdaas-ci and kpango committed Mar 15, 2024
1 parent 4956c62 commit 216ec9a
Show file tree
Hide file tree
Showing 27 changed files with 1,293 additions and 1,212 deletions.
9 changes: 7 additions & 2 deletions .gitfiles
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
.prh.yaml
.textlintrc
.whitesource
.yamlfmt
CHANGELOG.md
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Expand Down Expand Up @@ -417,7 +418,6 @@ charts/vald/templates/index/job/creation/networkpolicy.yaml
charts/vald/templates/index/job/readreplica/rotate/clusterrole.yaml
charts/vald/templates/index/job/readreplica/rotate/clusterrolebinding.yaml
charts/vald/templates/index/job/readreplica/rotate/configmap.yaml
charts/vald/templates/index/job/readreplica/rotate/cronjob.yaml
charts/vald/templates/index/job/readreplica/rotate/networkpolicy.yaml
charts/vald/templates/index/job/readreplica/rotate/serviceaccount.yaml
charts/vald/templates/index/job/save/configmap.yaml
Expand Down Expand Up @@ -1048,6 +1048,9 @@ internal/k8s/service/option.go
internal/k8s/service/option_test.go
internal/k8s/service/service.go
internal/k8s/service/service_test.go
internal/k8s/v2/pod/option.go
internal/k8s/v2/pod/pod.go
internal/k8s/vald/annotations.go
internal/k8s/vald/benchmark/api/v1/info.go
internal/k8s/vald/benchmark/api/v1/job_types.go
internal/k8s/vald/benchmark/api/v1/scenario_types.go
Expand Down Expand Up @@ -1214,6 +1217,8 @@ internal/observability/metrics/runtime/cgo/cgo.go
internal/observability/metrics/runtime/cgo/cgo_test.go
internal/observability/metrics/runtime/goroutine/goroutine.go
internal/observability/metrics/runtime/goroutine/goroutine_test.go
internal/observability/metrics/tools/benchmark/benchmark.go
internal/observability/metrics/tools/benchmark/benchmark_test.go
internal/observability/metrics/version/version.go
internal/observability/metrics/version/version_test.go
internal/observability/observability.go
Expand Down Expand Up @@ -1412,7 +1417,6 @@ k8s/index/job/creation/networkpolicy.yaml
k8s/index/job/readreplica/rotate/clusterrole.yaml
k8s/index/job/readreplica/rotate/clusterrolebinding.yaml
k8s/index/job/readreplica/rotate/configmap.yaml
k8s/index/job/readreplica/rotate/cronjob.yaml
k8s/index/job/readreplica/rotate/networkpolicy.yaml
k8s/index/job/readreplica/rotate/serviceaccount.yaml
k8s/index/job/save/configmap.yaml
Expand All @@ -1436,6 +1440,7 @@ k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml
k8s/metrics/grafana/dashboards/07-vald-helm-operator.yaml
k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml
k8s/metrics/grafana/dashboards/09-vald-index-correction.yaml
k8s/metrics/grafana/dashboards/10-vald-benchmark-operator.yaml
k8s/metrics/grafana/dashboards/99-vald-agent-memory.yaml
k8s/metrics/grafana/deployment.yaml
k8s/metrics/grafana/svc.yaml
Expand Down
18 changes: 18 additions & 0 deletions .yamlfmt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# Copyright (C) 2019-2024 vdaas.org vald team <vald@vdaas.org>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# You may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
formatter:
type: basic
indentation: 2
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -569,13 +569,12 @@ version/telepresence:
## install NGT
ngt/install: /usr/local/include/NGT/Capi.h
/usr/local/include/NGT/Capi.h:
curl -LO https://github.com/yahoojapan/NGT/archive/v$(NGT_VERSION).tar.gz
tar zxf v$(NGT_VERSION).tar.gz -C $(TEMP_DIR)/
git clone --depth 1 --branch v$(NGT_VERSION) https://github.com/yahoojapan/NGT $(TEMP_DIR)/NGT-$(NGT_VERSION)
cd $(TEMP_DIR)/NGT-$(NGT_VERSION) && \
cmake -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" .
make -j -C $(TEMP_DIR)/NGT-$(NGT_VERSION)
make install -C $(TEMP_DIR)/NGT-$(NGT_VERSION)
rm -rf v$(NGT_VERSION).tar.gz
cd $(ROOTDIR)
rm -rf $(TEMP_DIR)/NGT-$(NGT_VERSION)
ldconfig

Expand Down
321 changes: 161 additions & 160 deletions charts/vald-benchmark-operator/README.md

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions charts/vald-benchmark-operator/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"type": "object",
"description": "deployment annotations"
},
"env": {
"type": "array",
"description": "environment variables",
"items": { "type": "object" }
},
"image": {
"type": "object",
"properties": {
Expand Down
4 changes: 4 additions & 0 deletions charts/vald-helm-operator/crds/valdrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ spec:
- normalizedangle
- normcos
- normalizedcosine
- dotproduct
- innerproduct
- dp
- ip
enable_copy_on_write:
type: boolean
enable_export_index_info_to_k8s:
Expand Down
Loading

0 comments on commit 216ec9a

Please sign in to comment.