dwavesystems · randomir · Jan 7, 2022 · Jan 7, 2022 · Jan 7, 2022
diff --git a/docs/reference/composers.rst b/docs/reference/composers.rst
@@ -9,10 +9,25 @@ Composers
 Class
 =====
 
+Subsample to Sample Composers
+-----------------------------
+
 .. autoclass:: IdentityComposer
 .. autoclass:: SplatComposer
+
+Sample Processors
+-----------------
+
 .. autoclass:: GreedyPathMerge
+.. autoclass:: IsoenergeticClusterMove
+
+Primitive Sample Operations
+---------------------------
 
+.. autoclass:: AggregatedSamples
+.. autoclass:: ExplodeSamples
+.. autoclass:: MergeSamples
+.. autoclass:: SliceSamples
 
 .. _composers-examples:
 

diff --git a/docs/reference/core.rst b/docs/reference/core.rst
@@ -11,10 +11,10 @@ Basic building-block classes and superclasses for hybrid workflows.
 Classes
 =======
 
-.. autoclass:: Present
-.. autoclass:: Runnable
 .. autoclass:: State
 .. autoclass:: States
+.. autoclass:: SampleSet
+.. autoclass:: Runnable
 
 
 Properties
@@ -40,6 +40,17 @@ Methods
    Runnable.next
    Runnable.run
    Runnable.stop
+   SampleSet.empty
+   SampleSet.hstack
+   SampleSet.vstack
+   State.copy
    State.updated
+   State.result
+   State.from_problem
+   State.from_subproblem
    State.from_sample
    State.from_samples
+   State.from_subsample
+   State.from_subsamples
+   States.first
+   States.updated
diff --git a/docs/reference/flow.rst b/docs/reference/flow.rst
@@ -8,6 +8,7 @@ Classes that structure (hybrid) workflows.
 
 .. automodule:: hybrid.flow
 
+
 Classes
 =======
 
@@ -19,6 +20,7 @@ Classes
 .. autoclass:: Identity
 .. autoclass:: BlockingIdentity
 .. autoclass:: Lambda
+.. autoclass:: Log
 .. autoclass:: Loop
 .. autoclass:: LoopUntilNoImprovement
 .. autoclass:: LoopWhileNoImprovement

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
@@ -7,11 +7,12 @@ Reference Documentation
    :maxdepth: 2
 
    core
+   flow
    samplers
    composers
    decomposers
-   flow
    utilities
+   profiling
    conversion
    traits
    exceptions

diff --git a/docs/reference/profiling.rst b/docs/reference/profiling.rst
@@ -0,0 +1,35 @@
+.. _profiling_hybrid:
+
+=========
+Profiling
+=========
+
+Workflow inspection and profiling utilities.
+
+.. automodule:: hybrid.profiling
+
+
+Decorators
+==========
+
+.. currentmodule:: hybrid.profiling
+
+.. autosummary::
+   :toctree: generated/
+
+   make_count
+   make_timeit
+   tictoc
+   trace
+
+
+Methods
+=======
+
+.. currentmodule:: hybrid.profiling
+
+.. autosummary::
+   :toctree: generated/
+
+   print_structure
+   print_counters
diff --git a/docs/reference/samplers.rst b/docs/reference/samplers.rst
@@ -9,18 +9,33 @@ Samplers
 Classes
 =======
 
-.. autoclass:: InterruptableTabuSampler
-.. autoclass:: QPUSubproblemExternalEmbeddingSampler
+QPU Samplers and Embedders
+--------------------------
+
 .. autoclass:: QPUSubproblemAutoEmbeddingSampler
-.. autoclass:: RandomSubproblemSampler
+.. autoclass:: QPUSubproblemExternalEmbeddingSampler
 .. autoclass:: ReverseAnnealingAutoEmbeddingSampler
+.. autoclass:: SubproblemCliqueEmbedder
+
+Classical Samplers
+------------------
+
+.. autoclass:: RandomSubproblemSampler
 .. autoclass:: SimulatedAnnealingProblemSampler
 .. autoclass:: SimulatedAnnealingSubproblemSampler
 .. autoclass:: SteepestDescentProblemSampler
 .. autoclass:: SteepestDescentSubproblemSampler
 .. autoclass:: TabuProblemSampler
 .. autoclass:: TabuSubproblemSampler
 
+Interruptable Variants
+~~~~~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: InterruptableTabuSampler
+.. autoclass:: InterruptableSimulatedAnnealingProblemSampler
+.. autoclass:: InterruptableSimulatedAnnealingSubproblemSampler
+
+
 .. _samplers-examples:
 
 Examples

diff --git a/docs/reference/utilities.rst b/docs/reference/utilities.rst
@@ -6,6 +6,18 @@ Utilities
 
 .. automodule:: hybrid.utils
 
+
+Decorators
+==========
+
+.. currentmodule:: hybrid.core
+
+.. autosummary::
+   :toctree: generated/
+
+   stoppable
+
+
 Methods
 =======
 
@@ -14,11 +26,14 @@ Methods
 .. autosummary::
    :toctree: generated/
 
+   bqm_density
    bqm_edges_between_variables
    bqm_induced_by
    bqm_reduced_to
    chimera_tiles
+   cpu_count
    flip_energy_gains
+   hstack_samplesets
    max_sample
    min_sample
    random_sample
@@ -28,3 +43,16 @@ Methods
    select_localsearch_adversaries
    select_random_subgraph
    updated_sample
+   vstack_samplesets
+
+
+Classes
+=======
+
+.. currentmodule:: hybrid.utils
+
+.. autosummary::
+   :toctree: generated/
+
+   NumpyEncoder
+   OceanEncoder
diff --git a/hybrid/core.py b/hybrid/core.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-import operator
 import logging
 import threading
 from collections import namedtuple, defaultdict

diff --git a/hybrid/profiling.py b/hybrid/profiling.py
@@ -18,7 +18,7 @@
 import logging
 import functools
 
-__all__ = ['perf_counter', 'tictoc', 'print_structure', 'print_counters']
+__all__ = ['perf_counter', 'tictoc', 'trace', 'print_structure', 'print_counters']
 
 logger = logging.getLogger(__name__)
 
@@ -33,7 +33,8 @@
 class tictoc(object):
     """Instrument and log function execution duration.
 
-    Examples:
+    Examples::
+
         @tictoc('function', loglevel=logging.INFO)
         def f(x, y):
             a = x * y
@@ -101,7 +102,8 @@ class make_count(object):
     Args:
         counters (dict): Counters storage.
 
-    Example:
+    Example::
+
         counters = {}
         count = make_count(counters)
 
@@ -132,7 +134,8 @@ class make_timeit(object):
     Args:
         timers (dict): Timers storage.
 
-    Example:
+    Example::
+
         timers = {}
         timeit = make_timeit(timers)