diff --git a/deploy/data_system/install.sh b/deploy/data_system/install.sh index 64c5fd8b7c52cea5ef230258834b91848e844b61..d3fcc2c1115f7e051ca2517d3c9d2c78eea3f0e0 100644 --- a/deploy/data_system/install.sh +++ b/deploy/data_system/install.sh @@ -17,7 +17,7 @@ set -o pipefail DATA_SYSTEM_DEPLOY_DIR=$(dirname "$(readlink -f "$0")") if [ -n "${BASE_DIR}" ]; then - DATA_SYSTEM_DEPLOY_DIR=${BASE_DIR}/../../data_system/deploy + DATA_SYSTEM_DEPLOY_DIR=${BASE_DIR}/../../datasystem/deploy fi DATA_SYSTEM_DIR=$(readlink -m "${DATA_SYSTEM_DEPLOY_DIR}/..") MAX_PROCESS_EXIT_TIMES=20 diff --git a/deploy/process/config.sh b/deploy/process/config.sh index caf6a131aa9499d6cbe28f45085543b3cae20dbb..c75b7534ebfd13cc517b33b51d6d56524a3bb096 100644 --- a/deploy/process/config.sh +++ b/deploy/process/config.sh @@ -124,7 +124,7 @@ STATUS_COLLECT_INTERVAL=300 ENABLE_TRACE=false ENABLE_METRICS=true METRICS_CONFIG="" -METRICS_CONFIG_FILE=$(readlink -m '${BASE_DIR}/../../../function_system/config/metrics_config.json') +METRICS_CONFIG_FILE=$(readlink -m '${BASE_DIR}/../../../functionsystem/config/metrics/metrics_config.json') RUNTIME_METRICS_CONFIG="" STATE_STORAGE_TYPE="datasystem" PULL_RESOURCE_INTERVAL=1000 @@ -229,7 +229,7 @@ ENABLE_INHERIT_ENV="false" IS_PARTIAL_WATCH_INSTANCES="false" META_STORE_MAX_FLUSH_CONCURRENCY=100 META_STORE_MAX_FLUSH_BATCH_SIZE=50 -readonly JEMALLOC_LIB_PATH=$(readlink -m "${BASE_DIR}/../../function_system/lib/libjemalloc.so") +readonly JEMALLOC_LIB_PATH=$(readlink -m "${BASE_DIR}/../../functionsystem/lib/libjemalloc.so") # Faas-pattern Configuration ENABLE_FAAS_FRONTEND="false" FAAS_FRONTEND_HTTP_PORT=8888 diff --git a/deploy/process/deploy.sh b/deploy/process/deploy.sh index 230c684305089cdeef29fcee118f6f5a4cba7761..33af9af72c91318153a9f5cd81b7d66e4b901c78 100644 --- a/deploy/process/deploy.sh +++ b/deploy/process/deploy.sh @@ -19,8 +19,8 @@ BASE_DIR=$( cd "$(dirname "$0")" pwd ) -FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../function_system -DATA_SYSTEM_PATH=${BASE_DIR}/../../data_system +FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../functionsystem +DATA_SYSTEM_PATH=${BASE_DIR}/../../datasystem THIRD_PARTY_PATH=${BASE_DIR}/../../third_party ETCDCTL_PATH=${THIRD_PARTY_PATH}/etcd/etcdctl ETCD_LD_PATH=${THIRD_PARTY_PATH}/etcd/lib:${LD_LIBRARY_PATH} diff --git a/deploy/process/health_check.sh b/deploy/process/health_check.sh index 7c2a9a7fbeed59e63fc63ea4f077da7155c79cbd..15292b44a7a2e97256e0305f3aee155f89944a99 100644 --- a/deploy/process/health_check.sh +++ b/deploy/process/health_check.sh @@ -17,8 +17,8 @@ BASE_DIR=$( cd "$(dirname "$0")" pwd ) -FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../function_system -DATA_SYSTEM_PATH=${BASE_DIR}/../../data_system +FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../functionsystem +DATA_SYSTEM_PATH=${BASE_DIR}/../../datasystem THIRD_PARTY_PATH=${BASE_DIR}/../../third_party [[ ! -f "${FUNCTION_SYSTEM_PATH}/deploy/health_check.sh" ]] && echo "${FUNCTION_SYSTEM_PATH}/deploy/health_check.sh is not exist" && exit 1 diff --git a/deploy/process/yr_stop.sh b/deploy/process/yr_stop.sh index defbbe0adcade6d3739f43776b75cf99130b249a..7cca2a03746bdd345c0ca4f6472c6efab0629a90 100644 --- a/deploy/process/yr_stop.sh +++ b/deploy/process/yr_stop.sh @@ -19,8 +19,8 @@ BASE_DIR=$( cd "$(dirname "$0")" pwd ) -FUNCTION_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../function_system") -DATA_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../data_system") +FUNCTION_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../functionsystem") +DATA_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../datasystem") THIRD_PARTY_PATH=$(readlink -m "${BASE_DIR}/../../third_party") . "${BASE_DIR}"/utils.sh diff --git a/docs/sample_code/llm_on_multiple_machines/env.sh b/docs/sample_code/llm_on_multiple_machines/env.sh index 66fdd464770f76591ab713b5e78756bf8900df77..1ae58cf263303faadb5df5b0510e4f255a0545ad 100644 --- a/docs/sample_code/llm_on_multiple_machines/env.sh +++ b/docs/sample_code/llm_on_multiple_machines/env.sh @@ -34,6 +34,6 @@ export VLLM_USE_V1=1 # 启用 vLLM 的 v1 API 模式 export VLLM_WORKER_MULTIPROC_METHOD=spawn # Python 多进程启动方式为 spawn export vLLM_MODEL_MEMORY_USE_GB=20 # 模型在单卡上执行需要的显存容量，Qwen2.5-7B设置20刚好合适 export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python -export LD_LIBRARY_PATH=/usr/local/python3.11.13/lib/python3.11/site-packages/yr/inner/function_system/lib:$LD_LIBRARY_PATH # 需要找到yr的安装路径，可通过yr version 查看 +export LD_LIBRARY_PATH=/usr/local/python3.11.13/lib/python3.11/site-packages/yr/inner/functionsystem/lib:$LD_LIBRARY_PATH # 需要找到yr的安装路径，可通过yr version 查看 export HCL_OP_EXPANSION_MODE="AIV" export USING_PREFIX_CONNECTOR=1 # 是否开启前缀匹配，当前数据系统patch 默认开启， commitid：648c6a54b1c5896e85f3e136577deceda8551091 diff --git a/docs/use_cases/accelerate_llm_instance_scaling.md b/docs/use_cases/accelerate_llm_instance_scaling.md index cf39f96c00cbf49c01130b0fd25d72bca14128e1..4408682a8bbac50fd7a1ba8cb7f7e6339679e579 100644 --- a/docs/use_cases/accelerate_llm_instance_scaling.md +++ b/docs/use_cases/accelerate_llm_instance_scaling.md @@ -307,7 +307,7 @@ export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python # 替换 YR_INSTALL_PATH 为 openYuanrong 安装路径，可使用 yr version 命令查看 # 例如：/usr/local/Python-3.11.9/lib/python3.11/site-packages/yr/inner -export LD_LIBRARY_PATH=${YR_INSTALL_PATH}/function_system/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${YR_INSTALL_PATH}/functiosystem/lib:$LD_LIBRARY_PATH export HCL_OP_EXPANSION_MODE="AIV" # 是否启用 openYuanrong 多级缓存前缀匹配能力，值为 1 表示启动 export USING_PREFIX_CONNECTOR=1 diff --git a/scripts/package/pypi/package.sh b/scripts/package/pypi/package.sh index 4f4e41bc0808845e8a12f1fe319200060b1358dd..16add9f416203573d019bc48da512b67a1d69f4b 100644 --- a/scripts/package/pypi/package.sh +++ b/scripts/package/pypi/package.sh @@ -57,9 +57,9 @@ function setup_workspace () { rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/alias rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/initcontainer # keep cpp/include directory - rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/data_system/sdk/*.jar - rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/data_system/sdk/*.whl - rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/data_system/sdk/cpp/lib + rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/datasystem/sdk/*.jar + rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/datasystem/sdk/*.whl + rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/datasystem/sdk/cpp/lib fi log_info "copy whl skeleton code to pypi workspace" diff --git a/scripts/package/utils.sh b/scripts/package/utils.sh index 0953b4aa8be7160fa4517b0b85b212b0643fc557..f094af08fcacc54ff536ba02d280502446effc52 100644 --- a/scripts/package/utils.sh +++ b/scripts/package/utils.sh @@ -54,13 +54,9 @@ function make_combined_yuanrong_package() { cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/* ${COMBINE_OUTPUT_DIR}/ fi - mkdir -p ${TEMP_BUILD_CACHE_DIR}/prebuild_tools log_info "extract prebuild tools to ${TEMP_BUILD_CACHE_DIR}" - cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/function_system/cli ${TEMP_BUILD_CACHE_DIR}/prebuild_tools/ - - mkdir -p ${TEMP_BUILD_CACHE_DIR}/cli - tar --strip-components=1 -xf ${TEMP_BUILD_CACHE_DIR}/prebuild_tools/cli/pkg/cli.tar -C ${TEMP_BUILD_CACHE_DIR}/cli - + mkdir -p ${TEMP_BUILD_CACHE_DIR}/cli/bin/ + cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/functionsystem/bin/yr ${TEMP_BUILD_CACHE_DIR}/cli/bin/ log_info "copy prebuild tools to ${COMBINE_OUTPUT_DIR}" cp -rf ${TEMP_BUILD_CACHE_DIR}/cli ${COMBINE_OUTPUT_DIR} diff --git a/scripts/package_yuanrong.sh b/scripts/package_yuanrong.sh index 44c2b6faabda7599f55bef76c91bef0dc59a5e05..3e507a75eb7dc654cb46e04ff61d75058cd384b6 100644 --- a/scripts/package_yuanrong.sh +++ b/scripts/package_yuanrong.sh @@ -90,10 +90,9 @@ get_all tar -zxvf yr-runtime-*.tar.gz -C ${OUTPUT_DIR}/openyuanrong tar -zxvf *functionsystem*.tar.gz -C ${OUTPUT_DIR}/openyuanrong -mkdir -p ${OUTPUT_DIR}/openyuanrong/data_system -tar -zxvf *datasystem*.tar.gz -C ${OUTPUT_DIR}/openyuanrong/data_system -mkdir -p ${OUTPUT_DIR}/openyuanrong/data_system/deploy -cp -fr ${BASE_DIR}/../deploy/data_system/* ${OUTPUT_DIR}/openyuanrong/data_system/deploy/ +tar -zxvf *datasystem*.tar.gz -C ${OUTPUT_DIR}/openyuanrong/ +mkdir -p ${OUTPUT_DIR}/openyuanrong/datasystem/deploy +cp -fr ${BASE_DIR}/../deploy/data_system/* ${OUTPUT_DIR}/openyuanrong/datasystem/deploy/ cp -fr ${BASE_DIR}/../deploy ${OUTPUT_DIR}/openyuanrong rm -rf ${OUTPUT_DIR}/openyuanrong/deploy/data_system @@ -101,12 +100,12 @@ rm -rf ${OUTPUT_DIR}/openyuanrong/deploy/data_system frontend_filename=$(ls *frontend*.tar.gz) if [ -n "${frontend_filename}" ]; then tar -zxvf ${frontend_filename} -C ${OUTPUT_DIR}/openyuanrong - cp -fr ${OUTPUT_DIR}/openyuanrong/pattern/pattern_faas/init_frontend_args.json ${OUTPUT_DIR}/openyuanrong/function_system/config/ + cp -fr ${OUTPUT_DIR}/openyuanrong/pattern/pattern_faas/init_frontend_args.json ${OUTPUT_DIR}/openyuanrong/functionsystem/config/ fi dashboard_filename=$(ls *dashboard*.tar.gz) if [ -n "${dashboard_filename}" ]; then - tar -zxvf ${dashboard_filename} -C ${OUTPUT_DIR}/openyuanrong/function_system/ + tar -zxvf ${dashboard_filename} -C ${OUTPUT_DIR}/openyuanrong/functionsystem/ fi find . -type d -exec chmod 750 {} \; @@ -120,20 +119,24 @@ if [ -d ${OUTPUT_DIR}/openyuanrong/deploy/process/ ]; then find ${OUTPUT_DIR}/openyuanrong/deploy/process/ -type f -name "*.yaml" -exec chmod 640 {} \; fi -if [ -d ${OUTPUT_DIR}/openyuanrong/data_system/ ]; then - find ${OUTPUT_DIR}/openyuanrong/data_system/ -type f -exec chmod 550 {} \; +if [ -d ${OUTPUT_DIR}/openyuanrong/datasystem/ ]; then + find ${OUTPUT_DIR}/openyuanrong/datasystem/ -type f -exec chmod 550 {} \; fi -mv ${OUTPUT_DIR}/openyuanrong/function_system/third_party ${OUTPUT_DIR}/openyuanrong/ +mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/third_party ${OUTPUT_DIR}/openyuanrong/ +mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/function_system/* ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/ +rm -rf ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/function_system/ +mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/vendor/etcd ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/third_party/ +rm -rf ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/vendor if [ -d ${OUTPUT_DIR}/openyuanrong/third_party/ ]; then find ${OUTPUT_DIR}/openyuanrong/third_party/ -type f -exec chmod 550 {} \; fi -if [ -d ${OUTPUT_DIR}/openyuanrong/function_system/ ]; then - find ${OUTPUT_DIR}/openyuanrong/function_system/ -type f -exec chmod 550 {} \; +if [ -d ${OUTPUT_DIR}/openyuanrong/functionsystem/ ]; then + find ${OUTPUT_DIR}/openyuanrong/functionsystem/ -type f -exec chmod 550 {} \; fi -if [ -d ${OUTPUT_DIR}/openyuanrong/function_system/config/ ]; then - find ${OUTPUT_DIR}/openyuanrong/function_system/config/ -type f -exec chmod 640 {} \; +if [ -d ${OUTPUT_DIR}/openyuanrong/functionsystem/config/ ]; then + find ${OUTPUT_DIR}/openyuanrong/functionsystem/config/ -type f -exec chmod 640 {} \; fi if [ -d ${OUTPUT_DIR}/openyuanrong/runtime/deploy/process/ ]; then diff --git a/tools/download_dependency.sh b/tools/download_dependency.sh index f44c1e4d3260e8640690c7dc08cf4b77551b1a5e..4533fd65f39a1b52342b2251be47bfdc4ceaa993 100644 --- a/tools/download_dependency.sh +++ b/tools/download_dependency.sh @@ -43,7 +43,7 @@ MODULES="runtime" bash -x ${BASE_DIR}/download_opensource.sh -M $MODULES -T $THIRD_PARTY_DIR RUNTIME_THIRD_PARTY_CACHE=${RUNTIME_THIRD_PARTY_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/runtime_deps/"} DATA_SYSTEM_CACHE=${DATA_SYSTEM_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/yr-datasystem-v0.6.0.tar.gz"} -FUNCTION_SYSTEM_CACHE=${FUNCTION_SYSTEM_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/yr-functionsystem-v0.6.0.tar.gz"} +METRICS_CACHE=${METRICS_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/metrics.tar.gz"} function check_datasystem() { # check whether datasystem exist if [ ! -d "${YR_DATASYSTEM_BIN_DIR}"/output/sdk/cpp/include ]; then @@ -70,7 +70,7 @@ function download_datasystem() { mkdir -p "${DS_OUT_DIR}" pushd "${DS_OUT_DIR}" wget -O datasystem.tar.gz ${DATA_SYSTEM_CACHE} - tar --no-same-owner -zxf datasystem.tar.gz + tar --no-same-owner -zxf datasystem.tar.gz --strip-components=1 popd } @@ -83,10 +83,8 @@ function download_metrics() { METRICS_OUT_DIR="${YR_METRICS_BIN_DIR}/" mkdir -p "${METRICS_OUT_DIR}" pushd "${METRICS_OUT_DIR}" - wget -O functionsystem.tar.gz ${FUNCTION_SYSTEM_CACHE} - tar --no-same-owner -zxf functionsystem.tar.gz - mv function_system/metrics/* . - rm -rf function_system + wget -O metrics.tar.gz ${METRICS_CACHE} + tar --no-same-owner -zxf metrics.tar.gz popd } @@ -102,7 +100,7 @@ function compile_datasystem() { ds_filename=$(ls *.tar.gz) tar -xf $ds_filename -C ${YR_DATASYSTEM_BIN_DIR}/output/ mkdir -p ${YR_FUNCTIONSYSTEM_BIN_DIR}/datasystem/output/ - tar -xf $ds_filename -C ${YR_FUNCTIONSYSTEM_BIN_DIR}/datasystem/output/ + tar -xf $ds_filename -C ${YR_FUNCTIONSYSTEM_BIN_DIR}/datasystem/output/ --strip-components=1 cp -f ${ds_filename} $RUNTIME_OUTPUT_DIR/ } @@ -114,8 +112,7 @@ function compile_functionsystem() { cd ${YR_FUNCTIONSYSTEM_BIN_DIR} bash build.sh cd output - tar -xf ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-functionsystem*.tar.gz - cp -r ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/function_system/metrics ${RUNTIME_SRC_DIR}/ + tar -xf ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/metrics.tar.gz -C ${RUNTIME_SRC_DIR}/ cp -f ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-functionsystem*.tar.gz $RUNTIME_OUTPUT_DIR/ }