Skip to content
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
3 changes: 1 addition & 2 deletions kubeflow/optimizer/api/optimizer_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

from kubeflow.common.types import KubernetesBackendConfig
from kubeflow.optimizer.backends.kubernetes.backend import KubernetesBackend
from kubeflow.optimizer.constants import constants
from kubeflow.optimizer.types.algorithm_types import BaseAlgorithm
from kubeflow.optimizer.types.optimization_types import (
Objective,
Expand Down Expand Up @@ -182,7 +181,7 @@ def get_best_results(self, name: str) -> Result | None:
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.OPTIMIZATION_JOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 3600,
polling_interval: int = 2,
callbacks: list[Callable[[OptimizationJob], None]] | None = None,
Expand Down
3 changes: 1 addition & 2 deletions kubeflow/optimizer/backends/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from collections.abc import Callable, Iterator
from typing import Any

from kubeflow.optimizer.constants import constants
from kubeflow.optimizer.types.algorithm_types import RandomSearch
from kubeflow.optimizer.types.optimization_types import (
Objective,
Expand Down Expand Up @@ -65,7 +64,7 @@ def get_best_results(self, name: str) -> Result | None:
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.OPTIMIZATION_JOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 3600,
polling_interval: int = 2,
callbacks: list[Callable[[OptimizationJob], None]] | None = None,
Expand Down
5 changes: 4 additions & 1 deletion kubeflow/optimizer/backends/kubernetes/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,14 @@ def get_best_results(self, name: str) -> Result | None:
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.OPTIMIZATION_JOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 3600,
polling_interval: int = 2,
callbacks: list[Callable[[OptimizationJob], None]] | None = None,
) -> OptimizationJob:
if status is None:
status = {constants.OPTIMIZATION_JOB_COMPLETE}

job_statuses = {
constants.OPTIMIZATION_JOB_CREATED,
constants.OPTIMIZATION_JOB_RUNNING,
Expand Down
2 changes: 1 addition & 1 deletion kubeflow/trainer/api/trainer_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def get_job_events(self, name: str) -> list[types.Event]:
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.TRAINJOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 600,
polling_interval: int = 2,
callbacks: list[Callable[[types.TrainJob], None]] | None = None,
Expand Down
2 changes: 1 addition & 1 deletion kubeflow/trainer/backends/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def get_job_events(self, name: str) -> list[types.Event]:
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.TRAINJOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 600,
polling_interval: int = 2,
callbacks: list[Callable[[types.TrainJob], None]] | None = None,
Expand Down
5 changes: 4 additions & 1 deletion kubeflow/trainer/backends/container/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -803,13 +803,16 @@ def get_job_events(self, name: str) -> list[types.Event]:
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.TRAINJOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 600,
polling_interval: int = 2,
callbacks: list[Callable[[types.TrainJob], None]] | None = None,
) -> types.TrainJob:
import time

if status is None:
status = {constants.TRAINJOB_COMPLETE}

end = time.time() + timeout
while time.time() < end:
tj = self.get_job(name)
Expand Down
5 changes: 4 additions & 1 deletion kubeflow/trainer/backends/kubernetes/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,11 +446,14 @@ def get_job_logs(
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.TRAINJOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 600,
polling_interval: int = 2,
callbacks: list[Callable[[types.TrainJob], None]] | None = None,
) -> types.TrainJob:
if status is None:
status = {constants.TRAINJOB_COMPLETE}

job_statuses = {
constants.TRAINJOB_CREATED,
constants.TRAINJOB_RUNNING,
Expand Down
5 changes: 4 additions & 1 deletion kubeflow/trainer/backends/localprocess/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,14 @@ def get_job_events(self, name: str) -> list[types.Event]:
def wait_for_job_status(
self,
name: str,
status: set[str] = {constants.TRAINJOB_COMPLETE},
status: set[str] | None = None,
timeout: int = 600,
polling_interval: int = 2,
callbacks: list[Callable[[types.TrainJob], None]] | None = None,
) -> types.TrainJob:
if status is None:
status = {constants.TRAINJOB_COMPLETE}

# find first match or fallback
_job = next((_job for _job in self.__local_jobs if _job.name == name), None)

Expand Down