Commit eb681d1e authored by 王翔宇's avatar 王翔宇
Browse files

Merge remote-tracking branch 'main/0.5.1' into dev 


Former-commit-id: 20a7a399da0eb1aaaeca21741798e96e49ba70c8
parents 4bc7d367 ba70f2c9

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Please mark all change in change log and use the ticket from JIRA. 
# Milvus 0.5.1 (TODO)



## Bug

- \#90 - The server start error messages could be improved to enhance user experience

- \#104 - test_scheduler core dump



## Improvement

README.md

+13 −8
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


## What is Milvus



Milvus is an open source similarity search engine for massive feature vectors. Designed with heterogeneous computing architecture for the best cost efficiency. Searches over billion-scale vectors take only milliseconds with minimum computing resources.

Milvus is an open source similarity search engine for massive-scale feature vectors. Built with heterogeneous computing architecture for the best cost efficiency. Searches over billion-scale vectors take only milliseconds with minimum computing resources.



Milvus provides stable Python, Java and C++ APIs.
@@ -28,7 +28,7 @@ Keep up-to-date with newest releases and latest updates by reading Milvus [relea 


- Heterogeneous computing



  Milvus is designed with heterogeneous computing architecture for the best performance and cost efficiency. 

  Milvus is built with heterogeneous computing architecture for the best performance and cost efficiency. 



- Multiple indexes
@@ -64,14 +64,14 @@ Keep up-to-date with newest releases and latest updates by reading Milvus [relea 


## Get started



### Hardware Requirements

### Hardware requirements



| Component | Recommended configuration           |

| --------- | ----------------------------------- |

| CPU       | Intel CPU Haswell or higher         |

| GPU       | NVIDIA Pascal series or higher      |

| Memory    | 8 GB or more (depends on data size) |

| Storage   | SATA 3.0 SSD or higher              |

| RAM       | 8 GB or more (depends on data size) |

| Hard drive| SATA 3.0 SSD or higher              |



### Install using docker
@@ -168,6 +168,10 @@ Make sure Java 8 or higher is already installed. 


Refer to [this link](https://github.com/milvus-io/milvus-sdk-java/tree/master/examples) for the example code.



## Milvus roadmap



Please read our [roadmap](https://milvus.io/docs/en/roadmap/) to learn about upcoming features.



## Contribution guidelines



Contributions are welcomed and greatly appreciated. Please read our [contribution guidelines](CONTRIBUTING.md) for detailed contribution workflow. This project adheres to the [code of conduct](CODE_OF_CONDUCT.md) of Milvus. By participating, you are expected to uphold this code.
@@ -178,9 +182,11 @@ We use [GitHub issues](https://github.com/milvus-io/milvus/issues/new/choose) to 


To connect with other users and contributors, welcome to join our [slack channel](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk). 



## Milvus Roadmap

## Thanks



Please read our [roadmap](https://milvus.io/docs/en/roadmap/) to learn about upcoming features.

We greatly appreciate the help of the following people.



- [akihoni](https://github.com/akihoni) found a broken link and a small typo in the README file.



## Resources
@@ -196,7 +202,6 @@ Please read our [roadmap](https://milvus.io/docs/en/roadmap/) to learn about upc 


[Milvus roadmap](https://milvus.io/docs/en/roadmap/)





## License



[Apache License 2.0](LICENSE)

ci/jenkinsfile/milvus_build.groovy

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ container('milvus-build-env') { 
                            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' \

                            && export JFROG_USER_NAME='${USERNAME}' \

                            && export JFROG_PASSWORD='${PASSWORD}' \

                            && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \

                            && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.3.0/faiss-branch-0.3.0.tar.gz' \

                            && ./build.sh -t ${params.BUILD_TYPE} -d /opt/milvus -j -u -c"



                            sh "./coverage.sh -u root -p 123456 -t \$POD_IP"

ci/jenkinsfile/milvus_build_no_ut.groovy

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ container('milvus-build-env') { 
                            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' \

                            && export JFROG_USER_NAME='${USERNAME}' \

                            && export JFROG_PASSWORD='${PASSWORD}' \

                            && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \

                            && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.3.0/faiss-branch-0.3.0.tar.gz' \

                            && ./build.sh -t ${params.BUILD_TYPE} -j -d /opt/milvus"

                        }

                    }

core/conf/server_config.template

+12 −12
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 


server_config:

  address: 0.0.0.0                  # milvus server ip address (IPv4)

  port: 19530                       # port range: 1025 ~ 65534

  port: 19530                       # milvus server port, must in range [1025, 65534]

  deploy_mode: single               # deployment type: single, cluster_readonly, cluster_writable

  time_zone: UTC+8

  time_zone: UTC+8                  # time zone, must be in format: UTC+X



db_config:

  primary_path: @MILVUS_DB_PATH@    # path used to store data and meta
@@ -14,30 +14,30 @@ db_config: 
                                    # Keep 'dialect://:@:/', and replace other texts with real values

                                    # Replace 'dialect' with 'mysql' or 'sqlite'



  insert_buffer_size: 4             # GB, maximum insert buffer size allowed

  insert_buffer_size: 4             # GB, maximum insert buffer size allowed, must be a positive integer

                                    # sum of insert_buffer_size and cpu_cache_capacity cannot exceed total memory



  preload_table:                    # preload data at startup, '*' means load all tables, empty value means no preload

                                    # you can specify preload tables like this: table1,table2,table3



metric_config:

  enable_monitor: false             # enable monitoring or not

  enable_monitor: false             # enable monitoring or not, must be a boolean

  collector: prometheus             # prometheus

  prometheus_config:

    port: 8080                      # port prometheus uses to fetch metrics

    port: 8080                      # port prometheus uses to fetch metrics, must in range [1025, 65534]



cache_config:

  cpu_cache_capacity: 16            # GB, CPU memory used for cache

  cpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered

  gpu_cache_capacity: 4             # GB, GPU memory used for cache

  gpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered

  cache_insert_data: false          # whether to load inserted data into cache

  cpu_cache_capacity: 16            # GB, CPU memory used for cache, must be a positive integer

  cpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered, must be in range (0.0, 1.0]

  gpu_cache_capacity: 4             # GB, GPU memory used for cache, must be a positive integer

  gpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered, must be in range (0.0, 1.0]

  cache_insert_data: false          # whether to load inserted data into cache, must be a boolean



engine_config:

  use_blas_threshold: 20            # if nq <  use_blas_threshold, use SSE, faster with fluctuated response times

                                    # if nq >= use_blas_threshold, use OpenBlas, slower with stable response times



resource_config:

  search_resources:                 # define the GPUs used for search computation, valid value: gpux

  search_resources:                 # define the GPUs used for search computation, must be in format: gpux

    - gpu0

  index_build_device: gpu0          # GPU used for building index
 
 No newline at end of file
 
  index_build_device: gpu0          # GPU used for building index, must be in format: gpux
 
 No newline at end of file