Commit af691924 authored by jinhai's avatar jinhai
Browse files

Merge branch '0.5.0' into '0.5.0' 

Merge from github

See merge request megasearch/milvus!766

Former-commit-id: 1acaebe3ffe9faf1b422f4f42d061e0d9622856e
parents 8c952e49 7ab79b9f

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-653 - When config check fail, Milvus close without message

- MS-654 - Describe index timeout when building index

- MS-658 - Fix SQ8 Hybrid can't search

- \#9 Change default gpu_cache_capacity to 4

- MS-665 - IVF_SQ8H search crash when no GPU resource in search_resources

- \#20 - C++ sdk example get grpc error 

- \#23 - Add unittest to improve code coverage
@@ -75,6 +76,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-624 - Re-organize project directory for open-source

- MS-635 - Add compile option to support customized faiss

- MS-660 - add ubuntu_build_deps.sh

- \#18 - Add all test cases

	

# Milvus 0.4.0 (2019-09-12)

core/src/scheduler/SchedInst.cpp

+2 −5
Original line number Diff line number Diff line
@@ -76,11 +76,8 @@ load_simple_config() { 
    }



    if (not find_build_gpu_id) {

        ResMgrInst::GetInstance()->Add(ResourceFactory::Create(std::to_string(build_gpu_id),

                                                               "GPU",

                                                               build_gpu_id,

                                                               true,

                                                               true));

        ResMgrInst::GetInstance()->Add(

            ResourceFactory::Create(std::to_string(build_gpu_id), "GPU", build_gpu_id, true, true));

        ResMgrInst::GetInstance()->Connect("cpu", std::to_string(build_gpu_id), pcie);

    }

}

tests/milvus-java-test/.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
target/

.idea/

test-output/

lib/*

tests/milvus-java-test/bin/run.sh

0 → 100644
+0 −0

Empty file added.

tests/milvus-java-test/ci/function/file_transfer.groovy

0 → 100644
+10 −0
Original line number Diff line number Diff line 
def FileTransfer (sourceFiles, remoteDirectory, remoteIP, protocol = "ftp", makeEmptyDirs = true) {

    if (protocol == "ftp") {

        ftpPublisher masterNodeName: '', paramPublish: [parameterName: ''], alwaysPublishFromMaster: false, continueOnError: false, failOnError: true, publishers: [

            [configName: "${remoteIP}", transfers: [

                [asciiMode: false, cleanRemote: false, excludes: '', flatten: false, makeEmptyDirs: "${makeEmptyDirs}", noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: "${remoteDirectory}", remoteDirectorySDF: false, removePrefix: '', sourceFiles: "${sourceFiles}"]], usePromotionTimestamp: true, useWorkspaceInPromotion: false, verbose: true

                ]

            ]

    }

}

return this