[ML] Do not log incorrect model memory limit #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, the model memory limit was logged twice: once when the CResourceMonitor was constructed and once when the limit was read from the config file. The first time the log message contained the default limit (4GB). The second time it contained the actual limit. The first message is incorrect. In addition, 6.3 is changed so that the limit is always set explicitly. Thus, there is no reason to keep logging in the constructor of the monitor. This commit removes the logging from the constructor of the resource monitor.
droberts195
reviewed
Feb 23, 2018
| @@ -58,7 +57,6 @@ CResourceMonitor::CResourceMonitor(std::size_t limit) : m_AllowAllocations(true) | |||
| m_PruneWindowMinimum(std::numeric_limits<std::size_t>::max()), | |||
| m_NoLimit(false) | |||
| { | |||
| this->memoryLimit(std::max(std::size_t(1), limit)); | |||
There was a problem hiding this comment.
If this line is being removed then we should remove the whole constructor. There's no point having a constructor that takes a limit argument but does nothing with it.
lib/model/CResourceMonitor.cc
Outdated
| @@ -45,7 +45,6 @@ CResourceMonitor::CResourceMonitor(void) : m_AllowAllocations(true), | |||
| m_PruneWindowMinimum(std::numeric_limits<std::size_t>::max()), | |||
| m_NoLimit(false) | |||
| { | |||
| this->memoryLimit((sizeof(size_t) < 8) ? 1024: 4096); | |||
There was a problem hiding this comment.
I'm surprised this doesn't mess up any unit tests, as it means a lot of unit tests will now be running with a resource monitor that hasn't inconsistently set member variables.
I would say this constructor should now initialise "no limit" case, i.e. set the following values in the initialiser list above:
m_ByteLimitHigh(std::numeric_limits<std::size_t>::max() / 2 + 1),
m_ByteLimitLow(m_ByteLimitHigh - 1024),
m_PruneThreshold(m_ByteLimitHigh / 5 * 3),
m_NoLimit(true)
There was a problem hiding this comment.
I pushed a fix where I addressed this by doing something a bit different. Check it out and let me know if it's ok.
dimitris-athanasiou
added a commit
that referenced
this pull request
Feb 23, 2018
Previously, the model memory limit was logged twice: once when the CResourceMonitor was constructed and once when the limit was read from the config file. The first time the log message contained the default limit (4GB). The second time it contained the actual limit. The first message is incorrect. In addition, 6.3 is changed so that the limit is always set explicitly. Thus, there is no reason to keep logging in the constructor of the monitor. This commit removes the logging from the constructor of the resource monitor.
dimitris-athanasiou
deleted the
do-not-log-incorrect-model-memory-limit
branch
droberts195
pushed a commit
that referenced
this pull request
Apr 23, 2018
Previously, the model memory limit was logged twice: once when the CResourceMonitor was constructed and once when the limit was read from the config file. The first time the log message contained the default limit (4GB). The second time it contained the actual limit. The first message is incorrect. In addition, 6.3 is changed so that the limit is always set explicitly. Thus, there is no reason to keep logging in the constructor of the monitor. This commit removes the logging from the constructor of the resource monitor.
droberts195
pushed a commit
that referenced
this pull request
Apr 23, 2018
Previously, the model memory limit was logged twice: once when the CResourceMonitor was constructed and once when the limit was read from the config file. The first time the log message contained the default limit (4GB). The second time it contained the actual limit. The first message is incorrect. In addition, 6.3 is changed so that the limit is always set explicitly. Thus, there is no reason to keep logging in the constructor of the monitor. This commit removes the logging from the constructor of the resource monitor.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the model memory limit was logged twice:
once when the CResourceMonitor was constructed and once
when the limit was read from the config file. The first
time the log message contained the default limit (4GB).
The second time it contained the actual limit.
The first message is incorrect. In addition, 6.3 is
changed so that the limit is always set explicitly. Thus,
there is no reason to keep logging in the constructor of
the monitor.
This commit removes the logging from the constructor of
the resource monitor.