Commit 037ec9a1 authored by zhenwu's avatar zhenwu
Browse files

Merge branch '0.5.1' of github.com:milvus-io/milvus into 0.5.1 


Former-commit-id: 2ab0daf4073f57639b3f18eace62b140cb323703
parents c1f7b5fb e838492f

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#80 - Print version information into log during server start

- \#82 - Move easyloggingpp into "external" directory

- \#92 - Speed up CMake build process



- \#96 - Remove .a file in milvus/lib for docker-version

## Feature

## Task

README.md

+8 −4
Original line number Diff line number Diff line 


![Milvuslogo](https://github.com/milvus-io/docs/blob/master/assets/milvus_logo.png)





![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen)

![Language](https://img.shields.io/badge/language-C%2B%2B-blue)

[![codebeat badge](https://codebeat.co/badges/e030a4f6-b126-4475-a938-4723d54ec3a7?style=plastic)](https://codebeat.co/projects/github-com-jinhai-cn-milvus-master)

![Release](https://img.shields.io/badge/release-v0.5.0-orange)

![Release_date](https://img.shields.io/badge/release_date-October-yellowgreen)



- [Slack Community](https://join.slack.com/t/milvusio/shared_invite/enQtNzY1OTQ0NDI3NjMzLWNmYmM1NmNjOTQ5MGI5NDhhYmRhMGU5M2NhNzhhMDMzY2MzNDdlYjM5ODQ5MmE3ODFlYzU3YjJkNmVlNDQ2ZTk)

- [Twitter](https://twitter.com/milvusio)
@@ -21,7 +24,7 @@ Milvus is an open source similarity search engine for massive feature vectors. D 


Milvus provides stable Python, Java and C++ APIs.



Keep up-to-date with newest releases and latest updates by reading Milvus [release notes](https://milvus.io/docs/en/Releases/v0.5.0/).

Keep up-to-date with newest releases and latest updates by reading Milvus [release notes](https://milvus.io/docs/en/release/v0.5.0/).



- Heterogeneous computing
@@ -89,7 +92,7 @@ Use Docker to install Milvus is a breeze. See the [Milvus install guide](https:/ 


```shell

$ cd [Milvus sourcecode path]/core

./ubuntu_build_deps.sh

$ ./ubuntu_build_deps.sh

```



##### Step 2 Build
@@ -167,7 +170,7 @@ Refer to [this link](https://github.com/milvus-io/milvus-sdk-java/tree/master/ex 


## Contribution guidelines



Contributions are welcomed and greatly appreciated. If you want to contribute to Milvus, please read our [contribution guidelines](CONTRIBUTING.md). This project adheres to the [code of conduct](CODE_OF_CONDUCT.md) of Milvus. By participating, you are expected to uphold this code.

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.



We use [GitHub issues](https://github.com/milvus-io/milvus/issues/new/choose) to track issues and bugs. For general questions and public discussions, please join our community.
@@ -196,5 +199,6 @@ Please read our [roadmap](https://milvus.io/docs/en/roadmap/) to learn about upc 


## License



[Apache 2.0 license](LICENSE)

[Apache License 2.0](LICENSE)

core/src/index/knowhere/CMakeLists.txt

+1 −35
Original line number Diff line number Diff line
@@ -81,27 +81,6 @@ target_link_libraries( 
        ${depend_libs}

)



INSTALL(TARGETS

        knowhere

        SPTAGLibStatic

        DESTINATION

        lib)



INSTALL(FILES

        ${ARROW_STATIC_LIB}

        ${ARROW_PREFIX}/lib/libjemalloc_pic.a

        ${FAISS_STATIC_LIB}

        ${LAPACK_STATIC_LIB}

        ${BLAS_STATIC_LIB}

        DESTINATION

        lib

        )



INSTALL(FILES ${OPENBLAS_REAL_STATIC_LIB}

        RENAME "libopenblas.a"

        DESTINATION lib

        )



set(INDEX_INCLUDE_DIRS

        ${INDEX_SOURCE_DIR}/knowhere

        ${INDEX_SOURCE_DIR}/thirdparty
@@ -113,16 +92,3 @@ set(INDEX_INCLUDE_DIRS 
        )



set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
 
 No newline at end of file
 


#INSTALL(DIRECTORY

#        ${INDEX_SOURCE_DIR}/include/knowhere

#        ${ARROW_INCLUDE_DIR}/arrow

#        ${FAISS_PREFIX}/include/faiss

#        ${OPENBLAS_INCLUDE_DIR}/

#        DESTINATION

#        include)

#

#INSTALL(DIRECTORY

#        ${SPTAG_SOURCE_DIR}/AnnService/inc/

#        DESTINATION

#        include/SPTAG/AnnService/inc)