From 757d7c56e534293d8a52fe22ce0e04359fa55ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=94=80?= Date: Sun, 20 Jul 2025 15:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .jenkins/check/config/filter_pylint.txt | 1 + .../engine/ir/cache/dataset_cache_impl.h | 2 +- .../dataset/include/dataset/constants.h | 2 +- .../dataset/include/dataset/datasets.h | 16 ++----------- .../test/config/large_model/hccl_2p.json | 23 ------------------- .../models_ascend_large_model_cloud_infer.cfg | 2 +- mindspore-lite/test/st/ops/frame/optest.py | 2 +- .../test/st/scripts/ascend/run_ascend.sh | 1 - .../st/scripts/dpico/run_converter_3403.sh | 1 - .../st/scripts/nnie/run_converter_nnie.sh | 1 - .../scripts/nnie/run_converter_nnie_micro.sh | 1 - .../st/scripts/run_benchmark_graph_kernel.sh | 2 -- .../test/st/scripts/run_benchmark_tensorrt.sh | 1 - 13 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 mindspore-lite/test/config/large_model/hccl_2p.json diff --git a/.jenkins/check/config/filter_pylint.txt b/.jenkins/check/config/filter_pylint.txt index 8fc5a905..49cde854 100644 --- a/.jenkins/check/config/filter_pylint.txt +++ b/.jenkins/check/config/filter_pylint.txt @@ -14,6 +14,7 @@ "mindspore-lite/mindspore-lite/test/st/python/test_large_model_inference.py" "redefined-outer-name" "mindspore-lite/mindspore-lite/tools/kernel_builder/ascend/ascendc/cmake/util/insert_simplified_keys.py" "duplicate-key" "mindspore-lite/mindspore-lite/tools/kernel_builder/ascend/ascendc/cmake/util/replay_codegen.py" "bad-continuation" +"mindspore-lite/mindspore-lite/test/st/ops/frame/optest.py" "invalid-name" # ascend samples "mindspore-lite/mindspore-lite/tools/kernel_builder/ascend/tbe_dsl/sample/" "wrong-import-order" diff --git a/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h b/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h index 389ef09e..e337fe6a 100644 --- a/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h +++ b/mindspore-lite/minddata/dataset/engine/ir/cache/dataset_cache_impl.h @@ -39,7 +39,7 @@ class DatasetCacheImpl : public DatasetCache { /// \param mem_sz Size of the memory set aside for the row caching (default=0 which means unlimited, /// note that it might bring in the risk of running out of memory on the machine). /// \param spill Spill to disk if out of memory (default=False). - /// \param hostname optional host name (default="127.0.0.1"). + /// \param hostname optional host name. /// \param port optional port (default=50052). /// \param num_connections optional number of connections (default=12). /// \param prefetch_sz optional prefetch size (default=20). diff --git a/mindspore-lite/minddata/dataset/include/dataset/constants.h b/mindspore-lite/minddata/dataset/include/dataset/constants.h index ecc7184c..e2b760bb 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/constants.h +++ b/mindspore-lite/minddata/dataset/include/dataset/constants.h @@ -344,7 +344,7 @@ constexpr uint32_t kCfgMonitorSamplingInterval = 1000; // timeout value f constexpr uint32_t kCfgCallbackTimeout = 60; // timeout value for callback in seconds constexpr uint32_t kCfgMultiprocessingTimeoutInterval = 300; // timeout value for multiprocessing interval in seconds constexpr int32_t kCfgDefaultCachePort = 50052; -constexpr char kCfgDefaultCacheHost[] = "127.0.0.1"; +constexpr char kCfgDefaultCacheHost[] = ""; constexpr int32_t kDftCachePrefetchSize = 20; constexpr int32_t kDftNumConnections = 12; constexpr bool kDftAutoNumWorkers = false; diff --git a/mindspore-lite/minddata/dataset/include/dataset/datasets.h b/mindspore-lite/minddata/dataset/include/dataset/datasets.h index 6af704f7..ad398173 100644 --- a/mindspore-lite/minddata/dataset/include/dataset/datasets.h +++ b/mindspore-lite/minddata/dataset/include/dataset/datasets.h @@ -6495,7 +6495,7 @@ inline std::shared_ptr DATASET_API YesNo(const std::string &datase /// \param[in] mem_sz Size of the memory set aside for the row caching (default=0 which means unlimited, /// note that it might bring in the risk of running out of memory on the machine). /// \param[in] spill Spill to disk if out of memory. -/// \param[in] hostname optional host name (default=std::nullopt, means to use "127.0.0.1"). +/// \param[in] hostname optional host name (default=std::nullopt). /// \param[in] port optional port (default=std::nullopt, means to use 50052). /// \param[in] num_connections optional number of connections (default=std::nullopt, means to use 12). /// \param[in] prefetch_sz optional prefetch size (default=std::nullopt, means to use 20). @@ -6510,23 +6510,11 @@ std::shared_ptr DATASET_API CreateDatasetCacheCharIF( /// \param[in] mem_sz Size of the memory set aside for the row caching (default=0 which means unlimited, /// note that it might bring in the risk of running out of memory on the machine). /// \param[in] spill Spill to disk if out of memory. -/// \param[in] hostname optional host name (default=std::nullopt, means to use "127.0.0.1"). +/// \param[in] hostname optional host name (default=std::nullopt). /// \param[in] port optional port (default=std::nullopt, means to use 50052). /// \param[in] num_connections optional number of connections (default=std::nullopt, means to use 12). /// \param[in] prefetch_sz optional prefetch size (default=std::nullopt, means to use 20). /// \return Shared pointer to DatasetCache. If error, nullptr is returned. -/// \par Example -/// \code -/// /* Define a Cache object */ -/// std::shared_ptr cache = CreateDatasetCache(233, 0, false, "127.0.0.1", 50053, 1, 1); -/// -/// /* Define dataset path and MindData object */ -/// std::string folder_path = "/path/to/image_directory"; -/// std::shared_ptr ds = ImageFolder(folder_path, false, nullptr, {}, {}, cache); -/// -/// /* Create iterator to read dataset */ -/// std::shared_ptr iter = ds->CreateIterator(); -/// \endcode inline std::shared_ptr DATASET_API CreateDatasetCache( session_id_type id, uint64_t mem_sz, bool spill, const std::optional &hostname = std::nullopt, const std::optional &port = std::nullopt, const std::optional &num_connections = std::nullopt, diff --git a/mindspore-lite/test/config/large_model/hccl_2p.json b/mindspore-lite/test/config/large_model/hccl_2p.json deleted file mode 100644 index 35b2f7d1..00000000 --- a/mindspore-lite/test/config/large_model/hccl_2p.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0", - "server_count": "1", - "server_list": [ - { - "server_id": "127.0.0.1", - "device": [ - { - "device_id": "0", - "device_ip": "10.20.10.1", - "rank_id": "0" - }, - { - "device_id": "1", - "device_ip": "10.20.11.5", - "rank_id": "1" - } - ], - "host_nic_ip": "reserve" - } - ], - "status": "completed" -} \ No newline at end of file diff --git a/mindspore-lite/test/config_level0/models_ascend_large_model_cloud_infer.cfg b/mindspore-lite/test/config_level0/models_ascend_large_model_cloud_infer.cfg index bae65f6a..d99a1ec2 100644 --- a/mindspore-lite/test/config_level0/models_ascend_large_model_cloud_infer.cfg +++ b/mindspore-lite/test/config_level0/models_ascend_large_model_cloud_infer.cfg @@ -1 +1 @@ -llama_7b_seq1024_bs1;llama2;static;2 +# llama_7b_seq1024_bs1;llama2;static;2 diff --git a/mindspore-lite/test/st/ops/frame/optest.py b/mindspore-lite/test/st/ops/frame/optest.py index 280a566a..afbc51d3 100644 --- a/mindspore-lite/test/st/ops/frame/optest.py +++ b/mindspore-lite/test/st/ops/frame/optest.py @@ -25,7 +25,7 @@ class OpTest: if mslite_package_path is None: raise Exception( - "Please set envion \"MSLITE_PACKAGE_PATH\" to specify the MSLite"+ + "Please specify the MSLite"+ "package root path, which is necessary for MSLITE-OP-ST!" ) diff --git a/mindspore-lite/test/st/scripts/ascend/run_ascend.sh b/mindspore-lite/test/st/scripts/ascend/run_ascend.sh index 2dab57f4..e35cc9c9 100644 --- a/mindspore-lite/test/st/scripts/ascend/run_ascend.sh +++ b/mindspore-lite/test/st/scripts/ascend/run_ascend.sh @@ -105,7 +105,6 @@ function Run_Ascend() { fi } -# Example:sh run_benchmark_nets.sh -r /home/temp_test -m /home/temp_test/models -e Ascend310 -d 10.92.9.100:2 while getopts "r:m:d:e:l:p:" opt; do case ${opt} in r) diff --git a/mindspore-lite/test/st/scripts/dpico/run_converter_3403.sh b/mindspore-lite/test/st/scripts/dpico/run_converter_3403.sh index 2efa483e..3f0cac28 100644 --- a/mindspore-lite/test/st/scripts/dpico/run_converter_3403.sh +++ b/mindspore-lite/test/st/scripts/dpico/run_converter_3403.sh @@ -158,7 +158,6 @@ mkdir -p ${arm64_path} #set -e st_dir=${mindspore_top_dir}/mindspore-lite/test/st -# Example:sh run_dpico_nets.sh r /home/temp_test -m /home/temp_test/models -e arm32_3403D -d 192.168.1.1 while getopts "m:d:e:l:" opt; do case ${opt} in m) diff --git a/mindspore-lite/test/st/scripts/nnie/run_converter_nnie.sh b/mindspore-lite/test/st/scripts/nnie/run_converter_nnie.sh index ad0236bf..54f923ff 100755 --- a/mindspore-lite/test/st/scripts/nnie/run_converter_nnie.sh +++ b/mindspore-lite/test/st/scripts/nnie/run_converter_nnie.sh @@ -113,7 +113,6 @@ basepath=$(pwd) echo ${basepath} #set -e -# Example:sh run_nnie_nets.sh r /home/temp_test -m /home/temp_test/models -e arm32_3516D -d 192.168.1.1 while getopts "r:m:d:e:l:" opt; do case ${opt} in r) diff --git a/mindspore-lite/test/st/scripts/nnie/run_converter_nnie_micro.sh b/mindspore-lite/test/st/scripts/nnie/run_converter_nnie_micro.sh index 4ee612cd..b6d9e0ac 100755 --- a/mindspore-lite/test/st/scripts/nnie/run_converter_nnie_micro.sh +++ b/mindspore-lite/test/st/scripts/nnie/run_converter_nnie_micro.sh @@ -121,7 +121,6 @@ basepath=$(pwd) echo ${basepath} #set -e -# Example:sh run_nnie_nets.sh r /home/temp_test -m /home/temp_test/models -e arm32_3516D -d 192.168.1.1 while getopts "r:m:d:e:l:" opt; do case ${opt} in r) diff --git a/mindspore-lite/test/st/scripts/run_benchmark_graph_kernel.sh b/mindspore-lite/test/st/scripts/run_benchmark_graph_kernel.sh index ae64f2a3..c9716e2d 100644 --- a/mindspore-lite/test/st/scripts/run_benchmark_graph_kernel.sh +++ b/mindspore-lite/test/st/scripts/run_benchmark_graph_kernel.sh @@ -257,8 +257,6 @@ function ConfigAscend() { fi } -# Example:sh run_benchmark_graph_kernel.sh -r /home/temp_test -m /home/temp_test/models -e x86_gpu -d 192.168.1.1:0 -# backend can be: x86_gpu,x86_cpu,arm64_cpu,arm64_android_cpu,x86_ascend,arm64_ascend while getopts "r:m:d:e:l:" opt; do case ${opt} in r) diff --git a/mindspore-lite/test/st/scripts/run_benchmark_tensorrt.sh b/mindspore-lite/test/st/scripts/run_benchmark_tensorrt.sh index 5efb8631..ae04f6d2 100644 --- a/mindspore-lite/test/st/scripts/run_benchmark_tensorrt.sh +++ b/mindspore-lite/test/st/scripts/run_benchmark_tensorrt.sh @@ -189,7 +189,6 @@ function Run_TensorRT() { done } -# Example:sh run_benchmark_tensorrt.sh -r /home/temp_test -m /home/temp_test/models -e x86_gpu -d 192.168.1.1:0 while getopts "r:m:d:e:l:" opt; do case ${opt} in r) -- Gitee