Merge master into devel #2862
Merged
Merge master into devel #2862
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
• inputport.py _parse_port_specific_specs(): fix bug in which COMBINE was not parsed when specified in an InputPort specification dict (though still some weirdness in passing spec through to constructor, requiring function assignment in place) • port.py _parse_port_spec(): add passing of Context.string for local handling based on caller (e.g., warning messages)
• EMstoragemechanism.py - refactor memory_matrix to use learning_signals • emcomposition.py - refactor to use memory_matrix of storage_node if that is implemented Co-authored-by: jdcpni <pniintel55>
… of relying on tolerance Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
…by 40x It's still enough to recover the parameters and reduces test time significantly. Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Resolve all differences in favor of devel. master changes are stale because they mirror old commits on devel. * master: tests/ParameterEstimationComposition: Reduce the number of estimates by 40x tests/ParameterEstimationComposition: Provide expected result instead of relying on tolerance requirements: update dill requirement from <0.3.7 to <0.3.8 (PrincetonUniversity#2743) Feat/em composition refactor learning mech (PrincetonUniversity#2754) Fix/input port combine (PrincetonUniversity#2755) requirements: update beartype requirement from <0.15.0 to <0.16.0 (PrincetonUniversity#2744)
|
Use merge strategy for this PR, not squash. |
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11-x64): See CI logs for the full diff. |
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.
Resolve all differences in favor of devel. master changes are stale
because they mirror old commits on devel.
tests/ParameterEstimationComposition: Reduce the number of estimates by 40x
tests/ParameterEstimationComposition: Provide expected result instead of relying on tolerance
requirements: update dill requirement from <0.3.7 to <0.3.8 (requirements: update dill requirement from <0.3.7 to <0.3.8 #2743)
Feat/em composition refactor learning mech (Feat/em composition refactor learning mech #2754)
Fix/input port combine (Fix/input port combine #2755)
requirements: update beartype requirement from <0.15.0 to <0.16.0 (requirements: update beartype requirement from <0.15.0 to <0.16.0 #2744)