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 #1721

Merged
merged 34 commits into from
Jul 20, 2020
Merged

Devel #1721

merged 34 commits into from
Jul 20, 2020

Conversation

dillontsmith
Copy link
Collaborator

No description provided.

kmantel and others added 28 commits July 13, 2020 21:35
Useful for pytest calls because pyplot plots are blocking
Update and test models in library/documentation
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Cleanup imports
Prefer top-level global imports to local ones.
Do not expose pytorchmodelcreator.
Include psyneulink/library/models in code coverage reports
…ng file contents

Works with coverage tracking.
Revert changes to sys.argv.
Use returned globals directly.

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Enable codestyle check
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
…contents (#1712)

Works with coverage tracking.
Revert changes to sys.argv.
Use the returned globals directory directly.
Reenable custom css file and remove obsolete style rules from old theme
tests/autodiff: Reduce number of epochs on semantic net correctness
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
@dillontsmith dillontsmith requested a review from SamKG July 20, 2020 12:50
@coveralls
Copy link

coveralls commented Jul 20, 2020

Coverage Status

Coverage increased (+0.05%) to 82.371% when pulling 9124c03 on devel into 0374dca on master.

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jul 20, 2020

This pull request introduces 2 alerts and fixes 70 when merging 29a4325 into 0374dca - view on LGTM.com

new alerts:

  • 2 for Module is imported with 'import' and 'import from'

fixed alerts:

  • 50 for Unused import
  • 11 for Use of the return value of a procedure
  • 6 for Module is imported more than once
  • 3 for Module is imported with 'import' and 'import from'

dillontsmith and others added 6 commits July 20, 2020 13:31
partial init
    - projections in components' aux_components no longer need to be valid for a given Composition at the time that they're added to a Composition
    - added method that attempts to finish instantiation of non-fully instantiated nodes, which is called in _analyze_graph
    - a warning is now emitted at runtime if any nodes are not fully instantiated including all of their aux_projections

deep nesting
    - modulatory and pathway projections can now be added for ports that are separate by more than one level of nesting. the projections are routed through intermediary CIMs

showgraph
    - fixed several bugs that were previously causing incorrect rendering in show graph for compositions with two or more levels of nested compositions
@dillontsmith dillontsmith merged commit 16e9407 into master Jul 20, 2020
@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jul 20, 2020

This pull request introduces 2 alerts and fixes 70 when merging 9124c03 into 0374dca - view on LGTM.com

new alerts:

  • 2 for Module is imported with 'import' and 'import from'

fixed alerts:

  • 50 for Unused import
  • 11 for Use of the return value of a procedure
  • 6 for Module is imported more than once
  • 3 for Module is imported with 'import' and 'import from'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants