8000 Expose PolicyFactory into Pythia import. by copybara-service[bot] · Pull Request #905 · google/vizier · GitHub
[go: up one dir, main page]
Skip to content

Expose PolicyFactory into Pythia import. #905

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.

Sign up for GitHub

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

Merged
copybara-service merged 1 commit into from
Sep 9, 2023
Merged

Expose PolicyFactory into Pythia import. #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions vizier/_src/pyglove/oss_vizier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from vizier._src.pyglove import converters
from vizier._src.service import clients as pyvizier_clients
from vizier._src.service import constants
from vizier._src.service import policy_factory as policy_factory_lib
from vizier._src.service import policy_factory as service_policy_factory_lib
from vizier._src.service import pythia_service
from vizier._src.service import pythia_service_pb2_grpc
from vizier._src.service import resources
Expand All @@ -53,7 +53,7 @@
StudyKey = client.StudyKey


class PyGlovePolicyFactory(policy_factory_lib.PolicyFactory):
class PyGlovePolicyFactory(pythia.PolicyFactory):
"""PolicyFactory for OSSVizierTuner."""

def __init__(self, policy_cache: PolicyCache):
Expand All @@ -76,7 +76,9 @@ def __call__(
logging.info(
'StudyKey %s was not found in cache. Using default policy factory.'
)
return policy_factory_lib.DefaultPolicyFactory()(

default_policy_factory = service_policy_factory_lib.DefaultPolicyFactory()
return default_policy_factory(
problem_statement, algorithm, policy_supporter, study_name
)

Expand Down
35 changes: 35 additions & 0 deletions vizier/_src/pythia/policy_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright 2023 Google LLC.
#
# 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.

from __future__ import annotations

"""Policy Factory API."""
from typing import Protocol

from vizier import pyvizier as vz
from vizier._src.pythia import policy
from vizier._src.pythia import policy_supporter as policy_supporter_lib


class PolicyFactory(Protocol):
"""Protocol (PEP-544) for a Policy Factory."""

def __call__(
self,
problem_statement: vz.ProblemStatement,
algorithm: str,
policy_supporter: policy_supporter_lib.PolicySupporter,
study_name: str,
) -> policy.Policy:
"""Creates a Pythia Policy."""
22 changes: 4 additions & 18 deletions vizier/_src/service/policy_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,18 @@

from __future__ import annotations

"""Policy Factory API."""
"""Service-related policy factories."""
# pylint:disable=g-import-not-at-top
import functools
import time
from typing import Protocol

from vizier import pythia
from vizier import pyvizier as vz
from vizier._src.algorithms.policies import designer_policy as dp
from vizier.service import pyvizier as vz


class PolicyFactory(Protocol):
"""Protocol (PEP-544) for a Policy Factory."""

def __call__(
self,
problem_statement: vz.ProblemStatement,
algorithm: str,
policy_supporter: pythia.PolicySupporter,
study_name: str,
) -> pythia.Policy:
"""Creates a Pythia Policy."""


class DefaultPolicyFactory(PolicyFactory):
"""Default Policy Factory used in Pythia."""
class DefaultPolicyFactory(pythia.PolicyFactory):
"""Default Policy Factory used in Pythia service."""

def __call__(
self,
Expand Down
7 changes: 4 additions & 3 deletions vizier/_src/service/pythia_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
from absl import logging
import attr
import grpc
from vizier._src.service import policy_factory as policy_factory_lib
from vizier import pythia
from vizier._src.service import policy_factory as service_policy_factory
from vizier._src.service import pythia_service_pb2
from vizier._src.service import pythia_service_pb2_grpc
from vizier._src.service import service_policy_supporter
Expand All @@ -42,8 +43,8 @@ class PythiaServicer(pythia_service_pb2_grpc.PythiaServiceServicer):
)
# Factory for creating policies. Defaulted to OSS Vizier-specific policies,
# but allows use of external package (e.g. PyGlove) poliices.
_policy_factory: policy_factory_lib.PolicyFactory = attr.field(
init=True, factory=policy_factory_lib.DefaultPolicyFactory
_policy_factory: pythia.PolicyFactory = attr.field(
init=True, factory=service_policy_factory.DefaultPolicyFactory
)

def __attrs_post_init__(self):
Expand Down
10 changes: 6 additions & 4 deletions vizier/_src/service/vizier_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
import attr
import grpc
import portpicker

from vizier import pythia
from vizier._src.service import constants
from vizier._src.service import datastore
from vizier._src.service import policy_factory as policy_factory_lib
from vizier._src.service import policy_factory as service_policy_factory_lib
from vizier._src.service import pythia_service
from vizier._src.service import pythia_service_pb2_grpc
from vizier._src.service import stubs_util
Expand All @@ -51,8 +51,10 @@ class DefaultVizierServer:
_database_url: str = attr.fie 8000 ld(
init=True, default=constants.SQL_LOCAL_URL, kw_only=True
)
_policy_factory: policy_factory_lib.PolicyFactory = attr.field(
init=True, factory=policy_factory_lib.DefaultPolicyFactory, kw_only=True
_policy_factory: pythia.PolicyFactory = attr.field(
init=True,
factory=service_policy_factory_lib.DefaultPolicyFactory,
kw_only=True,
)
_early_stop_recycle_period: datetime.timedelta = attr.field(
init=True, default=datetime.timedelta(seconds=0.1), kw_only=True
Expand Down
1 change: 1 addition & 0 deletions vizier/pythia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from vizier._src.pythia.policy import Policy
from vizier._src.pythia.policy import SuggestDecision
from vizier._src.pythia.policy import SuggestRequest
from vizier._src.pythia.policy_factory import PolicyFactory
from vizier._src.pythia.policy_supporter import PolicySupporter
from vizier._src.pythia.pythia_errors import CancelComputeError
from vizier._src.pythia.pythia_errors import InactivateStudyError
Expand Down
0