Merge pull request #1694 from PrincetonUniversity/devel

Devel
PrincetonUniversity · Jun 30, 2020 · 186ba7e · 186ba7e
2 parents f03564f + b2af558
commit 186ba7e
Show file tree

Hide file tree

Showing 28 changed files with 681 additions and 457 deletions.
diff --git a/docs/source/Component.rst b/docs/source/Component.rst
@@ -1,27 +1,30 @@
 Component
 =========
+.. container:: subclasses
 
-*Subclasses:*
+    *Subclasses*
 
-.. toctree::
-   :maxdepth: 1
+    .. toctree::
+       :maxdepth: 1
 
-   Mechanisms <Mechanism>
-   Projections <Projection>
-   Ports <Port>
-   Functions <Functions>
+       Mechanisms <Mechanism>
+       Projections <Projection>
+       Ports <Port>
+       Functions <Functions>
+    |
 
-|
-*Related*
+.. container:: related
 
-.. toctree::
-   :maxdepth: 1
+    *Related*
+
+    .. toctree::
+       :maxdepth: 1
+
+       Parameters
+       Log
+       Registry
+       Preferences
 
-   Parameters
-   Log
-   Registry
-   Preferences
-|
 .. automodule:: psyneulink.core.components.component
    :members:
    :private-members:

diff --git a/docs/source/Composition.rst b/docs/source/Composition.rst
@@ -1,25 +1,30 @@
 Composition
 ===========
 
-*Subclasses*
+.. container:: subclasses
 
-.. toctree::
-   :maxdepth: 1
+    *Subclasses*
 
-   AutodiffComposition
-   CompositionFunctionApproximator
-|
-*Related*
+    .. toctree::
+       :maxdepth: 1
 
-* `NodeRoles <NodeRole>`
+       AutodiffComposition
+       CompositionFunctionApproximator
+    |
 
-.. toctree::
-   :maxdepth: 1
+.. container:: related
+
+    *Related*
+
+    * `NodeRoles <NodeRole>`
+
+    .. toctree::
+       :maxdepth: 1
+
+       Pathway
+       Scheduling
+       Visualization
 
-   Pathway
-   Scheduling
-   Visualization
-|
 .. automodule:: psyneulink.core.compositions.composition
    :members: Composition, NodeRole
    :private-members:

diff --git a/docs/source/CompositionFunctionApproximator.rst b/docs/source/CompositionFunctionApproximator.rst
@@ -1,12 +1,15 @@
 CompositionFunctionApproximator
 ===============================
 
-*Subclasses*
 
-.. toctree::
-   :maxdepth: 1
+.. container:: subclasses
+
+    *Subclasses*
+
+    .. toctree::
+       :maxdepth: 1
 
-   RegressionCFA
+       RegressionCFA
 
 .. toctree::
    :maxdepth: 2

diff --git a/docs/source/ControlMechanism.rst b/docs/source/ControlMechanism.rst
@@ -3,13 +3,15 @@ ControlMechanism
 
 .. _ControlMechanism_Subtypes:
 
-*Subclasses*
+.. container:: subclasses
 
-.. toctree::
-   :maxdepth: 1
+    *Subclasses*
 
-   GatingMechanism
-   OptimzationControlMechanism
+    .. toctree::
+       :maxdepth: 1
+
+       GatingMechanism
+       OptimizationControlMechanism
 
 .. automodule:: psyneulink.core.components.mechanisms.modulatory.control.controlmechanism
    :members:

diff --git a/docs/source/Mechanism.rst b/docs/source/Mechanism.rst
@@ -1,21 +1,26 @@
 Mechanism
 =========
 
-*Subclasses:*
+.. container:: subclasses
 
-.. toctree::
-   :maxdepth: 1
+    *Subclasses*
 
-   ProcessingMechanism
-   ModulatoryMechanism
-|
-*Related*
+    .. toctree::
+       :maxdepth: 1
 
-.. toctree::
-   :maxdepth: 1
+       ProcessingMechanism
+       ModulatoryMechanism
+    |
+
+.. container:: related
+
+    *Related*
+
+    .. toctree::
+       :maxdepth: 1
+
+       Port
 
-   Port
-|
 .. automodule:: psyneulink.core.components.mechanisms.mechanism
    :members:
    :private-members:

diff --git a/docs/source/Mechanisms.rst b/docs/source/Mechanisms.rst
@@ -4,6 +4,7 @@ Mechanisms
 .. toctree::
    :maxdepth: 3
 
-   *Subclasses:*
+.. container:: subclasses
+   *Subclasses*
    ProcessingMechanisms
    ModulatoryMechanisms
diff --git a/docs/source/ModulatoryMechanism.rst b/docs/source/ModulatoryMechanism.rst
@@ -3,13 +3,15 @@ ModulatoryMechanism
 
 .. _ModulatoryMechanism_Subtypes:
 
-*Subclasses*
+.. container:: subclasses
 
-.. toctree::
-   :maxdepth: 1
+    *Subclasses*
 
-   ControlMechanism
-   LearningMechanism
+    .. toctree::
+       :maxdepth: 1
+
+       ControlMechanism
+       LearningMechanism
 
 .. automodule:: psyneulink.core.components.mechanisms.modulatory.modulatorymechanism
    :members:

diff --git a/docs/source/ModulatoryProjection.rst b/docs/source/ModulatoryProjection.rst
@@ -3,14 +3,16 @@ ModulatoryProjection
 
 .. _ModulatoryProjection_Subtypes:
 
-*Subclasses*
+.. container:: subclasses
 
-.. toctree::
-   :maxdepth: 1
+    *Subclasses*
 
-   LearningProjection
-   ControlProjection
-   GatingProjection
+    .. toctree::
+       :maxdepth: 1
+
+       LearningProjection
+       ControlProjection
+       GatingProjection
 
 .. automodule:: psyneulink.core.components.projections.modulatory.modulatoryprojection
    :members: ModulatoryProjection_Base

diff --git a/docs/source/ModulatorySignal.rst b/docs/source/ModulatorySignal.rst
@@ -3,17 +3,18 @@ ModulatorySignal
 
 .. _ModulatorySignal_Subtypes:
 
-*Subclasses*
+.. container:: subclasses
+    *Subclasses*
 
-.. toctree::
-   :maxdepth: 1
+    .. toctree::
+       :maxdepth: 1
 
-   LearningSignal
-   ControlSignal
-   GatingSignal
+       LearningSignal
+       ControlSignal
+       GatingSignal
 
-.. toctree::
-   :maxdepth: 3
+    .. toctree::
+       :maxdepth: 3
 
 .. automodule:: psyneulink.core.components.ports.modulatorysignals.modulatorysignal
    :members:

diff --git a/docs/source/PathwayProjection.rst b/docs/source/PathwayProjection.rst
@@ -1,14 +1,16 @@
 PathwayProjection
 =================
 
-*Subclasses:*
+.. container:: subclasses
 
-.. toctree::
-   :maxdepth: 1
+    *Subclasses*
 
-   MappingProjection
-   MaskedMappingProjection
-   AutoAssociativeProjection
+    .. toctree::
+       :maxdepth: 1
+
+       MappingProjection
+       MaskedMappingProjection
+       AutoAssociativeProjection
 
 .. automodule:: psyneulink.core.components.projections.pathway.pathwayprojection
    :members:

diff --git a/docs/source/PathwayProjections.rst b/docs/source/PathwayProjections.rst
@@ -6,7 +6,9 @@ PathwayProjections
 .. toctree::
    :maxdepth: 1
 
-   *Subclasses:*
-   MappingProjection
-   MaskedMappingProjection
-   AutoAssociativeProjection
+.. container:: subclasses
+
+       *Subclasses*
+       MappingProjection
+       MaskedMappingProjection
+       AutoAssociativeProjection
diff --git a/docs/source/Port.rst b/docs/source/Port.rst
@@ -2,16 +2,17 @@ Port
 ====
 
 .. _Port_Subtypes:
+.. container:: subclasses
 
-*Subclasses:*
+    *Subclasses*
 
-.. toctree::
-   :maxdepth: 1
+    .. toctree::
+       :maxdepth: 1
 
-   InputPort
-   ParameterPort
-   OutputPort
-   ModulatorySignal
+       InputPort
+       ParameterPort
+       OutputPort
+       ModulatorySignal
 
 .. automodule:: psyneulink.core.components.ports.port
    :members:

diff --git a/docs/source/ProcessingMechanism.rst b/docs/source/ProcessingMechanism.rst
@@ -3,14 +3,16 @@ ProcessingMechanism
 
 .. _ProcessingMechanism_Subtypes:
 
-*Subclasses*
+.. container:: subclasses
 
-.. toctree::
-   :maxdepth: 1
+    *Subclasses*
 
-   TransferMechanism
-   IntegratorMechanism
-   ObjectiveMechanism
+    .. toctree::
+       :maxdepth: 1
+
+       TransferMechanism
+       IntegratorMechanism
+       ObjectiveMechanism
 
 .. automodule:: psyneulink.core.components.mechanisms.processing.processingmechanism
    :members:

diff --git a/docs/source/Projection.rst b/docs/source/Projection.rst
@@ -1,13 +1,14 @@
 Projection
 ==========
 
-*Subclasses:*
+.. container:: subclasses
+    *Subclasses*
 
-.. toctree::
-   :maxdepth: 1
+    .. toctree::
+       :maxdepth: 1
 
-   PathwayProjection
-   ModulatoryProjection
+       PathwayProjection
+       ModulatoryProjection
 
 .. automodule:: psyneulink.core.components.projections.projection
    :members:

diff --git a/psyneulink/core/components/component.py b/psyneulink/core/components/component.py
@@ -1396,10 +1396,8 @@ def _gen_llvm_function(self, *, ctx:pnlvm.LLVMBuilderContext,
                 p.attributes.add('noalias')
 
         if "reset" in tags:
-            builder = self._gen_llvm_function_reset(ctx, builder,
-                                                           params, state,
-                                                           arg_in, arg_out,
-                                                           tags=tags)
+            builder = self._gen_llvm_function_reset(ctx, builder, params, state,
+                                                    arg_in, arg_out, tags=tags)
         else:
             builder = self._gen_llvm_function_body(ctx, builder, params, state,
                                                    arg_in, arg_out, tags=tags)