From 047f4bb43ee2cd7eab07f229ada1e6f167d608bb Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Thu, 21 Nov 2019 10:25:38 +0800
Subject: [PATCH] mark off faiss version

---
 ci/jenkins/Jenkinsfile                        | 40 +++++++++----------
 .../index/cmake/ThirdPartyPackagesCore.cmake  | 11 ++++-
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile
index bf7a70d11a..8d3953b112 100644
--- a/ci/jenkins/Jenkinsfile
+++ b/ci/jenkins/Jenkinsfile
@@ -50,7 +50,7 @@ pipeline {
                     }
 
                     stages {
-                        stage("Run GPU Version Build") {
+                        stage("Run Build") {
                             agent {
                                 kubernetes {
                                     label "${BINRARY_VERSION}-build"
@@ -60,7 +60,7 @@ pipeline {
                             }
 
                             stages {
-                                stage('GPU Version Build') {
+                                stage('Build') {
                                     steps {
                                         container('milvus-build-env') {
                                             script {
@@ -69,7 +69,7 @@ pipeline {
                                         }
                                     }
                                 }
-                                stage('GPU Version Code Coverage') {
+                                stage('Code Coverage') {
                                     steps {
                                         container('milvus-build-env') {
                                             script {
@@ -78,7 +78,7 @@ pipeline {
                                         }
                                     }
                                 }
-                                stage('Upload GPU Version Package') {
+                                stage('Upload Package') {
                                     steps {
                                         container('milvus-build-env') {
                                             script {
@@ -90,7 +90,7 @@ pipeline {
                             }
                         }
 
-                        stage("Publish GPU Version docker images") {
+                        stage("Publish docker images") {
                             agent {
                                 kubernetes {
                                     label "${BINRARY_VERSION}-publish"
@@ -100,7 +100,7 @@ pipeline {
                             }
 
                             stages {
-                                stage('Publish GPU Version') {
+                                stage('Publish') {
                                     steps {
                                         container('publish-images'){
                                             script {
@@ -112,7 +112,7 @@ pipeline {
                             }
                         }
 
-                        stage("Deploy GPU Version to Development") {
+                        stage("Deploy to Development") {
                             agent {
                                 kubernetes {
                                     label "${BINRARY_VERSION}-dev-test"
@@ -122,7 +122,7 @@ pipeline {
                             }
 
                             stages {
-                                stage("Deploy GPU Version to Dev") {
+                                stage("Deploy to Dev") {
                                     steps {
                                         container('milvus-test-env') {
                                             script {
@@ -132,7 +132,7 @@ pipeline {
                                     }
                                 }
 
-                                stage("GPU Version Dev Test") {
+                                stage("Dev Test") {
                                     steps {
                                         container('milvus-test-env') {
                                             script {
@@ -147,7 +147,7 @@ pipeline {
                                     }
                                 }
 
-                                stage ("Cleanup GPU Version Dev") {
+                                stage ("Cleanup Dev") {
                                     steps {
                                         container('milvus-test-env') {
                                             script {
@@ -180,7 +180,7 @@ pipeline {
                     }
 
                     stages {
-                        stage("Run CPU Version Build") {
+                        stage("Run Build") {
                             agent {
                                 kubernetes {
                                     label "${BINRARY_VERSION}-build"
@@ -190,7 +190,7 @@ pipeline {
                             }
 
                             stages {
-                                stage('Build CPU Version') {
+                                stage('Build') {
                                     steps {
                                         container('milvus-build-env') {
                                             script {
@@ -199,7 +199,7 @@ pipeline {
                                         }
                                     }
                                 }
-                                stage('CPU Version Code Coverage') {
+                                stage('Code Coverage') {
                                     steps {
                                         container('milvus-build-env') {
                                             script {
@@ -208,7 +208,7 @@ pipeline {
                                         }
                                     }
                                 }
-                                stage('Upload CPU Version Package') {
+                                stage('Upload Package') {
                                     steps {
                                         container('milvus-build-env') {
                                             script {
@@ -220,7 +220,7 @@ pipeline {
                             }
                         }
 
-                        stage("Publish CPU Version docker images") {
+                        stage("Publish docker images") {
                             agent {
                                 kubernetes {
                                     label "${BINRARY_VERSION}-publish"
@@ -230,7 +230,7 @@ pipeline {
                             }
 
                             stages {
-                                stage('Publish CPU Version') {
+                                stage('Publish') {
                                     steps {
                                         container('publish-images'){
                                             script {
@@ -242,7 +242,7 @@ pipeline {
                             }
                         }
 
-                        stage("Deploy CPU Version to Development") {
+                        stage("Deploy to Development") {
                             agent {
                                 kubernetes {
                                     label "${BINRARY_VERSION}-dev-test"
@@ -252,7 +252,7 @@ pipeline {
                             }
 
                             stages {
-                                stage("Deploy CPU Version to Dev") {
+                                stage("Deploy to Dev") {
                                     steps {
                                         container('milvus-test-env') {
                                             script {
@@ -262,7 +262,7 @@ pipeline {
                                     }
                                 }
 
-                                stage("CPU Version Dev Test") {
+                                stage("Dev Test") {
                                     steps {
                                         container('milvus-test-env') {
                                             script {
@@ -277,7 +277,7 @@ pipeline {
                                     }
                                 }
 
-                                stage ("Cleanup CPU Version Dev") {
+                                stage ("Cleanup Dev") {
                                     steps {
                                         container('milvus-test-env') {
                                             script {
diff --git a/core/src/index/cmake/ThirdPartyPackagesCore.cmake b/core/src/index/cmake/ThirdPartyPackagesCore.cmake
index c046bc3a56..1a22a9d2be 100644
--- a/core/src/index/cmake/ThirdPartyPackagesCore.cmake
+++ b/core/src/index/cmake/ThirdPartyPackagesCore.cmake
@@ -733,7 +733,16 @@ macro(build_faiss)
 
     if (USE_JFROG_CACHE STREQUAL "ON")
         string(MD5 FAISS_COMBINE_MD5 "${FAISS_MD5}${LAPACK_MD5}${OPENBLAS_MD5}")
-        set(FAISS_CACHE_PACKAGE_NAME "faiss_${FAISS_COMBINE_MD5}.tar.gz")
+        if (KNOWHERE_GPU_VERSION)
+            set(FAISS_COMPUTE_TYPE "gpu")
+        else ()
+            set(FAISS_COMPUTE_TYPE "cpu")
+        endif()
+        if (FAISS_WITH_MKL)
+            set(FAISS_CACHE_PACKAGE_NAME "faiss_${FAISS_COMPUTE_TYPE}_mkl_${FAISS_COMBINE_MD5}.tar.gz")
+        else ()
+            set(FAISS_CACHE_PACKAGE_NAME "faiss_${FAISS_COMPUTE_TYPE}_openblas_${FAISS_COMBINE_MD5}.tar.gz")
+        endif()
         set(FAISS_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${FAISS_CACHE_PACKAGE_NAME}")
         set(FAISS_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${FAISS_CACHE_PACKAGE_NAME}")