diff --git a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.cc b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.cc index c4ed4bf83b..8e07602be2 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.cc @@ -1293,7 +1293,8 @@ CacheServer::Builder::Builder() num_workers_(std::thread::hardware_concurrency() / 2), port_(50052), shared_memory_sz_in_gb_(kDefaultSharedMemorySize), - memory_cap_ratio_(kDefaultMemoryCapRatio) { + memory_cap_ratio_(kDefaultMemoryCapRatio), + log_level_(1) { if (num_workers_ == 0) { num_workers_ = 1; } diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.cc index a1805204c5..880ef47f46 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.cc @@ -80,6 +80,5 @@ Status CacheLookupNode::SamplerBuild(std::shared_ptr *const out) { *out = std::shared_ptr(lookup_op); return Status::OK(); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.h b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.h index 7c0e6643f3..443e4f2003 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_lookup_node.h @@ -25,7 +25,6 @@ namespace mindspore { namespace dataset { - class CacheLookupNode : public DatasetNode, public SamplerObj { public: /// \brief Constructor diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.cc index 2a08a5e2c9..44ce6b1676 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.cc @@ -65,6 +65,5 @@ Status CacheMergeNode::AcceptAfter(IRNodePass *const p, bool *const modified) { // Downcast shared pointer then call visitor return p->VisitAfter(shared_from_base(), modified); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.h b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.h index d49a19e37e..297d7273c2 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_merge_node.h @@ -24,7 +24,6 @@ namespace mindspore { namespace dataset { - class CacheMergeNode : public DatasetNode { public: /// \brief Constructor diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.cc index 66fa1adbcc..eca4a55aa2 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.cc @@ -72,6 +72,5 @@ Status CacheNode::AcceptAfter(IRNodePass *const p, bool *const modified) { // Downcast shared pointer then call visitor return p->VisitAfter(shared_from_base(), modified); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.h b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.h index 1951017752..dd04096d74 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/cache_node.h @@ -24,7 +24,6 @@ namespace mindspore { namespace dataset { - class CacheNode : public DatasetNode { public: /// \brief Constructor diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc index 0c8ecf7479..2cbf833dc5 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc @@ -213,7 +213,7 @@ Status MindDataNode::Accept(IRNodePass *const p, bool *const modified) { } // Visitor accepting method for IRNodePass -Status MindDataNode::AcceptAfter(IRNodePass *p, bool *const modified) { +Status MindDataNode::AcceptAfter(IRNodePass *const p, bool *const modified) { // Downcast shared pointer then call visitor return p->VisitAfter(shared_from_base(), modified); } diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.h b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.h index 1434137a25..c91ee6ebf2 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.h @@ -96,13 +96,13 @@ class MindDataNode : public MappableSourceNode { /// \param[in] p The node to visit /// \param[out] modified Indicator if the node was modified /// \return Status of the node visit - Status Accept(IRNodePass *p, bool *const modified) override; + Status Accept(IRNodePass *const p, bool *const modified) override; /// \brief Base-class override for accepting IRNodePass visitor /// \param[in] p The node to visit /// \param[out] modified Indicator if the node was modified /// \return Status of the node visit - Status AcceptAfter(IRNodePass *p, bool *const modified) override; + Status AcceptAfter(IRNodePass *const p, bool *const modified) override; private: std::string dataset_file_; // search_for_pattern_ will be true in this mode diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.cc index b4a312fc8b..4bf8de29ec 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.cc @@ -148,13 +148,13 @@ Status RandomNode::SetupSamplerForCache(std::shared_ptr *sampler) { } // Visitor accepting method for IRNodePass -Status RandomNode::Accept(IRNodePass *p, bool *const modified) { +Status RandomNode::Accept(IRNodePass *const p, bool *const modified) { // Downcast shared pointer then call visitor return p->Visit(shared_from_base(), modified); } // Visitor accepting method for IRNodePass -Status RandomNode::AcceptAfter(IRNodePass *p, bool *const modified) { +Status RandomNode::AcceptAfter(IRNodePass *const p, bool *const modified) { // Downcast shared pointer then call visitor return p->VisitAfter(shared_from_base(), modified); } diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.h b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.h index eeae3cd739..6728bdae2c 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.h @@ -115,13 +115,13 @@ class RandomNode : public NonMappableSourceNode { /// \param[in] p The node to visit /// \param[out] modified Indicator if the node was modified /// \return Status of the node visit - Status Accept(IRNodePass *p, bool *const modified) override; + Status Accept(IRNodePass *const p, bool *const modified) override; /// \brief Base-class override for accepting IRNodePass visitor /// \param[in] p The node to visit /// \param[out] modified Indicator if the node was modified /// \return Status of the node visit - Status AcceptAfter(IRNodePass *p, bool *const modified) override; + Status AcceptAfter(IRNodePass *const p, bool *const modified) override; private: /// \brief A quick inline for producing a random number between (and including) min/max diff --git a/tests/ut/cpp/dataset/c_api_cache_test.cc b/tests/ut/cpp/dataset/c_api_cache_test.cc index 6ba74e4077..d587ff0b83 100644 --- a/tests/ut/cpp/dataset/c_api_cache_test.cc +++ b/tests/ut/cpp/dataset/c_api_cache_test.cc @@ -462,7 +462,7 @@ TEST_F(MindDataTestCacheOp, DISABLED_TestCacheRandomDataCApi) { schema->add_column("image", mindspore::DataType::kNumberTypeUInt8, {2}); schema->add_column("label", mindspore::DataType::kNumberTypeUInt8, {1}); - std::shared_ptr ds = RandomData(4, schema, {}, some_cache); + std::shared_ptr ds = RandomData(8, schema, {}, some_cache); EXPECT_NE(ds, nullptr); // Create a Repeat operation on ds @@ -485,7 +485,7 @@ TEST_F(MindDataTestCacheOp, DISABLED_TestCacheRandomDataCApi) { iter->GetNextRow(&row); } - EXPECT_EQ(i, 8); + EXPECT_EQ(i, 16); // Manually terminate the pipeline iter->Stop(); diff --git a/tests/ut/python/cachetests/cachetest_args.sh b/tests/ut/python/cachetests/cachetest_args.sh index 8148926946..ff76f46c9a 100755 --- a/tests/ut/python/cachetests/cachetest_args.sh +++ b/tests/ut/python/cachetests/cachetest_args.sh @@ -55,7 +55,9 @@ cmd="${CACHE_ADMIN} --start --spilldir /path_that_does_not_exist" CacheAdminCmd "${cmd}" 1 HandleRcExit $? 0 0 -# start cache server twice +# stop cache server first to test start +StopServer +# start cache server StartServer HandleRcExit $? 1 1 # start the cache server again, however, this time we expect an error @@ -200,7 +202,7 @@ if [ "$EUID" -ne 0 ]; then fi # illegal log level -cmd="${CACHE_ADMIN} --start -l 4" +cmd="${CACHE_ADMIN} --start -l 5" CacheAdminCmd "${cmd}" 1 HandleRcExit $? 0 0 cmd="${CACHE_ADMIN} --start -l -1" diff --git a/tests/ut/python/dataset/test_cache_map.py b/tests/ut/python/dataset/test_cache_map.py index 09db52596e..3df178c6d0 100644 --- a/tests/ut/python/dataset/test_cache_map.py +++ b/tests/ut/python/dataset/test_cache_map.py @@ -804,11 +804,11 @@ def test_cache_map_parameter_check(): with pytest.raises(ValueError) as err: ds.DatasetCache(session_id=1, size=0, port=0) - assert "Input port is not within the required interval of (1025 to 65535)" in str(err.value) + assert "Input port is not within the required interval of [1025, 65535]" in str(err.value) with pytest.raises(ValueError) as err: ds.DatasetCache(session_id=1, size=0, port=65536) - assert "Input port is not within the required interval of (1025 to 65535)" in str(err.value) + assert "Input port is not within the required interval of [1025, 65535]" in str(err.value) with pytest.raises(TypeError) as err: ds.ImageFolderDataset(dataset_dir=DATA_DIR, cache=True)