From fd0bf04cf87b4209613983e0fd28fc534c564b59 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Fri, 20 Sep 2019 18:32:17 +0800 Subject: [PATCH 01/14] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f496cdd884..69470bd0b2 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# Milvus is coming soon! \ No newline at end of file +![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen) +# Milvus is coming soon! From c804b91e782f2802a73b3a5f57f25313144eb7f7 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Fri, 20 Sep 2019 18:37:57 +0800 Subject: [PATCH 02/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69470bd0b2..5249aace41 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen) +![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) # Milvus is coming soon! From c85d7feb8db4c6bf60a8fb4f880995105149da7a Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sun, 29 Sep 2019 15:49:34 +0800 Subject: [PATCH 03/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5249aace41..17928c6538 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) +![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) # Milvus is coming soon! From 1f1511d1ccc9906951c7bdac97a474c3216d876d Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sun, 29 Sep 2019 15:51:13 +0800 Subject: [PATCH 04/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 17928c6538..5163824f0a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) +![Release](https://img.shields.io/badge/Release-v0.5.0-orange) # Milvus is coming soon! From ef4bce71b4bc32dc1944c77bda35d0c56cfcbc0a Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sun, 29 Sep 2019 16:05:25 +0800 Subject: [PATCH 05/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5163824f0a..eec486fdb2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) -![Release](https://img.shields.io/badge/Release-v0.5.0-orange) +![Release](https://img.shields.io/badge/Release-v0.5.0-orange.svg) # Milvus is coming soon! From 16f34710cea79850582bcb946e0ad1c5e9398c49 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sun, 29 Sep 2019 16:06:13 +0800 Subject: [PATCH 06/14] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index eec486fdb2..ff9007e353 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) ![Release](https://img.shields.io/badge/Release-v0.5.0-orange.svg) +![Release date](https://img.shields.io/badge/release date-October-yellowgreen) + # Milvus is coming soon! From 45c970a78369042acdca003b9b0a2d1062ff9833 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sun, 29 Sep 2019 16:06:44 +0800 Subject: [PATCH 07/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff9007e353..cdedb2a096 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) ![Release](https://img.shields.io/badge/Release-v0.5.0-orange.svg) -![Release date](https://img.shields.io/badge/release date-October-yellowgreen) +![Releasedate](https://img.shields.io/badge/release date-October-yellowgreen.svg) # Milvus is coming soon! From 6a879914e04a3961f4f3edbee92b8b123a4b6fc9 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sun, 29 Sep 2019 16:07:34 +0800 Subject: [PATCH 08/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cdedb2a096..1aba7639f2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) ![Release](https://img.shields.io/badge/Release-v0.5.0-orange.svg) -![Releasedate](https://img.shields.io/badge/release date-October-yellowgreen.svg) +![Release date](https://img.shields.io/badge/release date-October-yellowgreen.svg) # Milvus is coming soon! From 428d52970ac7d7d926874036ffcaec429d640938 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sun, 29 Sep 2019 16:08:58 +0800 Subject: [PATCH 09/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1aba7639f2..13c7f1137c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) ![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) ![Release](https://img.shields.io/badge/Release-v0.5.0-orange.svg) -![Release date](https://img.shields.io/badge/release date-October-yellowgreen.svg) +![Release date](https://img.shields.io/badge/release__date-October-yellowgreen) # Milvus is coming soon! From cb88f18dd8e69c10bf75dc58093fbccc3f0dc8f4 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Wed, 23 Oct 2019 12:13:25 +0800 Subject: [PATCH 10/14] Update README.md Former-commit-id: dd6a3a5cb2001f6ee90d4fc8a72b73477e1a6c40 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d1979be4a..aacbd89d91 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,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/releases/v0.5.0/). - Heterogeneous computing From 2ca28c44ae970242ad339909022e9d6f07e486b0 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Fri, 25 Oct 2019 16:27:56 +0800 Subject: [PATCH 11/14] Update README.md Former-commit-id: a5f25b72a07bdabef85a2097764a55261159cbf3 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4fd8bbae2e..e847f0e8ca 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ ![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) @@ -22,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 @@ -90,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 From d65160e4a12b0748d327ceb75fc98936544b676e Mon Sep 17 00:00:00 2001 From: Zhiru Zhu Date: Fri, 25 Oct 2019 18:01:35 +0800 Subject: [PATCH 12/14] Remove .a file in milvus/lib for docker-version Former-commit-id: b27fd9ddcf9d0dcbcceca2422b8bf6230bf4e21a --- CHANGELOG.md | 2 +- core/src/index/knowhere/CMakeLists.txt | 36 +------------------------- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7865430dd9..770098f7a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,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 diff --git a/core/src/index/knowhere/CMakeLists.txt b/core/src/index/knowhere/CMakeLists.txt index 2a499dc1a3..bece9058a9 100644 --- a/core/src/index/knowhere/CMakeLists.txt +++ b/core/src/index/knowhere/CMakeLists.txt @@ -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 @@ -112,17 +91,4 @@ set(INDEX_INCLUDE_DIRS ${LAPACK_INCLUDE_DIR} ) -set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE) - -#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) +set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE) \ No newline at end of file From 0b563e51108cfea0aad77e4d8bbbdd3482dfb9e2 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Sat, 26 Oct 2019 12:29:55 +0800 Subject: [PATCH 13/14] Remove ===== Former-commit-id: 8e916d1012712a59859620b8fc4939c71e12f637 --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index e847f0e8ca..0b71b053ec 100644 --- a/README.md +++ b/README.md @@ -201,9 +201,4 @@ Please read our [roadmap](https://milvus.io/docs/en/roadmap/) to learn about upc [Apache 2.0 license](LICENSE) -======= -![LICENSE](https://img.shields.io/badge/license-Apache--2.0-brightgreen.svg) -![Language](https://img.shields.io/badge/language-C%2B%2B-blue.svg) -![Release](https://img.shields.io/badge/Release-v0.5.0-orange.svg) -![Release date](https://img.shields.io/badge/release__date-October-yellowgreen) From 70c3ae83d97d073a96a8898c9c131313775d3004 Mon Sep 17 00:00:00 2001 From: jielinxu <52057195+jielinxu@users.noreply.github.com> Date: Mon, 28 Oct 2019 09:31:46 +0800 Subject: [PATCH 14/14] [skip ci] Minor updates Former-commit-id: ca8c3d047a49e1c580eb290fa088a9bd34b99868 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0b71b053ec..f18328f748 100644 --- a/README.md +++ b/README.md @@ -170,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. @@ -199,6 +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)