Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devel #2852

Merged
merged 124 commits into from
Dec 15, 2023
Merged

Devel #2852

Changes from 1 commit
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
4c22a0a
requirements: update beartype requirement from <0.15.0 to <0.16.0 (#2…
dependabot[bot] Jul 27, 2023
2890038
Fix/input port combine (#2755)
jdcpni Jul 29, 2023
26d1386
Feat/em composition refactor learning mech (#2754)
jdcpni Jul 30, 2023
70f0c57
requirements: update dill requirement from <0.3.7 to <0.3.8 (#2743)
dependabot[bot] Jul 31, 2023
f9ddb0c
tests/ParameterEstimationComposition: Provide expected result instead…
jvesely Jun 28, 2023
3218ef9
tests/ParameterEstimationComposition: Reduce the number of estimates …
jvesely Jul 28, 2023
c49c015
tests/ParameterEstimationComposition: Reduce running time (#2753)
jvesely Jul 31, 2023
e3887fc
Merge remote-tracking branch 'origin/devel'
kmantel Aug 1, 2023
8355ebb
Merge pull request #2758 from kmantel/master-devel
kmantel Aug 2, 2023
0782d49
requirements: update numpy requirement to allow 1.24.4 (#2759)
jvesely Aug 2, 2023
b1039b4
llvm, OptimizationControlMechanism: Change "input port" -> "output po…
jvesely Jul 3, 2023
0a817aa
llvm, OptimizationControlMechanism: Use more descriptive names for in…
jvesely Jul 3, 2023
1ff3db8
llvm, OptimizationControlMechanism: Execute OCM output ports when ass…
jvesely Jul 3, 2023
66aabcf
tests/control: Wrap composition run to return results and grid search…
jvesely Aug 1, 2023
8a2e2e0
llvm, OptimizationControlMechanism: Reuse calculated costs from Trans…
jvesely Aug 1, 2023
8eca274
tests/control: Consolidate model_based_ocm_{after,before} tests
jvesely Aug 1, 2023
84b9a72
llvm, OptimizationControlMechanism: Reuse costs computed by TransferW…
jvesely Aug 3, 2023
2ba0668
llvm/codegen: Use a new variable name for list of rval operands
jvesely Jun 6, 2023
79ba53b
llvm/execution: Use typing to annotate parameter types
jvesely Jun 6, 2023
9a9ef68
llvm: Type annotation fixes (#2762)
jvesely Aug 3, 2023
3d1ec81
Fix/composition existing projections (#2763)
jdcpni Aug 4, 2023
35c6e0a
llvm, GridSearch: Use get_random_state_ptr helper
jvesely Aug 6, 2023
0398894
llvm/Component: Do not include read-only parameters with custom gette…
jvesely Aug 7, 2023
630f03d
llvm/Component: Drop more parameters from the compiled structures
jvesely Aug 6, 2023
699dfa4
llvm, TransferWithCosts: Use get_state_space instead of get_state_ptr…
jvesely Aug 8, 2023
95cd326
llvm: Reduce size of compiled parameters (#2765)
jvesely Aug 8, 2023
8732aaa
requirements: update optuna requirement from <3.3.0 to <3.4.0 (#2764)
dependabot[bot] Aug 8, 2023
5c7a90f
Feat/backprop fct with multi args (#2766)
jdcpni Aug 9, 2023
693c336
[skip ci] (#2770)
jdcpni Aug 11, 2023
2c59d26
tests/Distance: Consolidate
jvesely Aug 8, 2023
28d3835
Functions/Distance: Do not exit early for for COSINE and CORRELATION …
jvesely Aug 8, 2023
ab973f2
llvm, Distance: Turn "NORMALIZE" into compiled parameter
jvesely Aug 8, 2023
071702f
llvm, Distance: Turn "NORMALIZE" into compiled parameter (#2772)
jvesely Aug 16, 2023
233a0ce
tests/TransferWithCosts: Add missing 'function' mark (#2773)
jvesely Aug 16, 2023
d2a72b9
tests: Add 'pytorch' mark to all 'PyTorch' execution mode variants (#…
jvesely Aug 17, 2023
7260d59
requirements: update grpcio requirement from <1.57.0 to <1.58.0 (#2768)
dependabot[bot] Aug 17, 2023
082040c
Feat/em composition new (#2771)
jdcpni Aug 17, 2023
ff5df04
Feat/integrators/integrator mech reset param (#2778)
jdcpni Aug 18, 2023
a615dc6
setup.cfg: Restore parallel execution of tests by default (#2780)
jvesely Aug 20, 2023
122acf9
composition: Remove incorrect warning (#2781)
jvesely Aug 20, 2023
0daed25
Feat/models/ego mdp (#2782)
jdcpni Aug 20, 2023
94af56d
tests/em_composition: Remove unused benchmark fixtures (#2783)
jvesely Aug 21, 2023
9aa16a1
ci, docs: Use Python 3.11 to generate online docs (#2785)
jvesely Aug 22, 2023
d0ba283
Feat/models/ego mdp (#2787)
jdcpni Aug 25, 2023
81df7b3
Feat/models/ego mdp (#2789)
jdcpni Aug 29, 2023
9edacc3
github-actions(deps): bump actions/checkout from 3 to 4 (#2794)
dependabot[bot] Sep 5, 2023
9c75155
requirements: update pytest requirement from <7.4.1 to <7.4.2 (#2793)
dependabot[bot] Sep 5, 2023
f4d0735
requirements: update pytest requirement from <7.4.2 to <7.4.3 (#2796)
dependabot[bot] Sep 8, 2023
6024762
requirements: update grpcio requirement from <1.58.0 to <1.59.0 (#2797)
dependabot[bot] Sep 10, 2023
f4cb9b4
Feat/learning nested (#2801)
jdcpni Sep 18, 2023
9bf3cae
Feat/learning nested (#2802)
jdcpni Sep 18, 2023
03a6193
requirements: update pandas requirement from <2.0.4 to <2.1.1 (#2792)
dependabot[bot] Sep 20, 2023
716046d
deps: Don't use onnxruntime==1.16 on python 3.11 (#2807)
jvesely Sep 26, 2023
893c3eb
requirements: update llvmlite requirement from <0.41 to <0.42 (#2806)
dependabot[bot] Sep 26, 2023
ca2a82e
requirements: update grpcio requirement from <1.59.0 to <1.60.0 (#2809)
dependabot[bot] Oct 4, 2023
c24135b
Feat/learn nested direct (#2812)
jdcpni Oct 11, 2023
3490214
requirements: update fastkde requirement (#2813)
dependabot[bot] Oct 16, 2023
c00173e
ci/codeql: Reduce disk space usage(#2817)
jvesely Oct 17, 2023
204ac0d
llvm: Add support for fp32 to printf helper (#2816)
jvesely Oct 17, 2023
c283c58
requirements: update pillow requirement from <10.1.0 to <10.2.0 (#2815)
dependabot[bot] Oct 17, 2023
1c74859
LogEntries: Do not store references to owner's owner (#2819)
jvesely Oct 19, 2023
aa71055
requirements: update networkx requirement from <3.2 to <3.3 (#2820)
dependabot[bot] Oct 20, 2023
16b8ff1
deps: Bump minimum version of modeci_mdf to 0.4.3
jvesely Oct 18, 2023
4f59709
deps: Bump minimum version of pytorch to 1.10.0
jvesely Oct 19, 2023
8160d4d
deps: Bump minimum version of numpy to 1.21.0
jvesely Oct 19, 2023
76eeef5
ci/ga: Add a CI run with version restricted dependencies
jvesely Oct 18, 2023
0d1865e
ci/github-actions: Add CI run using the lowest supported version of d…
jvesely Oct 20, 2023
9c827ff
requirements: update pytest requirement from <7.4.3 to <7.4.4 (#2822)
dependabot[bot] Oct 25, 2023
6bd555f
tests/MemoryFunctions: Use more accurate and descriptive expected res…
jvesely Oct 22, 2023
2e42c24
DictionaryMemory: Store key after applying noise
jvesely Oct 22, 2023
3f3c531
llvm, DictionaryMemory: Implement noise application to key before sto…
jvesely Oct 22, 2023
d863b30
llvm, DictionaryMemory: Apply 'rate' value before storing 'key'
jvesely Oct 22, 2023
c46c7b8
tests/MemoryFunctions: Add extra insertion to test 'duplicate_keys'
jvesely Oct 27, 2023
bc409f2
llvm, MemoryFunctions: Drop 'duplicate_keys' and 'previous_value' fro…
jvesely Oct 27, 2023
87fd1a9
llvm, MemoryFunctions: Implement, use or drop unused parameters (#2824)
jvesely Nov 3, 2023
688021c
Refactor/learning pathways using ports (#2827)
jdcpni Nov 4, 2023
4eb8b64
Fix/emcomposition learnable projections (#2828)
jdcpni Nov 5, 2023
8150aca
requirements: Update torch requirement from >=1.10.0,<2.1.0 to >=1.10…
jvesely Nov 6, 2023
0818baa
setup.cfg: Restore parallel execution of tests by default (#2831)
jvesely Nov 6, 2023
77557ad
requirements: update pandas requirement from <2.1.1 to <2.1.3 (#2823)
dependabot[bot] Nov 7, 2023
8bc8bf7
Feat/emcomposition/support storage function (#2833)
jdcpni Nov 10, 2023
ca7e9d7
Test/autodiff without torch (#2836)
jdcpni Nov 11, 2023
ddbaef1
requirements: update pandas requirement from <2.1.3 to <2.1.4 (#2835)
dependabot[bot] Nov 12, 2023
f2b8141
github-actions(deps): bump actions/github-script from 6 to 7 (#2841)
dependabot[bot] Nov 14, 2023
7a82b3e
requirements: update pytest-xdist requirement (#2840)
dependabot[bot] Nov 14, 2023
e32223a
tests/functions: Move test_Stability_squeezes_variable to test_stability
jvesely Oct 20, 2023
cca6031
Functions/Stability: Convert 'normalize' to FunctionParameter
jvesely Nov 12, 2023
b61f894
Functions/Stability: Convert 'normalize' to FunctionParameter (#2838)
jvesely Nov 14, 2023
a947643
Feat/log/nparray executions (#2844)
jdcpni Nov 15, 2023
8843a6c
SoftMax: Switch default one_hot_function to 'None' (#2837)
jvesely Nov 15, 2023
b46308c
broken_trans_deps: Add cattrs==23.2.{1,2} to broken deps list (#2849)
jvesely Nov 28, 2023
8293201
requirements: update pytest-xdist requirement (#2848)
dependabot[bot] Nov 28, 2023
01ecccb
ci/github-actions: Run the main CI job every day (#2850)
jvesely Nov 28, 2023
f7f91b6
llvm, TransferFunction: Remove stale comment
jvesely Nov 30, 2023
3ab96b0
llvm, TransferFunction: Assert that 'max' termination measure does no…
jvesely Nov 27, 2023
53078b5
llvm, Component: Drop 'initializer' from compiled parameters
jvesely Nov 27, 2023
6f9c9e8
llvm, Component: Drop OCM functions from compiled parameters
jvesely Nov 28, 2023
b85e8c2
llvm, Component: Drop 'sample' and 'target' from compiled parameters
jvesely Nov 28, 2023
a133e7a
llvm, Component: Drop 'search_space' from compiled parameters
jvesely Nov 28, 2023
3b3703e
llvm, Mechanism: Drop `_parameter_ports' from compiled structures if …
jvesely Nov 28, 2023
fae7d5c
llvm, Component: Drop 'integrator_function' from compiled structures …
jvesely Nov 30, 2023
cf29608
llvm, Component: Drop 'random_state' from DDM's compiled state if it'…
jvesely Dec 2, 2023
e9dc9af
llvm, Component: Use 'add' to insert single element to a set
jvesely Dec 2, 2023
06a9495
llvm, Component: Drop unused cost functions from compiled structures
jvesely Dec 2, 2023
354b065
llvm, Function, Mechanism: Track used parameters and state
jvesely Nov 16, 2023
62c7084
llvm: Minimize and track parameters used in compiled structures (#285)
jvesely Dec 5, 2023
cf2ab2f
Graph: store cycle_vertices as list of cycles
kmantel Dec 1, 2023
8496390
Composition: node roles: determine INTERNAL by not being INPUT/OUTPUT
kmantel Nov 18, 2023
cefe9a1
Composition: node roles: split use of comp graph and scheduler graph
kmantel Nov 10, 2023
29790e8
Merge pull request #2853 from kmantel/noderoles
kmantel Dec 7, 2023
68aa99b
Composition: correct rebuilding scheduler on graph change (#2856)
kmantel Dec 8, 2023
a6631bd
github-actions(deps): bump actions/setup-python from 4 to 5 (#2854)
dependabot[bot] Dec 9, 2023
9123666
requirements: update pandas requirement from <2.1.4 to <2.1.5 (#2857)
dependabot[bot] Dec 9, 2023
b7cf26c
Models/ego/use emcomposition (#2861)
jdcpni Dec 12, 2023
70ae5c4
Merge master into devel (#2860)
kmantel Dec 13, 2023
80e2586
Merge master into devel
kmantel Dec 13, 2023
1b49504
Merge pull request #2862 from kmantel/master-devel
kmantel Dec 14, 2023
1a880a6
condition: correct Condition class mro dependencies
kmantel Sep 2, 2023
5cfbc78
scheduling: handle empty graph-scheduler object docstring
kmantel Dec 15, 2023
647bee7
Scheduler: use ConditionSet to store user-specified conds
kmantel Nov 20, 2023
ecb1d59
utilities: add toposort_key
kmantel Sep 2, 2023
1869c2e
condition: support graph-scheduler graph structure conditions
kmantel Aug 5, 2023
a38768d
Merge pull request #2864 from kmantel/structural-conditions
kmantel Dec 15, 2023
5a21b89
github-actions(deps): bump github/codeql-action from 2 to 3 (#2863)
dependabot[bot] Dec 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
llvm/Component: Do not include read-only parameters with custom gette…
…rs in compiled parametrrs

The only provide user interaction, similar to Shared and Function
parameters.

Signed-off-by: Jan Vesely <[email protected]>
  • Loading branch information
jvesely committed Aug 7, 2023
commit 0398894288e84b6e824525fa24d3c453bf59de33
11 changes: 10 additions & 1 deletion psyneulink/core/components/component.py
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,16 @@ def _get_compilation_params(self):
blacklist.update(['combination_function'])

def _is_compilation_param(p):
if p.name not in blacklist and not isinstance(p, (ParameterAlias, SharedParameter)):
def _is_user_only_param(p):
if p.read_only and p.getter is not None:
return True
if isinstance(p, (ParameterAlias, SharedParameter)):
return True

return False


if p.name not in blacklist and not _is_user_only_param(p):
# FIXME: this should use defaults
val = p.get()
# Check if the value type is valid for compilation
Expand Down