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

Add dwave.samplers and dwave.composite namespace #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions dwave/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright 2018 D-Wave Systems Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ================================================================================================
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)
36 changes: 36 additions & 0 deletions dwave/composites/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Copyright 2018 D-Wave Systems Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ================================================================================================
"""
A unified namespace for :class:`dimod.Composite`s.

This namespace is populated by entry points. To contribute a composite, you
must identify it in your setup.py file like so.

.. code-block:: python

entry_points = {'dwave.composites': ['YourComposite = import.path.to.composite:YourComposite']}

setup(
entry_points=entry_points,
...
)

"""
from pkg_resources import iter_entry_points

# add the composites to the module from entrypoints, name conflicts override
globals().update((ep.name, ep.load()) for ep in iter_entry_points('dwave.composites'))
del iter_entry_points # remove from namespace
36 changes: 36 additions & 0 deletions dwave/samplers/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Copyright 2018 D-Wave Systems Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ================================================================================================
"""
A unified namespace for :class:`dimod.Sampler`s.

This namespace is populated by entry points. To contribute a sampler, you
must identify it in your setup.py file like so.

.. code-block:: python

entry_points = {'dwave.samplers': ['YourSampler = import.path.to.sampler:YourSampler']}

setup(
entry_points=entry_points,
...
)

"""
from pkg_resources import iter_entry_points

# add the samplers to the module from entrypoints, name conflicts override
globals().update((ep.name, ep.load()) for ep in iter_entry_points('dwave.samplers'))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, since now we have samplers in Hybrid as well, maybe we want to differentiate those from dimod samplers?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like:

dwave.dimod.samplers
dwave.hybrid.samplers

Or think of a way to reconciliate the two. Same goes for dwave.composites.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about

dwave.samplers
dwave.composites
dwave.runnables  # this could be further subdivided

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't love it, but it could work.

On a somewhat related note, I'm getting fond of from dwave import dimod, hybrid.

Copy link
Member Author

@arcondello arcondello Nov 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you proposing making dimod and hybrid into namespace packages? That would be easy to do, but at some point it would make sense to just make them all into a monolith package.

Or do you mean like the above where just the samplers/composites are present? I think it would be extremely confusing for from dwave import hybrid, dimod to contain different contents/structure than import hybrid, dimod.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The former. I'm toying with the idea.

del iter_entry_points # remove from namespace
10 changes: 9 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
# ================================================================================================
from __future__ import absolute_import

import os
import sys

from setuptools import setup

_PY2 = sys.version_info.major == 2
Expand All @@ -27,6 +29,8 @@
else:
exec(open("./dwaveoceansdk/package_info.py").read())

os.chdir(os.path.dirname(os.path.abspath(__file__)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why do you need this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea, probably don't


install_requires = [
'dwave-networkx>=0.6.1,<0.7.0',
'dwave-system>=0.5.0,<0.6.0',
Expand All @@ -43,7 +47,11 @@
]
}

packages = ['dwaveoceansdk']
packages = ['dwaveoceansdk',
'dwave',
'dwave.samplers',
'dwave.composites',
]

classifiers = [
'License :: OSI Approved :: Apache Software License',
Expand Down
9 changes: 9 additions & 0 deletions tests/test_entry_points.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import unittest


class Test_dwave_samplers(unittest.TestCase):
pass


class Test_dwave_composites(unittest.TestCase):
pass