Browse Source

!2629 get monitor sampling interval from json file

Merge pull request !2629 from yanghaitao/yht_sampling_interval
tags/v0.6.0-beta
mindspore-ci-bot Gitee 5 years ago
parent
commit
32a2d5d21c
4 changed files with 5 additions and 4 deletions
  1. +1
    -0
      mindspore/ccsrc/dataset/core/config_manager.cc
  2. +2
    -1
      mindspore/dataset/core/configuration.py
  3. +1
    -2
      tests/ut/data/dataset/declient.cfg
  4. +1
    -1
      tests/ut/python/dataset/test_config.py

+ 1
- 0
mindspore/ccsrc/dataset/core/config_manager.cc View File

@@ -41,6 +41,7 @@ Status ConfigManager::FromJson(const nlohmann::json &j) {
set_worker_connector_size(j.value("workerConnectorSize", worker_connector_size_)); set_worker_connector_size(j.value("workerConnectorSize", worker_connector_size_));
set_op_connector_size(j.value("opConnectorSize", op_connector_size_)); set_op_connector_size(j.value("opConnectorSize", op_connector_size_));
set_seed(j.value("seed", seed_)); set_seed(j.value("seed", seed_));
set_monitor_sampling_interval(j.value("monitorSamplingInterval", monitor_sampling_interval_));
return Status::OK(); return Status::OK();
} }




+ 2
- 1
mindspore/dataset/core/configuration.py View File

@@ -185,7 +185,8 @@ class ConfigurationManager:
>>> # "numParallelWorkers": 4, >>> # "numParallelWorkers": 4,
>>> # "workerConnectorSize": 16, >>> # "workerConnectorSize": 16,
>>> # "opConnectorSize": 16, >>> # "opConnectorSize": 16,
>>> # "seed": 5489
>>> # "seed": 5489,
>>> # "monitorSamplingInterval": 30
>>> # } >>> # }
""" """
self.config.load(file) self.config.load(file)


+ 1
- 2
tests/ut/data/dataset/declient.cfg View File

@@ -5,6 +5,5 @@
"workerConnectorSize": 16, "workerConnectorSize": 16,
"opConnectorSize": 16, "opConnectorSize": 16,
"seed": 5489, "seed": 5489,
"monitor_sampling_interval": 15

"monitorSamplingInterval": 15
} }

+ 1
- 1
tests/ut/python/dataset/test_config.py View File

@@ -46,7 +46,7 @@ def test_basic():
# assert ds.config.get_worker_connector_size() == 16 # assert ds.config.get_worker_connector_size() == 16
assert ds.config.get_prefetch_size() == 16 assert ds.config.get_prefetch_size() == 16
assert ds.config.get_seed() == 5489 assert ds.config.get_seed() == 5489
# assert ds.config.get_monitor_sampling_interval() == 15
assert ds.config.get_monitor_sampling_interval() == 15


# ds.config.set_rows_per_buffer(1) # ds.config.set_rows_per_buffer(1)
ds.config.set_num_parallel_workers(2) ds.config.set_num_parallel_workers(2)


Loading…
Cancel
Save