From 2d57c5cd5239014401f683fa04235dffed79657b Mon Sep 17 00:00:00 2001 From: BossZou <40255591+BossZou@users.noreply.github.com> Date: Wed, 2 Dec 2020 18:00:19 +0800 Subject: [PATCH] Upgrade mishards for v0.10.4 (#4356) Signed-off-by: yinghao.zou --- core/conf/demo/server_config.yaml | 13 +++++++++++++ core/conf/server_config.template | 8 ++++---- shards/README.md | 2 +- shards/README_CN.md | 2 +- shards/all_in_one/all_in_one.yml | 4 ++-- shards/all_in_one/ro_server.yml | 13 +++++++++++++ shards/all_in_one/wr_server.yml | 13 +++++++++++++ shards/all_in_one_with_mysql/all_in_one.yml | 4 ++-- shards/all_in_one_with_mysql/ro_server.yml | 13 +++++++++++++ shards/all_in_one_with_mysql/wr_server.yml | 13 +++++++++++++ 10 files changed, 75 insertions(+), 10 deletions(-) diff --git a/core/conf/demo/server_config.yaml b/core/conf/demo/server_config.yaml index 743f15956eee9..2b24f339ff24b 100644 --- a/core/conf/demo/server_config.yaml +++ b/core/conf/demo/server_config.yaml @@ -151,6 +151,19 @@ gpu: build_index_devices: - gpu0 +#----------------------+------------------------------------------------------------+------------+-----------------+ +# FPGA Config | Description | Type | Default | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# enable | Use FPGA devices or not. | Boolean | false | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# search_devices | The list of FPGA devices used for search computation. | DeviceList | fpga0 | +# | Must be in format fpgax. | | | +#----------------------+------------------------------------------------------------+------------+-----------------+ +fpga: + enable: false + search_devices: + - fpga0 + #----------------------+------------------------------------------------------------+------------+-----------------+ # Logs Config | Description | Type | Default | #----------------------+------------------------------------------------------------+------------+-----------------+ diff --git a/core/conf/server_config.template b/core/conf/server_config.template index 246f780667a6d..29c7b8319302f 100644 --- a/core/conf/server_config.template +++ b/core/conf/server_config.template @@ -152,12 +152,12 @@ gpu: - gpu0 #----------------------+------------------------------------------------------------+------------+-----------------+ -# FPGA Config | Description | Type | Default | +# FPGA Config | Description | Type | Default | #----------------------+------------------------------------------------------------+------------+-----------------+ -# enable | Use FPGA devices or not. | Boolean | false | +# enable | Use FPGA devices or not. | Boolean | false | #----------------------+------------------------------------------------------------+------------+-----------------+ -# search_devices | The list of FPGA devices used for search computation. | DeviceList | gpu0 | -# | Must be in format fpgax. | | | +# search_devices | The list of FPGA devices used for search computation. | DeviceList | fpga0 | +# | Must be in format fpgax. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ fpga: diff --git a/shards/README.md b/shards/README.md index 5770fdb827bbc..41eb97b9c63b0 100644 --- a/shards/README.md +++ b/shards/README.md @@ -54,7 +54,7 @@ Follow below steps to start a standalone Milvus instance with Mishards from sour 3. Start Milvus server. ```shell - $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.10.3-gpu-d091720-f962e8 + $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.10.4-gpu-d120220-e72454 ``` 4. Update path permissions. diff --git a/shards/README_CN.md b/shards/README_CN.md index 1aef81939a807..9692091e4bb57 100644 --- a/shards/README_CN.md +++ b/shards/README_CN.md @@ -48,7 +48,7 @@ Python 版本为3.6及以上。 3. 启动 Milvus 服务。 ```shell - $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.10.3-gpu-d091720-f962e8 + $ sudo nvidia-docker run --rm -d -p 19530:19530 -v /tmp/milvus/db:/var/lib/milvus/db milvusdb/milvus:0.10.4-gpu-d120220-e72454 ``` 4. 更改目录权限。 diff --git a/shards/all_in_one/all_in_one.yml b/shards/all_in_one/all_in_one.yml index dec8f0a22a00b..73e3d42a494fe 100644 --- a/shards/all_in_one/all_in_one.yml +++ b/shards/all_in_one/all_in_one.yml @@ -3,7 +3,7 @@ services: milvus_wr: runtime: nvidia restart: always - image: milvusdb/milvus:0.10.3-gpu-d091720-f962e8 + image: milvusdb/milvus:0.10.4-gpu-d120220-e72454 ports: - "0.0.0.0:19540:19530" volumes: @@ -13,7 +13,7 @@ services: milvus_ro: runtime: nvidia restart: always - image: milvusdb/milvus:0.10.3-gpu-d091720-f962e8 + image: milvusdb/milvus:0.10.4-gpu-d120220-e72454 ports: - "0.0.0.0:19541:19530" volumes: diff --git a/shards/all_in_one/ro_server.yml b/shards/all_in_one/ro_server.yml index 66fbf0054f866..41114f04dfe08 100644 --- a/shards/all_in_one/ro_server.yml +++ b/shards/all_in_one/ro_server.yml @@ -149,6 +149,19 @@ gpu: build_index_devices: - gpu0 +#----------------------+------------------------------------------------------------+------------+-----------------+ +# FPGA Config | Description | Type | Default | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# enable | Use FPGA devices or not. | Boolean | false | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# search_devices | The list of FPGA devices used for search computation. | DeviceList | fpga0 | +# | Must be in format fpgax. | | | +#----------------------+------------------------------------------------------------+------------+-----------------+ +fpga: + enable: false + search_devices: + - fpga0 + #----------------------+------------------------------------------------------------+------------+-----------------+ # Logs Config | Description | Type | Default | #----------------------+------------------------------------------------------------+------------+-----------------+ diff --git a/shards/all_in_one/wr_server.yml b/shards/all_in_one/wr_server.yml index 534a248d85e6a..d6ae44f33a722 100644 --- a/shards/all_in_one/wr_server.yml +++ b/shards/all_in_one/wr_server.yml @@ -149,6 +149,19 @@ gpu: build_index_devices: - gpu0 +#----------------------+------------------------------------------------------------+------------+-----------------+ +# FPGA Config | Description | Type | Default | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# enable | Use FPGA devices or not. | Boolean | false | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# search_devices | The list of FPGA devices used for search computation. | DeviceList | fpga0 | +# | Must be in format fpgax. | | | +#----------------------+------------------------------------------------------------+------------+-----------------+ +fpga: + enable: false + search_devices: + - fpga0 + #----------------------+------------------------------------------------------------+------------+-----------------+ # Logs Config | Description | Type | Default | #----------------------+------------------------------------------------------------+------------+-----------------+ diff --git a/shards/all_in_one_with_mysql/all_in_one.yml b/shards/all_in_one_with_mysql/all_in_one.yml index 71d05ed5df657..9dd6756bb7b70 100644 --- a/shards/all_in_one_with_mysql/all_in_one.yml +++ b/shards/all_in_one_with_mysql/all_in_one.yml @@ -18,7 +18,7 @@ services: milvus_wr: runtime: nvidia restart: always - image: milvusdb/milvus:0.10.3-gpu-d091720-f962e8 + image: milvusdb/milvus:0.10.4-gpu-d120220-e72454 volumes: - /tmp/milvus/db:/var/lib/milvus/db - ./wr_server.yml:/var/lib/milvus/conf/server_config.yaml @@ -29,7 +29,7 @@ services: milvus_ro: runtime: nvidia restart: always - image: milvusdb/milvus:0.10.3-gpu-d091720-f962e8 + image: milvusdb/milvus:0.10.4-gpu-d120220-e72454 volumes: - /tmp/milvus/db:/var/lib/milvus/db - ./ro_server.yml:/var/lib/milvus/conf/server_config.yaml diff --git a/shards/all_in_one_with_mysql/ro_server.yml b/shards/all_in_one_with_mysql/ro_server.yml index 2dd743b7df295..56e0102d8cdec 100644 --- a/shards/all_in_one_with_mysql/ro_server.yml +++ b/shards/all_in_one_with_mysql/ro_server.yml @@ -149,6 +149,19 @@ gpu: build_index_devices: - gpu0 +#----------------------+------------------------------------------------------------+------------+-----------------+ +# FPGA Config | Description | Type | Default | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# enable | Use FPGA devices or not. | Boolean | false | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# search_devices | The list of FPGA devices used for search computation. | DeviceList | fpga0 | +# | Must be in format fpgax. | | | +#----------------------+------------------------------------------------------------+------------+-----------------+ +fpga: + enable: false + search_devices: + - fpga0 + #----------------------+------------------------------------------------------------+------------+-----------------+ # Logs Config | Description | Type | Default | #----------------------+------------------------------------------------------------+------------+-----------------+ diff --git a/shards/all_in_one_with_mysql/wr_server.yml b/shards/all_in_one_with_mysql/wr_server.yml index a38d5123c0af4..527dbbafb67b4 100644 --- a/shards/all_in_one_with_mysql/wr_server.yml +++ b/shards/all_in_one_with_mysql/wr_server.yml @@ -149,6 +149,19 @@ gpu: build_index_devices: - gpu0 +#----------------------+------------------------------------------------------------+------------+-----------------+ +# FPGA Config | Description | Type | Default | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# enable | Use FPGA devices or not. | Boolean | false | +#----------------------+------------------------------------------------------------+------------+-----------------+ +# search_devices | The list of FPGA devices used for search computation. | DeviceList | fpga0 | +# | Must be in format fpgax. | | | +#----------------------+------------------------------------------------------------+------------+-----------------+ +fpga: + enable: false + search_devices: + - fpga0 + #----------------------+------------------------------------------------------------+------------+-----------------+ # Logs Config | Description | Type | Default | #----------------------+------------------------------------------------------------+------------+-----------------+