Unverified Commit 5ab3bf88 authored by 王翔宇's avatar 王翔宇 Committed by GitHub
Browse files

Update compile option with fiu (#3293) 



* always disable fiu in milvus_server and enable in unittest, make it work in config directory

Signed-off-by: default avatarWang Xiangyu <xy.wang@zilliz.com>

* always enable fiu to keeping behavior

Signed-off-by: default avatarWang Xiangyu <xy.wang@zilliz.com>

* always enable fiu to keeping behavior

Signed-off-by: default avatarWang Xiangyu <xy.wang@zilliz.com>
parent 5f76a529

ci/jenkins/step/build.groovy

+3 −3
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ timeout(time: 120, unit: 'MINUTES') { 
    

            if ("${BINARY_VERSION}" == "gpu") {

                if (isTimeTriggeredBuild()) {

                    sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -j4 -i ${env.MILVUS_INSTALL_PREFIX} --with_fiu --coverage -l -g -u -s '-gencode=arch=compute_61,code=sm_61;-gencode=arch=compute_75,code=sm_75' \""

                    sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -j4 ${env.MILVUS_INSTALL_PREFIX} --with_fiu --coverage -l -g -u -s '-gencode=arch=compute_61,code=sm_61;-gencode=arch=compute_75,code=sm_75' \""

                } else {

                    sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -j4 -i ${env.MILVUS_INSTALL_PREFIX} --with_fiu --coverage -l -g -u\""

                    sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -j4 ${env.MILVUS_INSTALL_PREFIX} --with_fiu --coverage -l -g -u\""

                }

            } else {

                sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -j4 -i ${env.MILVUS_INSTALL_PREFIX} --with_fiu --coverage -l -u\""

                sh "/bin/bash --login -c \". ./before-install.sh && ./build.sh -t ${params.BUILD_TYPE} -j4 ${env.MILVUS_INSTALL_PREFIX} --with_fiu --coverage -l -u\""

            }

            sh "./update_ccache.sh -l ${params.JFROG_ARTFACTORY_URL}/ccache -u ${USERNAME} -p ${PASSWORD}"

        }

core/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ else () 
    message( STATUS "Building Milvus CPU version" )

endif ()



# TODO: remove after all ut set "FIU_ENABLE"

set(MILVUS_WITH_FIU "ON")



set_milvus_definition( MILVUS_WITH_PROMETHEUS   "MILVUS_WITH_PROMETHEUS" )

set_milvus_definition( ENABLE_CPU_PROFILING     "ENABLE_CPU_PROFILING" )

set_milvus_definition( MILVUS_WITH_FIU          "FIU_ENABLE" )

core/build.sh

+1 −7
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ RUN_CPPLINT="OFF" 
CUDA_COMPILER=/usr/local/cuda/bin/nvcc

GPU_VERSION="OFF" #defaults to CPU version

WITH_PROMETHEUS="ON"

FIU_ENABLE="OFF"

CUDA_ARCH="DEFAULT"



while getopts "p:d:t:s:ulrcghzmei" arg; do

while getopts "p:d:t:s:ulrcghzme" arg; do

  case $arg in

  p)

    INSTALL_PREFIX=$OPTARG
@@ -55,9 +54,6 @@ while getopts "p:d:t:s:ulrcghzmei" arg; do 
  e)

    WITH_PROMETHEUS="OFF"

    ;;

  i)

    FIU_ENABLE="ON"

    ;;

  s)

    CUDA_ARCH=$OPTARG

    ;;
@@ -75,7 +71,6 @@ parameter: 
-z: profiling(default: OFF)

-g: build GPU version(default: OFF)

-e: build without prometheus(default: OFF)

-i: build FIU_ENABLE(default: OFF)

-s: build with CUDA arch(default:DEFAULT), for example '-gencode=compute_61,code=sm_61;-gencode=compute_75,code=sm_75'

-h: help
@@ -119,7 +114,6 @@ CMAKE_CMD="cmake \ 
-DENABLE_CPU_PROFILING=${PROFILING} \

-DMILVUS_GPU_VERSION=${GPU_VERSION} \

-DMILVUS_WITH_PROMETHEUS=${WITH_PROMETHEUS} \

-DMILVUS_WITH_FIU=${FIU_ENABLE} \

-DMILVUS_CUDA_ARCH=${CUDA_ARCH} \

../"

echo ${CMAKE_CMD}

core/cmake/Utils.cmake

+15 −0
Original line number Diff line number Diff line
@@ -85,3 +85,18 @@ MACRO(append_flags target) 
        set(${target} "${${target}} ${FLAG}")

    endforeach()

ENDMACRO(append_flags)



macro(create_executable)

    cmake_parse_arguments(E "" "TARGET" "SRCS;LIBS;DEFS" ${ARGN})

    add_executable(${E_TARGET})

    target_sources(${E_TARGET} PRIVATE ${E_SRCS})

    target_link_libraries(${E_TARGET} PRIVATE ${E_LIBS})

    target_compile_definitions(${E_TARGET} PRIVATE ${E_DEFS})

endmacro()



macro(create_library)

    cmake_parse_arguments(L "" "TARGET" "SRCS;LIBS;DEFS" ${ARGN})

    add_library(${L_TARGET} ${L_SRCS})

    target_link_libraries(${L_TARGET} PRIVATE ${L_LIBS})

    target_compile_definitions(${L_TARGET} PRIVATE ${L_DEFS})

endmacro()
 
 No newline at end of file

core/src/cache/CpuCacheMgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#include <utility>



#include <fiu-local.h>

#include <fiu/fiu-local.h>



#include "config/ServerConfig.h"

#include "utils/Log.h"