Devel #3129
Open
Devel #3129
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
Updates the requirements on [optuna](https://github.com/optuna/optuna) to permit the latest version. - [Release notes](https://github.com/optuna/optuna/releases) - [Commits](optuna/optuna@v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: optuna dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Results, errors, warning, are testid independently for each value of tested softmax_choice parameter. Signed-off-by: Jan Vesely <[email protected]>
Signed-off-by: Jan Vesely <[email protected]>
Simplify implementation. Handle multidimensional arrays. Signed-off-by: Jan Vesely <[email protected]>
…ent (#3112) Fixes: ticket #106903 Signed-off-by: Jan Vesely <[email protected]>
Parameter.set checks for Component values assigned after its owning Component's __init__ so that the assigned Components can be shaped compatibly and set up for later context initialization. Check for ContextFlags.INITIALIZED initialization_status instead of is_initialized, because is_initialized also considers any initialization context, not just the status of having completed Component.__init__
• transformfunctions.py - MatrixTransform: allow normaliation for L0 • emcomposition.py - enforce normalize_memories for len(keys)==1 • test_emcomposition.py - test_simple_execution_without_learning(): add tests for scalar keys & use of L0 in MatrixTransform
nedbat/coveragepy#1891 Signed-off-by: Jan Vesely <[email protected]>
* • emcomposition.py - add field_weights setter and getter - field_weights_setter(): check that value node is not be assigned a weight • mechanism.py Mechanism_Base.execute(): add check whether any input_ports have default_input set in determining whether or not to to call _update_input_ports
* • recurrenttransfermechanism.py
- _instantiate_attributes_after_function(): fix assignment of StabilityFunction, and force update of default_variable for output_port
• _instantiate_attributes_after_function:
revise call to _update_default_variable to use energy.variable instead of value
* • test_recurrent_transfer_mechanism.py
- TestStandardOutputPorts:
test_rtn_energy()
test_rtn_entropy()
* • recurrenttransfermechanism.py
_instantiate_attributes_after_function():
refactor to assign functions for ENERGY and ENTROPY standard_output_ports before call to super()
otherwise, calls to execute with no input may ignore port default_input in favor of execution with Mechanism.defaults.variable
if a port has default_input, this value should be used instead of any values from incoming projections
Updates the requirements on [grpcio](https://github.com/grpc/grpc) to permit the latest version. - [Release notes](https://github.com/grpc/grpc/releases) - [Changelog](https://github.com/grpc/grpc/blob/master/doc/grpc_release_schedule.md) - [Commits](grpc/grpc@v1.67.0...v1.68.0) --- updated-dependencies: - dependency-name: grpcio dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Jan Vesely <[email protected]>
The other modes will be update to match generalized Python behaviour. Signed-off-by: Jan Vesely <[email protected]>
…ISTIC Allow output of multiple extremes. Enable tests. Still TODO: * mode==DETERMINISTIC * tie==RANDOM (only used with mode==DETERMINISTIC) * 2d arguments Signed-off-by: Jan Vesely <[email protected]>
Not needed since OneHot now supports all modes != DETERMINISTIC Cleanup codestyle. Signed-off-by: Jan Vesely <[email protected]>
Remove call_elementwise_operation helper. Signed-off-by: Jan Vesely <[email protected]>
…DETERMINISTIC mode Drop random_state and seed if "tie" is not RANDOM Signed-off-by: Jan Vesely <[email protected]>
Use "recursive_iterate_arrays" to support 2d input. Signed-off-by: Jan Vesely <[email protected]>
Change test name to include "int32" Use np.uint32 type for numpy PRNG Signed-off-by: Jan Vesely <[email protected]>
Uses Lemire's algorithm [0]. Applies to Philox PRNG using "integers" API call, "randint" uses older, "masked rejection sampling" approach. [0] https://arxiv.org/abs/1805.10941 Signed-off-by: Jan Vesely <[email protected]>
Uses bit masked rejection sampling of lower bits. Matches to Numpy's Random.randint API call. Signed-off-by: Jan Vesely <[email protected]>
Signed-off-by: Jan Vesely <[email protected]>
It no longer needs to fit search for extreme values. Signed-off-by: Jan Vesely <[email protected]>
Signed-off-by: Jan Vesely <[email protected]>
Refactor Python OneHot implementation. Add tests for OneHot(mode=DETERMINISTIC). Refactor compiled OneHot to isolate PROB and PROB_INDICATOR. Convert recursive traversal of arrays from generator to context manager. Implement compiled random integer generation for bounded integers. Implement all OneHot modes in compiled mode.
* • emcomposition.py - add field class - refactor to use fields for all node attributes/arrays
* • emcomposition.py assign memory indices in field-order • test_emcomposition.py - test_order_fields_in_memory
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+354
to
+355
| # elif isinstance(matrix, ParameterPort): | ||
| # pass |
Check notice
Code scanning / CodeQL
Commented-out code Note
Comment on lines
+2713
to
+2714
| # except: | ||
| # raise ShowGraphError(f"Problem displaying graph for {composition.name}") |
Check notice
Code scanning / CodeQL
Commented-out code Note
| @@ -193,10 +193,11 @@ | |||
|
|
|||
| from psyneulink.core import llvm as pnlvm | |||
| from psyneulink.core.components.component import _get_parametervalue_attr | |||
| from psyneulink.core.components.functions.nonstateful.transferfunctions import Linear | |||
Check notice
Code scanning / CodeQL
Cyclic import Note
| @@ -193,10 +193,11 @@ | |||
|
|
|||
| from psyneulink.core import llvm as pnlvm | |||
| from psyneulink.core.components.component import _get_parametervalue_attr | |||
| from psyneulink.core.components.functions.nonstateful.transferfunctions import Linear | |||
Check notice
Code scanning / CodeQL
Unused import Note
| from psyneulink.core.components.functions.nonstateful.transformfunctions import LinearCombination | ||
| from psyneulink.core.components.functions.function import Function, get_matrix | ||
| from psyneulink.core.components.functions.nonstateful.learningfunctions import Hebbian | ||
| from psyneulink.core.components.functions.nonstateful.objectivefunctions import Stability | ||
| from psyneulink.core.components.functions.nonstateful.objectivefunctions import Stability, Energy, Entropy |
Check notice
Code scanning / CodeQL
Cyclic import Note
| from psyneulink.core.components.functions.nonstateful.transformfunctions import LinearCombination | ||
| from psyneulink.core.components.functions.function import Function, get_matrix | ||
| from psyneulink.core.components.functions.nonstateful.learningfunctions import Hebbian | ||
| from psyneulink.core.components.functions.nonstateful.objectivefunctions import Stability | ||
| from psyneulink.core.components.functions.nonstateful.objectivefunctions import Stability, Energy, Entropy |
Check notice
Code scanning / CodeQL
Unused import Note
| from psyneulink.core.compositions import NodeRole | ||
| from psyneulink.core.compositions.showgraph import ShowGraph, SHOW_JUST_LEARNING_PROJECTIONS | ||
| from psyneulink.core.compositions.showgraph import ShowGraph, SHOW_JUST_LEARNING_PROJECTIONS, SHOW_LEARNING |
Check notice
Code scanning / CodeQL
Unused import Note
| from psyneulink.core.globals.keywords import BOLD, NESTED, INSET | ||
| from psyneulink.core.llvm import ExecutionMode | ||
| from psyneulink.core.globals.context import ContextFlags, handle_external_context | ||
| from psyneulink.core.globals.keywords import BOLD, INSET, NESTED, PNL |
Check notice
Code scanning / CodeQL
Unused import Note
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): See CI logs for the full diff. |
* • emcomposition.py fix bug in field.memories property • test_emcomposition.py test_order_fields_in_memory: add tests for field.type and memory alignment
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): See CI logs for the full diff. |
avoid duplication
version is unavailable. match exclusion in other workflows
- exclude unavailable macos-11 on py3.7 - add matrix.dist to test result artifact to avoid duplication
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): See CI logs for the full diff. |
* - * [skip ci] * [skip ci] * • composition.py - suppress warning about adding CONTROL_OBJECTIVE NodeRole if ObjectiveMechanism is already associated with a ControlMechanism * -
Easier to track progress. Signed-off-by: Jan Vesely <[email protected]>
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): See CI logs for the full diff. |
* • composition.py
- suppress warning about adding CONTROL_OBJECTIVE NodeRole if ObjectiveMechanism is already associated with a ControlMechanism
• lccontrolmechanism.py
- _instantiate_objective_mechanism(): implement default ObjectiveMechanism with CombineMeans
- _instantiate_control_signals:
complete implementation of ALL
* • test_control_mechanism.py
test_lc_control_monitored_and_modulated_mechanisms_composition(): augmented to test implementation of ObjectiveMechanism
| @@ -2912,7 +2912,7 @@ | |||
| from psyneulink.core.components.mechanisms.modulatory.modulatorymechanism import ModulatoryMechanism_Base | |||
| from psyneulink.core.components.mechanisms.processing.compositioninterfacemechanism import CompositionInterfaceMechanism | |||
| from psyneulink.core.components.mechanisms.processing.objectivemechanism import ObjectiveMechanism | |||
| from psyneulink.core.components.mechanisms.processing.processingmechanism import ProcessingMechanism | |||
| from psyneulink.core.components.mechanisms.processing.processingmechanism import ProcessingMechanism, ProcessingMechanism_Base | |||
Check notice
Code scanning / CodeQL
Cyclic import Note
| assert T_1.parameter_ports[pnl.SLOPE].mod_afferents[0] in LC.control_signals[0].efferents | ||
| assert T_2.parameter_ports[pnl.SLOPE].mod_afferents[0] in LC.control_signals[0].efferents | ||
|
|
||
| result = C.run(inputs={T_1:[1,2]})#, T_2:[3,4,5] |
Check notice
Code scanning / CodeQL
Unused local variable Note test
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): See CI logs for the full diff. |
….2 (#3135) Updates the requirements on [pytest-profiling](https://github.com/man-group/pytest-plugins) to permit the latest version. - [Release notes](https://github.com/man-group/pytest-plugins/releases) - [Changelog](https://github.com/man-group/pytest-plugins/blob/master/CHANGES.md) - [Commits](man-group/pytest-plugins@v1.8.0...v1.8.1) --- updated-dependencies: - dependency-name: pytest-profiling dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): See CI logs for the full diff. |
* • composition.py - reset(): add clear_results arg
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): See CI logs for the full diff. |
Updates the requirements on [pytest](https://github.com/pytest-dev/pytest) to permit the latest version. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@8.3.3...8.3.4) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
This PR causes the following changes to the html docs (ubuntu-latest-3.11): 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.
No description provided.