Commit Graph

3472 Commits (85b136b36437d6c3fdcaa54deb3388c76d3a9044)

Author SHA1 Message Date
xiaojun.lin 85b136b364 Fix bug #161
Former-commit-id: 5daf77b3344351a8030e53ff704b7e8bf1cce400
2019-11-01 14:40:52 +08:00
Jin Hai 87b80491d9 Merge pull request #141 from scsven/dev
fix lint

Former-commit-id: 4a5fe797dbf23f6f5476eec728e2d7af61cfbf46
2019-10-30 20:26:40 +08:00
wxyu 87963408bf fix lint
Former-commit-id: 2f5166b4c2a461c379c55eb5a49d431e878aa19a
2019-10-30 20:24:10 +08:00
Jin Hai 7898b8e570 Merge pull request #140 from scsven/dev
New config opion use_gpu_threshold

Former-commit-id: 119adf89b7800ff660ed1589ab829b42c7c2515c
2019-10-30 20:07:57 +08:00
wxyu 7dc552fdea New config opion use_gpu_threshold
Former-commit-id: 3d33145d8fa473f2b81cc98022c1bb93853a2fbc
2019-10-30 19:57:55 +08:00
Jin Hai 3d61bbf9cc Merge pull request #131 from scsven/dev
Set task state MOVED after resource copy it completed

Former-commit-id: 4dfb87b726c56b76c2e56c37ac14a14600a8da21
2019-10-30 14:18:06 +08:00
Jin Hai 98ea5f67eb Merge pull request #133 from milvus-io/master
Merge from master

Former-commit-id: f9817fb9bb7218adff78637b264d5e1e3fc8bece
2019-10-30 14:01:24 +08:00
Jin Hai 7d2e405d32 Merge branch '0.5.1' into master
Former-commit-id: 6c76b96da5353eb746d5c80f8272744e90998a84
2019-10-30 14:01:11 +08:00
Jin Hai 53f36927e4 Merge pull request #132 from milvus-io/0.5.0
Merge from 0.5.0

Former-commit-id: 138a8ec664e4be92dc7eb2eb2f5937f0c9466f5c
2019-10-30 13:39:45 +08:00
wxyu 3f8a3ca9fe Merge remote-tracking branch 'main/0.5.1' into dev
Former-commit-id: 1301dfebe6a4adffd65bf50a4a52f6b33765de7f
2019-10-30 12:34:21 +08:00
wxyu 3fa2c1e69a Set task state MOVED after resource copy it completed
Former-commit-id: a97e306b62f6a0a7a06c881e93a973ad75b8ac9d
2019-10-30 12:34:09 +08:00
Jin Hai 8970efae49 Merge pull request #128 from tinkerlin/upgrade_faiss
Upgrade faiss

Former-commit-id: 0ed5ef40de13008935dbdbe3852e1af47c4d2283
2019-10-29 20:16:03 +08:00
xiaojun.lin 39e127d707 Upgrade Faiss to v1.6
Former-commit-id: 637f6933c77c2644d4d90120d9d2aed77e4e70ff
2019-10-29 20:05:01 +08:00
Jin Hai 8b3a806120 Merge pull request #117 from jielinxu/branch-0.5.1
[skip ci] Add a Thanks section in README

Former-commit-id: e2370710d08ceeca3c8dc50bc88026506fd28b4e
2019-10-29 17:25:40 +08:00
Jin Hai 41c01f649f Merge pull request #121 from yhmo/0.5.1
#90 The server start error messages could be improved to enhance user experience

Former-commit-id: 2cc3ef7933824c3cd77b1427729a9266abd10d04
2019-10-29 17:24:14 +08:00
starlord bb43a77130 update message
Former-commit-id: 0a5ad5dfd42d76032c5008d9d9e4e2213b161232
2019-10-29 17:19:02 +08:00
starlord dcc7fbd439 update message
Former-commit-id: 84f9b8ce2ac8050128f678754123ae2716e3b342
2019-10-29 16:50:55 +08:00
starlord bfdc80401d fix typo
Former-commit-id: bc177ec75ef30265a1358961f89966c8d6ea535c
2019-10-29 16:15:14 +08:00
starlord c63c622cf5 update message
Former-commit-id: 568dbdc5d6dc233716682ebec33e6bd3dfe45500
2019-10-29 16:06:27 +08:00
starlord 96dffcf8ab format code
Former-commit-id: f809ffd4505ada713620e4996d6fe1004bcc69dc
2019-10-29 15:37:08 +08:00
starlord a05cebf513 fix job.h header cpplint error
Former-commit-id: c5bfb2f7acdfad00adf818b9cc4b20ce42b7c9e1
2019-10-29 15:18:54 +08:00
starlord a78e928dfa #90 The server start error messages could be improved to enhance user experience
Former-commit-id: e3ad89ab67f2c46bc4cb4e6d094a7763fb098664
2019-10-29 15:16:04 +08:00
starlord e743adb373 Merge remote-tracking branch 'source/0.5.1' into 0.5.1
Former-commit-id: 4ee722e2074ee58dce001b46ff05fd4c8152beb6
2019-10-29 15:14:18 +08:00
xiaojun.lin 789403b0c1 Merge remote-tracking branch 'gitlab/0.5.1' into upgrade_faiss
Former-commit-id: 826c673ce80978ab416b0e6568328e4028cad607
2019-10-29 11:18:56 +08:00
jielinxu d109a3778c [skip ci] Move Roadmap section ahead
Former-commit-id: c2a065f0192c4bc6ab948d8c4c972847bfcb771b
2019-10-29 09:32:36 +08:00
Jin Hai 2f762900e0 Merge pull request #119 from scsven/dev
Using shared_ptr instead of weak_ptr to avoid performance loss

Former-commit-id: 1e0c9f5a1ce757f3768c5efe44b383e93f677bbe
2019-10-28 20:48:01 +08:00
Jin Hai 39fee7119f Merge pull request #123 from Heisenberg-Y/0.5.1-ezio
[skip ci] refine the copy time test for faiss benchmark

Former-commit-id: fed9741dd7b4e9550e5f8e5d2c118db33995ac78
2019-10-28 20:47:28 +08:00
Heisenberg d95b3906c8 [skip ci] refine the copy time test
Former-commit-id: d370cec5e350d3f3740d9b56182ad0a990ed2ec8
2019-10-28 20:41:08 +08:00
wxyu de2bb68daa Add unique id for Job
Former-commit-id: 1865dbd859f345a3febc3ad76682f928678e59f5
2019-10-28 20:34:26 +08:00
wxyu 7510f1f7a2 remove unused code
Former-commit-id: 630cb776ec1a736f78241835fbbc8cc95b68deaa
2019-10-28 20:28:36 +08:00
starlord 52b6307027 Merge remote-tracking branch 'source/0.5.1' into 0.5.1
Former-commit-id: f29536b8ff8ac23aa9f629da28825c1efcedcf0b
2019-10-28 20:24:42 +08:00
starlord 12b7d6f5d8 #90 The server start error messages could be improved to enhance user experience
Former-commit-id: 746b126621cd845c2848bb850b5c2eb6d3b65a6d
2019-10-28 20:24:13 +08:00
Jin Hai b1d7b02b1e Merge pull request #120 from cydrain/0.5.1
[skip ci] add faiss benchmark

Former-commit-id: 75c483a740e5c317d66ad05f48734baac6226862
2019-10-28 20:18:29 +08:00
yudong.cai b439da8a36 #89 update README.md
Former-commit-id: 0b85b430c0d4a69e0470e916a76adda16f96c12b
2019-10-28 20:17:25 +08:00
yudong.cai 97ae8a780c #89 add README.txt
Former-commit-id: a84501ce6c2c94275819ace9e7d7a4afc14fbeca
2019-10-28 19:55:43 +08:00
yudong.cai 7f6092b6ba #89 add SQ8Hybrid MIX test and pure-GPU test
Former-commit-id: 25b5f419d3deedd4ec39c014ea47822a83a0af38
2019-10-28 19:34:38 +08:00
wxyu 2b1de98912 fix cpplint
Former-commit-id: df5bb8526ac0fe0662b10fbfb7daa706900e6758
2019-10-28 19:29:44 +08:00
wxyu ada0bf86ce solve conflicts
Former-commit-id: 538671361c228898d0f2a81fdfdd7d3087bf0721
2019-10-28 19:23:05 +08:00
wxyu a3c369c076 solve conflicts
Former-commit-id: c92330680d95525afd2b11f3dbeb9db051dfc751
2019-10-28 19:20:55 +08:00
wxyu 53b3b60db2 Using shared_ptr instead of weak_ptr to avoid performance loss
Former-commit-id: 250cb7200b6eefdd9cbb9fd631379d59aca2f368
2019-10-28 19:19:42 +08:00
jielinxu a1d5ff06df [skip ci] minor change
Former-commit-id: 10f0bf48d869fc193e33c1065f43d11c76560594
2019-10-28 17:48:00 +08:00
jielinxu baeff23c6b [skip ci] minor change
Former-commit-id: 5b3a820dc9d017c5dfcb8aa60ed7d3d92d5ef114
2019-10-28 17:32:49 +08:00
wxyu 5e504b3435 rename functions tasktable, make it accessing likes standard structure
Former-commit-id: c0ba41635e710e0807af0fe07d0b6a266f60d044
2019-10-28 17:27:49 +08:00
jielinxu a10f83c69c [skip ci] Typo change
Former-commit-id: 0438b3ee8770228d39d0146e35b154a88381bf1f
2019-10-28 17:12:51 +08:00
Jin Hai 5565c942db Merge pull request #111 from milvus-ci-robot/0.5.1
Add cron syntax to set Time Zone

Former-commit-id: 99f348d00094d06c4ad0b5e57698e433f7aa7716
2019-10-28 16:49:28 +08:00
Jin Hai 8fda112ae1 Merge pull request #116 from scsven/dev
Using new structure for tasktable

Former-commit-id: 184c3c75587577c236933eabdd010df040e525df
2019-10-28 16:49:04 +08:00
wxyu 37e4b0a934 Using new structure for tasktable
Former-commit-id: 80376dce0fd24c8c541c05363d702941f69dca0e
2019-10-28 16:35:53 +08:00
Jin Hai 05f4a9c0fb Merge pull request #112 from del-zhenwu/0.5.1
Disble mysql-version test

Former-commit-id: 9cc7b8ed562daab9c636871c852faaf23c139e44
2019-10-28 16:17:19 +08:00
wxyu 80b9c79c5d Using new structure for tasktable
Former-commit-id: 6742f21a429da87456ded0a910d248948dc948b4
2019-10-28 12:23:25 +08:00
zhenwu a9af857d02 Merge branch '0.5.1' of github.com:milvus-io/milvus into 0.5.1
Former-commit-id: 5855f6e64299ac2ebbf4cd72d9ff279e7dd76831
2019-10-28 11:53:54 +08:00