Feat/backprop fct with multi args #2766
Merged
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
• combinationfunctions.py LinearCombination.derivative: return Jacobian for first item in variable[0] relative to others • composition.py _create_non_terminal_backprop_learning_components(): modify to handle multiple args in output_source for learning_function and learning_mechanism
• combinationfunctions.py LinearCombination.derivative: return Jacobian for first item in variable[0] relative to others • composition.py _create_non_terminal_backprop_learning_components(): modify to handle multiple args in output_source for learning_function and learning_mechanism
• composition.py
- _check_for_existing_projections():
augment to search over all input_ports and output_ports;
NOTE: if a mechanism is specified as sender and/or receiver, then any existing Projection between the two (i.e., between any pair of input_port/output_ports) will be returned as existing; to support multiple projections (between different pairs of Ports), must specify Ports explicitly
- fully refactored to use covariates • composition.py _create_non_terminal_backprop_learning_components(): refactored to use covariates RUNS
- make error_sources and covariates_sources Parameters
# Conflicts: # psyneulink/core/compositions/composition.py
…Link into feat/backprop_fct_with_multi_args # Conflicts: # psyneulink/core/components/functions/nonstateful/combinationfunctions.py # psyneulink/core/components/functions/nonstateful/learningfunctions.py # psyneulink/core/compositions/composition.py
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| from psyneulink.core.components.ports.parameterport import ParameterPort | ||
| from psyneulink.core.components.ports.modulatorysignals.learningsignal import LearningSignal |
Check notice
Code scanning / CodeQL
Cyclic import
| def _get_acts_in_and_out(input_source, output_soruce): | ||
| def _get_covariate_info(output_source, learned_projection)->(list[InputPort]): | ||
| """Get the templates and Projections from potential covariates""" | ||
| def _non_additive_comb_fct(function, allow)->Union[bool, None]: |
Check notice
Code scanning / CodeQL
Explicit returns mixed with implicit (fall through) returns
| loggable=False, | ||
| read_only=True, | ||
| structural=True) | ||
| def _parse_covariates_sources(self, covariates_sources): |
Check notice
Code scanning / CodeQL
Explicit returns mixed with implicit (fall through) returns
| if covariates_sources: | ||
| return convert_to_list(covariates_sources) | ||
|
|
||
| def _parse_error_sources(self, error_sources): |
Check notice
Code scanning / CodeQL
Explicit returns mixed with implicit (fall through) returns
Comment on lines
+1304
to
+1305
| # if error_sources: | ||
| # self.parameters.input_ports._set(self.input_ports[:2] + [ERROR_SIGNAL] * len(error_sources),context) |
Check notice
Code scanning / CodeQL
Commented-out code
| @@ -541,8 +574,9 @@ | |||
| from psyneulink.core.components.mechanisms.mechanism import Mechanism_Base, MechanismError | |||
| from psyneulink.core.components.mechanisms.modulatory.modulatorymechanism import ModulatoryMechanism_Base | |||
| from psyneulink.core.components.mechanisms.processing.objectivemechanism import ObjectiveMechanism | |||
| from psyneulink.core.components.ports.modulatorysignals.learningsignal import LearningSignal | |||
| from psyneulink.core.components.ports.inputport import InputPort | |||
Check notice
Code scanning / CodeQL
Cyclic import
| @@ -698,7 +698,7 @@ | |||
| VARIABLE: self.variable[i], | |||
| PROJECTIONS: field} | |||
| for i, field in enumerate(self.fields)] | |||
| return super()._instantiate_input_ports(input_ports=input_ports, context=context) | |||
| return super(LearningMechanism,self)._instantiate_input_ports(input_ports=input_ports, context=context) | |||
Check failure
Code scanning / CodeQL
First argument to super() is not enclosing class
added 2 commits
August 8, 2023 20:24
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-x64): See CI logs for the full diff. |
|
This PR causes the following changes to the html docs (ubuntu-latest-3.7-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.
• composition.py, learningmechanism.py and learningfunctions.py
• combinationfunctions.py