diff --git a/core/conf/demo/server_config.yaml b/core/conf/demo/server_config.yaml index 743f15956eee90c9213c64eb151022f4b0779fec..2b24f339ff24bb0be65c90c268a93bca2bafd7e8 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 246f780667a6d7aacc6d3d18d460c3ca3d5d87c1..29c7b8319302f37b9848f13389b03436f4375837 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 5770fdb827bbcb39de81efdf3c501cc3e33dd62a..41eb97b9c63b043bfdac575cc2f014d206a0eef5 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 1aef81939a80720cf11a6d531e6a46be23131db3..9692091e4bb57c06e0ca0bdd8e60a87cbfd86f77 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 dec8f0a22a00bbacf1da248068155c810d2438f6..73e3d42a494fe2316b5ed5ee230743fac36b87dd 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 66fbf0054f86681d589f8dd4ea8ec0969d2449a3..41114f04dfe089fcfeced32c1b3c96ec7cd9e459 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 534a248d85e6a13556c7cc6ac3d72509f9da3fa1..d6ae44f33a722cd7f909632834a4a21dff91ccc2 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 71d05ed5df657f4747f1bfa11f00518380de5778..9dd6756bb7b70dd288af8382f479c3794a836883 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 2dd743b7df2954261d0b2ce65512009e72ad3c76..56e0102d8cdec48a3292f5ed7dfa32f28db027f8 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 a38d5123c0af41e09921149247c2ed0219d73557..527dbbafb67b4d668908a2701e81e86bea8a2f98 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 | #----------------------+------------------------------------------------------------+------------+-----------------+