Skip to content

Commit 3524d29

Browse files
xingyousongcopybara-github
authored andcommitted
Upgrade to Py3.12 and fix tests
PiperOrigin-RevId: 721981221
1 parent 615bb2a commit 3524d29

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

.github/workflows/pypi-publish-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v4
1919
with:
20-
python-version: '3.11'
20+
python-version: '3.12'
2121
- name: Install dependencies
2222
# NOTE: grpcio-tools needs to be periodically updated to support later Python versions.
2323
run: |

.github/workflows/pypi-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Python
1616
uses: actions/setup-python@v4
1717
with:
18-
python-version: '3.11'
18+
python-version: '3.12'
1919
- name: Install dependencies
2020
# NOTE: grpcio-tools needs to be periodically updated to support later Python versions.
2121
run: |

vizier/_src/service/performance_test.py

+7-17
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import multiprocessing.pool
2020
import time
21-
from absl import logging
2221

23-
from vizier._src.service import constants
22+
from absl import logging
23+
# from vizier._src.service import constants
2424
from vizier._src.service import vizier_client
2525
from vizier._src.service import vizier_server
2626
from vizier.benchmarks import experimenters
@@ -36,28 +36,18 @@ class PerformanceTest(parameterized.TestCase):
3636
@classmethod
3737
def setUpClass(cls):
3838
super().setUpClass()
39-
cls.server = vizier_server.DefaultVizierServer(
40-
database_url=constants.SQL_MEMORY_URL
41-
)
39+
cls.server = vizier_server.DefaultVizierServer(database_url=None)
4240
vizier_client.environment_variables.server_endpoint = cls.server.endpoint
4341

44-
@parameterized.parameters(
45-
(1, 10, 2),
46-
(2, 10, 2),
47-
(10, 10, 2),
48-
(50, 5, 2),
49-
(100, 5, 2),
50-
)
42+
@parameterized.parameters((1, 10), (2, 10), (10, 10), (50, 5), (100, 5))
5143
def test_multiple_clients_basic(
52-
self, num_simultaneous_clients, num_trials_per_client, dimension
44+
self, num_simultaneous_clients, num_trials_per_client
5345
):
5446
def fn(client_id: int):
55-
experimenter = experimenters.BBOBExperimenterFactory(
56-
'Sphere', dimension
57-
)()
47+
experimenter = experimenters.BBOBExperimenterFactory('Sphere', 2)()
5848
problem_statement = experimenter.problem_statement()
5949
study_config = pyvizier.StudyConfig.from_problem(problem_statement)
60-
study_config.algorithm = pyvizier.Algorithm.NSGA2
50+
study_config.algorithm = pyvizier.Algorithm.RANDOM_SEARCH
6151

6252
client = vizier_client.create_or_load_study(
6353
owner_id='my_username',

vizier/_src/service/vizier_server.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from concurrent import futures
2323
import datetime
2424
import time
25+
from typing import Optional
2526

2627
import attr
2728
import grpc
@@ -48,7 +49,9 @@ class DefaultVizierServer:
4849
"""
4950

5051
_host: str = attr.field(default='localhost')
51-
_database_url: str = attr.field(default=constants.SQL_LOCAL_URL, kw_only=True)
52+
_database_url: Optional[str] = attr.field(
53+
default=constants.SQL_LOCAL_URL, kw_only=True
54+
)
5255
_policy_factory: pythia.PolicyFactory = attr.field(
5356
factory=service_policy_factory_lib.DefaultPolicyFactory, kw_only=True
5457
)

0 commit comments

Comments
 (0)