修复两个实验环境脚本的 CRLF 行尾问题-cann-learning-hub-AtomGit

已合并

修复两个实验环境脚本的 CRLF 行尾问题 #1092

KaranocaVe创建于 9月29日从KaranocaVe/cann-learning-hub： fix/env-custom-opp-lf 合入到 cann/cann-learning-hub： master

修复两个实验环境脚本的 CRLF 行尾问题 #1092

已合并

KaranocaVe创建于 9月29日

从KaranocaVe/cann-learning-hub fix/env-custom-opp-lf合入到cann/cann-learning-hub master

共 2 个文件变更+51-51

Mcontrib/tutorials/data_structures_compute/04_reduce_priority_queue_heap/src/reduce_lab/scripts/env_custom_opp.sh+26-26

Mcontrib/tutorials/data_structures_compute/07_sort_for_moe_fusion/src/moe_sort_lab/scripts/env_custom_opp.sh+25-25

	@@ -1,26 +1,26 @@
1	-#!/bin/bash	1	+#!/bin/bash
2	-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"	2	+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
3	-PROJECT_DIR="$(dirname "$SCRIPT_DIR")"	3	+PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
4	-ASCEND_PATH="${ASCEND_HOME_PATH:-/usr/local/Ascend/ascend-toolkit/latest}"	4	+ASCEND_PATH="${ASCEND_HOME_PATH:-/usr/local/Ascend/ascend-toolkit/latest}"
5	-export ASCEND_HOME_PATH="$ASCEND_PATH"	5	+export ASCEND_HOME_PATH="$ASCEND_PATH"
6	-LOCAL_OPP_ROOT="$PROJECT_DIR/custom_ops/generated/local_opp"	6	+LOCAL_OPP_ROOT="$PROJECT_DIR/custom_ops/generated/local_opp"
7	-LOCAL_VENDOR_DIR="$LOCAL_OPP_ROOT/vendors/customize"	7	+LOCAL_VENDOR_DIR="$LOCAL_OPP_ROOT/vendors/customize"
8	-SET_ENV_SCRIPT="$LOCAL_VENDOR_DIR/bin/set_env.bash"	8	+SET_ENV_SCRIPT="$LOCAL_VENDOR_DIR/bin/set_env.bash"
9	-	9	+
10	-if [ ! -f "$SET_ENV_SCRIPT" ]; then	10	+if [ ! -f "$SET_ENV_SCRIPT" ]; then
11	- echo "Local custom OPP is missing. Run bash scripts/build_ops.sh first." >&2	11	+ echo "Local custom OPP is missing. Run bash scripts/build_ops.sh first." >&2
12	- return 1 2>/dev/null \|\| exit 1	12	+ return 1 2>/dev/null \|\| exit 1
13	-fi	13	+fi
14	-	14	+
15	-# set_env.bash 由安装包生成，内容引用 ${ASCEND_CUSTOM_OPP_PATH}/${LD_LIBRARY_PATH}，	15	+# set_env.bash 由安装包生成，内容引用 ${ASCEND_CUSTOM_OPP_PATH}/${LD_LIBRARY_PATH}，
16	-# 在调用方启用 set -u（如 build_runner.sh）前需先预置为空，避免 unbound variable。	16	+# 在调用方启用 set -u（如 build_runner.sh）前需先预置为空，避免 unbound variable。
17	-export ASCEND_CUSTOM_OPP_PATH="${ASCEND_CUSTOM_OPP_PATH:-}"	17	+export ASCEND_CUSTOM_OPP_PATH="${ASCEND_CUSTOM_OPP_PATH:-}"
18	-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}"	18	+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}"
19	-source "$SET_ENV_SCRIPT"	19	+source "$SET_ENV_SCRIPT"
20	-export ASCEND_CUSTOM_OPP_PATH="$LOCAL_VENDOR_DIR"	20	+export ASCEND_CUSTOM_OPP_PATH="$LOCAL_VENDOR_DIR"
21	-if [ -d "$LOCAL_VENDOR_DIR/op_api/lib" ]; then	21	+if [ -d "$LOCAL_VENDOR_DIR/op_api/lib" ]; then
22	- export LD_LIBRARY_PATH="$LOCAL_VENDOR_DIR/op_api/lib:${LD_LIBRARY_PATH:-}"	22	+ export LD_LIBRARY_PATH="$LOCAL_VENDOR_DIR/op_api/lib:${LD_LIBRARY_PATH:-}"
23	-fi	23	+fi
24	-echo "ASCEND_HOME_PATH=$ASCEND_HOME_PATH"	24	+echo "ASCEND_HOME_PATH=$ASCEND_HOME_PATH"
25	-echo "ASCEND_CUSTOM_OPP_PATH=$ASCEND_CUSTOM_OPP_PATH"	25	+echo "ASCEND_CUSTOM_OPP_PATH=$ASCEND_CUSTOM_OPP_PATH"
26	-echo "LD_LIBRARY_PATH includes $LOCAL_VENDOR_DIR/op_api/lib"	26	+echo "LD_LIBRARY_PATH includes $LOCAL_VENDOR_DIR/op_api/lib"

	@@ -1,25 +1,25 @@
1	-#!/bin/bash	1	+#!/bin/bash
2	-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"	2	+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
3	-PROJECT_DIR="$(dirname "$SCRIPT_DIR")"	3	+PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
4	-ASCEND_PATH="${ASCEND_HOME_PATH:-/usr/local/Ascend/ascend-toolkit/latest}"	4	+ASCEND_PATH="${ASCEND_HOME_PATH:-/usr/local/Ascend/ascend-toolkit/latest}"
5	-export ASCEND_HOME_PATH="$ASCEND_PATH"	5	+export ASCEND_HOME_PATH="$ASCEND_PATH"
6	-LOCAL_OPP_ROOT="$PROJECT_DIR/custom_ops/generated/local_opp"	6	+LOCAL_OPP_ROOT="$PROJECT_DIR/custom_ops/generated/local_opp"
7	-LOCAL_VENDOR_DIR="$LOCAL_OPP_ROOT/vendors/customize"	7	+LOCAL_VENDOR_DIR="$LOCAL_OPP_ROOT/vendors/customize"
8	-SET_ENV_SCRIPT="$LOCAL_VENDOR_DIR/bin/set_env.bash"	8	+SET_ENV_SCRIPT="$LOCAL_VENDOR_DIR/bin/set_env.bash"
9	-	9	+
10	-if [ ! -f "$SET_ENV_SCRIPT" ]; then	10	+if [ ! -f "$SET_ENV_SCRIPT" ]; then
11	- echo "Local custom OPP is missing. Run bash scripts/build_ops.sh first." >&2	11	+ echo "Local custom OPP is missing. Run bash scripts/build_ops.sh first." >&2
12	- return 1 2>/dev/null \|\| exit 1	12	+ return 1 2>/dev/null \|\| exit 1
13	-fi	13	+fi
14	-	14	+
15	-# set_env.bash 由安装包生成，内容引用 ${ASCEND_CUSTOM_OPP_PATH}/${LD_LIBRARY_PATH}，	15	+# set_env.bash 由安装包生成，内容引用 ${ASCEND_CUSTOM_OPP_PATH}/${LD_LIBRARY_PATH}，
16	-# 在调用方启用 set -u（如 build_runner.sh）前需先预置为空，避免 unbound variable。	16	+# 在调用方启用 set -u（如 build_runner.sh）前需先预置为空，避免 unbound variable。
17	-export ASCEND_CUSTOM_OPP_PATH="${ASCEND_CUSTOM_OPP_PATH:-}"	17	+export ASCEND_CUSTOM_OPP_PATH="${ASCEND_CUSTOM_OPP_PATH:-}"
18	-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}"	18	+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}"
19	-source "$SET_ENV_SCRIPT"	19	+source "$SET_ENV_SCRIPT"
20	-export ASCEND_CUSTOM_OPP_PATH="$LOCAL_VENDOR_DIR"	20	+export ASCEND_CUSTOM_OPP_PATH="$LOCAL_VENDOR_DIR"
21	-if [ -d "$LOCAL_VENDOR_DIR/op_api/lib" ]; then	21	+if [ -d "$LOCAL_VENDOR_DIR/op_api/lib" ]; then
22	- export LD_LIBRARY_PATH="$LOCAL_VENDOR_DIR/op_api/lib:${LD_LIBRARY_PATH:-}"	22	+ export LD_LIBRARY_PATH="$LOCAL_VENDOR_DIR/op_api/lib:${LD_LIBRARY_PATH:-}"
23	-fi	23	+fi
24	-echo "ASCEND_HOME_PATH=$ASCEND_HOME_PATH"	24	+echo "ASCEND_HOME_PATH=$ASCEND_HOME_PATH"
25	-echo "ASCEND_CUSTOM_OPP_PATH=$ASCEND_CUSTOM_OPP_PATH"	25	+echo "ASCEND_CUSTOM_OPP_PATH=$ASCEND_CUSTOM_OPP_PATH"