Commit Graph

958 Commits

Author SHA1 Message Date
Yang Xuan
6407ad6a57 Merge branch 'branch-0.3.0' of http://192.168.1.105:6060/xuan.yang/vecwise_engine into branch-0.3.0
Former-commit-id: 4083c2e626b27c1995f7394bbbf978910cb045b9
2019-06-13 17:55:46 +08:00
Yang Xuan
f9b557b1a5 feat(python): add built docs
Former-commit-id: edbafb6e246e5ac3167233f24f80577fd40a628c
2019-06-13 17:54:46 +08:00
xuan.yang
3924a07df2 change host and port example.py
Former-commit-id: 52d3b8800e40318fda95fc698728fb21221ba0f6
2019-06-13 17:32:50 +08:00
Yang Xuan
e7021fc234 Merge remote-tracking branch 'mega/branch-0.3.0' into branch-0.3.0
Former-commit-id: eeb07fe4825bd1c21ec900cea5451c235f3053b8
2019-06-13 17:15:32 +08:00
Yang Xuan
e651a07e24 feat(python): build docs, fix examples bug
Former-commit-id: 79d4b0556dc9caeb432bf7981fc32e4302e48411
2019-06-13 17:15:28 +08:00
jinhai
af7478044f Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-83 - Update vecwise to Milvus and Update welcome message

See merge request megasearch/vecwise_engine!86

Former-commit-id: 0ff5d3599c5e3c700ac4c220a8f2bb5e297e0cbe
2019-06-13 16:55:26 +08:00
jinhai
b749e7ec50 MS-82 Update
Former-commit-id: c8dd35401e0fd15df7f140978e37c7a0e6a363f7
2019-06-13 16:54:49 +08:00
jinhai
b6e51b26be Merge remote-tracking branch 'upstream/branch-0.3.0' into branch-0.3.0
Former-commit-id: f431335445d2c54f939dfd84a8dfdf0e4d2df4a2
2019-06-13 16:04:04 +08:00
jinhai
49c528301c Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-80 fix hang issue

See merge request megasearch/vecwise_engine!85

Former-commit-id: 583d6c0a0915be203fa26b235958f6c161075fd4
2019-06-13 16:03:13 +08:00
jinhai
94612238e5 MS-82 & MS-83 Update vecwise to Milvus
Former-commit-id: 69d1f1b661e6fc7779b4ae3abae60eeb28fa2b04
2019-06-13 16:02:25 +08:00
groot
ebfa05d435 fix hang issue
Former-commit-id: 8e31caee7dc66dfca929f78a55786b5d0e86837d
2019-06-13 15:32:02 +08:00
jinhai
9c34c92e16 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-81: fix faiss ptx issue; change cuda gencode

See merge request megasearch/vecwise_engine!84

Former-commit-id: 14033f044523fe36dfff5c4c5841b794ed2ffb75
2019-06-13 14:34:04 +08:00
jinhai
2f6ad0dfc6 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-76 fix pipeline crash bug

See merge request megasearch/vecwise_engine!82

Former-commit-id: 4bfb462d7762632499a1170c20280874df61362f
2019-06-13 14:33:47 +08:00
zhiru
83bce35e8c fix faiss ptx issue; change cuda gencode
Former-commit-id: e45b7ae6b90cc3cdbf56dd30a8e9a674a03d0028
2019-06-13 13:20:06 +08:00
Yang Xuan
3367c1543f Merge remote-tracking branch 'mega/branch-0.3.0' into branch-0.3.0
Former-commit-id: bd55d1b4cdbe3a7a799b689777a71f36031f82bc
2019-06-13 11:21:51 +08:00
Yang Xuan
2a027bff6f edit(python): change name to milvus
Former-commit-id: 35bf1219af291c16b31c23d017e1d5d4b8a136f2
2019-06-13 11:21:26 +08:00
groot
ff00692666 chnagelog
Former-commit-id: 976eb7fe04f1e66e2501451491cc7dff052fbda7
2019-06-13 10:08:45 +08:00
groot
c604eb59a2 fix pipeline crash bug
Former-commit-id: 55fbac7f92ba19ccb23425f8720b29efd65c5728
2019-06-13 10:05:08 +08:00
jinhai
be843f84c4 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-75: cmake: change faiss version to 1.5.2; add CUDA gencode

See merge request megasearch/vecwise_engine!80

Former-commit-id: a7ea464c9b193f96a326588cf9a2ce89ecef605f
2019-06-12 19:38:06 +08:00
jinhai
1c4e97e4c1 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-56 Add version information when server is started

See merge request megasearch/vecwise_engine!79

Former-commit-id: 5d3818724e48d1ec742477e7fc300a96ab3f8db6
2019-06-12 11:55:54 +08:00
zhiru
1577ed3502 cmake: change faiss version to 1.5.2; add CUDA gencode
Former-commit-id: 63fea8b09720ced30413b08faea8237939ed41a3
2019-06-12 11:27:50 +08:00
groot
11b32c9d1d version bug
Former-commit-id: aeded6d017202aff19cccd44bb4f7299cbad4d31
2019-06-12 11:11:00 +08:00
jinhai
cf90109504 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-74: Change README.md in cpp

See merge request megasearch/vecwise_engine!78

Former-commit-id: 656f8ab9fecbfb4fc1e740e461ea22b9511c65f2
2019-06-12 11:07:14 +08:00
jinhai
a0280e5172 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-11 Implement Python SDK

See merge request megasearch/vecwise_engine!74

Former-commit-id: f4862569304e1acb07582db0ac24b8a6c514b1e4
2019-06-12 11:06:52 +08:00
zhiru
a7b27d3c46 Change README.md in cpp
Former-commit-id: c6ad84a6488350bce6f007df8a9e81ad3817fc88
2019-06-12 11:05:33 +08:00
Yang Xuan
50003059b4 feat(python): add python version support, delete LICENSE
Former-commit-id: 1bea25c86f112328f874fb03803504e02a1221dc
2019-06-12 10:26:14 +08:00
Yang Xuan
e3ecd90368 Merge remote-tracking branch 'mega/branch-0.3.0' into branch-0.3.0
Former-commit-id: 3f2c2aa48d193802d1786515271b77f61b0b1438
2019-06-12 09:09:02 +08:00
jinhai
cb489d015d Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-45 - Implement DeleteTable interface

See merge request megasearch/vecwise_engine!77

Former-commit-id: db5775f82ff3923dda39ec04070b1ec7433c37f8
2019-06-11 16:59:41 +08:00
groot
235b85f63b changelog
Former-commit-id: 6b2099e086696dfbf956e0778d0941ec89bb4812
2019-06-11 16:43:05 +08:00
groot
8b3982916f changelog
Former-commit-id: 307d64c2635cc7cc5efbc973d573ef9d030eec27
2019-06-11 16:41:41 +08:00
groot
3ee722ae85 merge remote branch 0.3.0
Former-commit-id: e7cc89f6bd93693ca0b6501293b91646ef47130d
2019-06-11 16:38:36 +08:00
jinhai
cbf26f8d47 Merge branch 'prometheus-0.3.0' into 'branch-0.3.0'
cmake: delete civetweb

See merge request megasearch/vecwise_engine!76

Former-commit-id: c449ad8b64dab82e4bc5c72bffe043a3c5dda3b6
2019-06-11 16:25:13 +08:00
zhiru
8328391443 cmake: delete civetweb
Former-commit-id: 9433a000ba9da1916ef85288316477069d2019c7
2019-06-11 16:23:55 +08:00
jinhai
8df96af626 Merge branch 'prometheus-0.3.0' into 'branch-0.3.0'
MS-72 - cmake: change prometheus source to git

See merge request megasearch/vecwise_engine!72

Former-commit-id: dd77b8e42257eed387f69e10914b10f642816394
2019-06-11 15:49:50 +08:00
zhiru
2d7b67a06f fix merge conflicts
Former-commit-id: a716e47d046e3cc738f7f4b6a7b7201f57fa0d3a
2019-06-11 15:47:50 +08:00
jinhai
72fb143790 Merge branch 'fixFaissDependency-0.3.0' into 'branch-0.3.0'
cmake: fix faiss dependency

See merge request megasearch/vecwise_engine!71

Former-commit-id: 32f32c6a00cedc728869975263d5a82302b4ccfe
2019-06-11 15:43:25 +08:00
zhiru
420fe72133 fix merge conflicts
Former-commit-id: 3b113299611aac6bf6094315be161f27760d56a6
2019-06-11 15:43:05 +08:00
jinhai
475f4d1ffc Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-70: cmake: remove redundant libs in src

See merge request megasearch/vecwise_engine!70

Former-commit-id: 15e5c8958db1776676cf0a5ee140afd2fc67fe7a
2019-06-11 15:39:58 +08:00
groot
db3f0e9ba7 support delete table
Former-commit-id: 3b728c4dfc0b9a6c8803538c89961e4b43c6ca67
2019-06-11 14:54:09 +08:00
zhiru
4e1d514c73 fix merge conflicts
Former-commit-id: c6d304468fb8e4ac35a8b16b5090ac0c78d38af7
2019-06-11 14:35:44 +08:00
jinhai
ea01661889 Merge branch 'turnOffRocksDB-0.3.0' into 'branch-0.3.0'
MS-68: Remove rocksdb from third-party

See merge request megasearch/vecwise_engine!73

Former-commit-id: 6c870e6cb1f5434b619485bf4306e3a02fc7bfd4
2019-06-11 14:22:12 +08:00
jinhai
fd407c9e62 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS - 69 add all metrics

See merge request megasearch/vecwise_engine!69

Former-commit-id: 45cf1dc65c7a750ba7001888ac36da6e13b85d94
2019-06-11 14:12:32 +08:00
yu yunfeng
25398285e3 Merge remote-tracking branch 'main/branch-0.3.0' into branch-0.3.0
Former-commit-id: 6fec52f1aed006946b3360647d2f3fc727632fb3
2019-06-11 14:10:50 +08:00
yu yunfeng
9cb66ac8d9 fix
Former-commit-id: 00af0b4a367be2dfb26fff09105482364fd56a8e
2019-06-11 14:10:22 +08:00
Yang Xuan
0187266364 feat(python): change changelog
Former-commit-id: 8f7e3a86576631ce259fbaabd8bbd4c6f712ac42
2019-06-11 12:00:49 +08:00
Yang Xuan
205a7f8df5 Merge remote-tracking branch 'mega/branch-0.3.0' into branch-0.3.0
Former-commit-id: c95649272003e9b821596912b10eb328940a1260
2019-06-11 11:57:46 +08:00
Yang Xuan
6de6fdfb91 feat(python): add setup and LICENSE, change requirements
Former-commit-id: db1f39ec461cdf176671a03b9ec12db2894dda58
2019-06-11 11:57:37 +08:00
zhiru
4875bdc4b6 Remove rocksdb from third-party
Former-commit-id: 5f7439e7a2152d5b6b9a8dd82ff54a091ea729ec
2019-06-11 11:47:17 +08:00
zhiru
ec9afe5c46 cmake: change prometheus source to git
Former-commit-id: ee0b45452cd7a5d695cabc31ab833b86a05c87ce
2019-06-11 11:41:11 +08:00
zhiru
6c59f66b0d cmake: fix faiss dependency
Former-commit-id: 4f93415c61d67a902972cfde865f2672366282b1
2019-06-11 11:00:41 +08:00