feat: Release Ray on Vertex SDK to GA

PiperOrigin-RevId: 632239389
googleapis · May 9, 2024 · f7c5132 · f7c5132
1 parent c528b6f
commit f7c5132
Show file tree

Hide file tree

Showing 41 changed files with 226 additions and 48 deletions.
diff --git a/google/cloud/aiplatform/preview/vertex_ray/__init__.py b/google/cloud/aiplatform/preview/vertex_ray/__init__.py
@@ -18,29 +18,29 @@
 #
 import sys
 
-from google.cloud.aiplatform.preview.vertex_ray.bigquery_datasource import (
+from google.cloud.aiplatform.vertex_ray.bigquery_datasource import (
     BigQueryDatasource,
 )
-from google.cloud.aiplatform.preview.vertex_ray.client_builder import (
+from google.cloud.aiplatform.vertex_ray.client_builder import (
     VertexRayClientBuilder as ClientBuilder,
 )
 
-from google.cloud.aiplatform.preview.vertex_ray.cluster_init import (
+from google.cloud.aiplatform.vertex_ray.cluster_init import (
     create_ray_cluster,
     delete_ray_cluster,
     get_ray_cluster,
     list_ray_clusters,
     update_ray_cluster,
 )
 
-from google.cloud.aiplatform.preview.vertex_ray import data
+from google.cloud.aiplatform.vertex_ray import data
 
-from google.cloud.aiplatform.preview.vertex_ray.util.resources import (
+from google.cloud.aiplatform.vertex_ray.util.resources import (
     Resources,
     NodeImages,
 )
 
-from google.cloud.aiplatform.preview.vertex_ray.dashboard_sdk import (
+from google.cloud.aiplatform.vertex_ray.dashboard_sdk import (
     get_job_submission_client_cluster_info,
 )
 

diff --git a/google/cloud/aiplatform/preview/vertex_ray/predict/sklearn/__init__.py b/google/cloud/aiplatform/preview/vertex_ray/predict/sklearn/__init__.py
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
-from .register import register_sklearn
+from google.cloud.aiplatform.vertex_ray.predict.sklearn import (
+    register_sklearn,
+)
 
 __all__ = ("register_sklearn",)
diff --git a/google/cloud/aiplatform/preview/vertex_ray/predict/tensorflow/__init__.py b/google/cloud/aiplatform/preview/vertex_ray/predict/tensorflow/__init__.py
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
-from .register import register_tensorflow
+from google.cloud.aiplatform.vertex_ray.predict.tensorflow import (
+    register_tensorflow,
+)
 
 __all__ = ("register_tensorflow",)
diff --git a/google/cloud/aiplatform/preview/vertex_ray/predict/torch/__init__.py b/google/cloud/aiplatform/preview/vertex_ray/predict/torch/__init__.py
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
-from .register import get_pytorch_model_from
+from google.cloud.aiplatform.vertex_ray.predict.torch import (
+    get_pytorch_model_from,
+)
 
 __all__ = ("get_pytorch_model_from",)
diff --git a/google/cloud/aiplatform/preview/vertex_ray/predict/xgboost/__init__.py b/google/cloud/aiplatform/preview/vertex_ray/predict/xgboost/__init__.py
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
-from .register import register_xgboost
+from google.cloud.aiplatform.vertex_ray.predict.xgboost import (
+    register_xgboost,
+)
 
 __all__ = ("register_xgboost",)
diff --git a/google/cloud/aiplatform/vertex_ray/__init__.py b/google/cloud/aiplatform/vertex_ray/__init__.py
@@ -0,0 +1,64 @@
+"""Ray on Vertex AI."""
+
+# -*- coding: utf-8 -*-
+
+# Copyright 2022 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.
+#
+import sys
+
+from google.cloud.aiplatform.vertex_ray.bigquery_datasource import (
+    BigQueryDatasource,
+)
+from google.cloud.aiplatform.vertex_ray.client_builder import (
+    VertexRayClientBuilder as ClientBuilder,
+)
+
+from google.cloud.aiplatform.vertex_ray.cluster_init import (
+    create_ray_cluster,
+    delete_ray_cluster,
+    get_ray_cluster,
+    list_ray_clusters,
+    update_ray_cluster,
+)
+
+from google.cloud.aiplatform.vertex_ray import data
+
+from google.cloud.aiplatform.vertex_ray.util.resources import (
+    Resources,
+    NodeImages,
+)
+
+from google.cloud.aiplatform.vertex_ray.dashboard_sdk import (
+    get_job_submission_client_cluster_info,
+)
+
+if sys.version_info[1] != 10:
+    print(
+        "[Ray on Vertex]: The client environment with Python version 3.10 is required."
+    )
+
+__all__ = (
+    "BigQueryDatasource",
+    "data",
+    "ClientBuilder",
+    "get_job_submission_client_cluster_info",
+    "create_ray_cluster",
+    "delete_ray_cluster",
+    "get_ray_cluster",
+    "list_ray_clusters",
+    "update_ray_cluster",
+    "Resources",
+    "NodeImages",
+)
diff --git a/...m/preview/vertex_ray/bigquery_datasink.py → ...iplatform/vertex_ray/bigquery_datasink.py b/...m/preview/vertex_ray/bigquery_datasink.py → ...iplatform/vertex_ray/bigquery_datasink.py
diff --git a/...preview/vertex_ray/bigquery_datasource.py → ...latform/vertex_ray/bigquery_datasource.py b/...preview/vertex_ray/bigquery_datasource.py → ...latform/vertex_ray/bigquery_datasource.py
diff --git a/...form/preview/vertex_ray/client_builder.py → ...d/aiplatform/vertex_ray/client_builder.py b/...form/preview/vertex_ray/client_builder.py → ...d/aiplatform/vertex_ray/client_builder.py
diff --git a/...atform/preview/vertex_ray/cluster_init.py → ...oud/aiplatform/vertex_ray/cluster_init.py b/...atform/preview/vertex_ray/cluster_init.py → ...oud/aiplatform/vertex_ray/cluster_init.py
@@ -35,7 +35,7 @@
     ServiceAccountSpec,
 )
 
-from google.cloud.aiplatform.preview.vertex_ray.util import (
+from google.cloud.aiplatform.vertex_ray.util import (
     _gapic_utils,
     _validation_utils,
     resources,

diff --git a/...tform/preview/vertex_ray/dashboard_sdk.py → ...ud/aiplatform/vertex_ray/dashboard_sdk.py b/...tform/preview/vertex_ray/dashboard_sdk.py → ...ud/aiplatform/vertex_ray/dashboard_sdk.py
diff --git a/...oud/aiplatform/preview/vertex_ray/data.py → google/cloud/aiplatform/vertex_ray/data.py b/...oud/aiplatform/preview/vertex_ray/data.py → google/cloud/aiplatform/vertex_ray/data.py
@@ -20,18 +20,18 @@
 from typing import Any, Dict, Optional
 import warnings
 
-from google.cloud.aiplatform.preview.vertex_ray.bigquery_datasource import (
+from google.cloud.aiplatform.vertex_ray.bigquery_datasource import (
     BigQueryDatasource,
 )
 
 try:
-    from google.cloud.aiplatform.preview.vertex_ray.bigquery_datasink import (
+    from google.cloud.aiplatform.vertex_ray.bigquery_datasink import (
         _BigQueryDatasink,
     )
 except ImportError:
     _BigQueryDatasink = None
 
-from google.cloud.aiplatform.preview.vertex_ray.util._validation_utils import (
+from google.cloud.aiplatform.vertex_ray.util._validation_utils import (
     _V2_4_WARNING_MESSAGE,
 )
 

diff --git a/google/cloud/aiplatform/vertex_ray/predict/__init__.py b/google/cloud/aiplatform/vertex_ray/predict/__init__.py
@@ -0,0 +1,18 @@
+"""Ray on Vertex AI Prediction."""
+
+# -*- coding: utf-8 -*-
+
+# 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.
+#
diff --git a/google/cloud/aiplatform/vertex_ray/predict/sklearn/__init__.py b/google/cloud/aiplatform/vertex_ray/predict/sklearn/__init__.py
@@ -0,0 +1,22 @@
+"""Ray on Vertex AI Prediction Tensorflow."""
+
+# -*- coding: utf-8 -*-
+
+# 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 .register import register_sklearn
+
+__all__ = ("register_sklearn",)
diff --git a/...ew/vertex_ray/predict/sklearn/register.py → ...rm/vertex_ray/predict/sklearn/register.py b/...ew/vertex_ray/predict/sklearn/register.py → ...rm/vertex_ray/predict/sklearn/register.py
@@ -30,11 +30,11 @@
 from google.cloud.aiplatform import initializer
 from google.cloud.aiplatform import utils
 from google.cloud.aiplatform.utils import gcs_utils
-from google.cloud.aiplatform.preview.vertex_ray.predict.util import constants
-from google.cloud.aiplatform.preview.vertex_ray.predict.util import (
+from google.cloud.aiplatform.vertex_ray.predict.util import constants
+from google.cloud.aiplatform.vertex_ray.predict.util import (
     predict_utils,
 )
-from google.cloud.aiplatform.preview.vertex_ray.util._validation_utils import (
+from google.cloud.aiplatform.vertex_ray.util._validation_utils import (
     _V2_4_WARNING_MESSAGE,
 )
 

diff --git a/google/cloud/aiplatform/vertex_ray/predict/tensorflow/__init__.py b/google/cloud/aiplatform/vertex_ray/predict/tensorflow/__init__.py
@@ -0,0 +1,22 @@
+"""Ray on Vertex AI Prediction Tensorflow."""
+
+# -*- coding: utf-8 -*-
+
+# 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 .register import register_tensorflow
+
+__all__ = ("register_tensorflow",)
diff --git a/...vertex_ray/predict/tensorflow/register.py → ...vertex_ray/predict/tensorflow/register.py b/...vertex_ray/predict/tensorflow/register.py → ...vertex_ray/predict/tensorflow/register.py
@@ -25,11 +25,11 @@
 from google.cloud import aiplatform
 from google.cloud.aiplatform import initializer
 from google.cloud.aiplatform import utils
-from google.cloud.aiplatform.preview.vertex_ray.predict.util import constants
-from google.cloud.aiplatform.preview.vertex_ray.predict.util import (
+from google.cloud.aiplatform.vertex_ray.predict.util import constants
+from google.cloud.aiplatform.vertex_ray.predict.util import (
     predict_utils,
 )
-from google.cloud.aiplatform.preview.vertex_ray.util._validation_utils import (
+from google.cloud.aiplatform.vertex_ray.util._validation_utils import (
     _V2_4_WARNING_MESSAGE,
 )
 

diff --git a/google/cloud/aiplatform/vertex_ray/predict/torch/__init__.py b/google/cloud/aiplatform/vertex_ray/predict/torch/__init__.py
@@ -0,0 +1,22 @@
+"""Ray on Vertex AI Prediction Tensorflow."""
+
+# -*- coding: utf-8 -*-
+
+# 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 .register import get_pytorch_model_from
+
+__all__ = ("get_pytorch_model_from",)
diff --git a/...view/vertex_ray/predict/torch/register.py → ...form/vertex_ray/predict/torch/register.py b/...view/vertex_ray/predict/torch/register.py → ...form/vertex_ray/predict/torch/register.py
@@ -20,7 +20,7 @@
 import ray
 from ray.air._internal.torch_utils import load_torch_model
 import tempfile
-from google.cloud.aiplatform.preview.vertex_ray.util._validation_utils import (
+from google.cloud.aiplatform.vertex_ray.util._validation_utils import (
     _V2_4_WARNING_MESSAGE,
 )
 from google.cloud.aiplatform.utils import gcs_utils

diff --git a/...view/vertex_ray/predict/util/constants.py → ...form/vertex_ray/predict/util/constants.py b/...view/vertex_ray/predict/util/constants.py → ...form/vertex_ray/predict/util/constants.py
diff --git a/.../vertex_ray/predict/util/predict_utils.py → .../vertex_ray/predict/util/predict_utils.py b/.../vertex_ray/predict/util/predict_utils.py → .../vertex_ray/predict/util/predict_utils.py
diff --git a/google/cloud/aiplatform/vertex_ray/predict/xgboost/__init__.py b/google/cloud/aiplatform/vertex_ray/predict/xgboost/__init__.py
@@ -0,0 +1,22 @@
+"""Ray on Vertex AI Prediction Tensorflow."""
+
+# -*- coding: utf-8 -*-
+
+# 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 .register import register_xgboost
+
+__all__ = ("register_xgboost",)
diff --git a/...ew/vertex_ray/predict/xgboost/register.py → ...rm/vertex_ray/predict/xgboost/register.py b/...ew/vertex_ray/predict/xgboost/register.py → ...rm/vertex_ray/predict/xgboost/register.py
@@ -29,11 +29,11 @@
 from google.cloud.aiplatform import initializer
 from google.cloud.aiplatform import utils
 from google.cloud.aiplatform.utils import gcs_utils
-from google.cloud.aiplatform.preview.vertex_ray.predict.util import constants
-from google.cloud.aiplatform.preview.vertex_ray.predict.util import (
+from google.cloud.aiplatform.vertex_ray.predict.util import constants
+from google.cloud.aiplatform.vertex_ray.predict.util import (
     predict_utils,
 )
-from google.cloud.aiplatform.preview.vertex_ray.util._validation_utils import (
+from google.cloud.aiplatform.vertex_ray.util._validation_utils import (
     _V2_4_WARNING_MESSAGE,
 )
 

diff --git a/...d/aiplatform/preview/vertex_ray/render.py → google/cloud/aiplatform/vertex_ray/render.py b/...d/aiplatform/preview/vertex_ray/render.py → google/cloud/aiplatform/vertex_ray/render.py
diff --git a/...view/vertex_ray/templates/context.html.j2 → ...form/vertex_ray/templates/context.html.j2 b/...view/vertex_ray/templates/context.html.j2 → ...form/vertex_ray/templates/context.html.j2
diff --git a/...ray/templates/context_shellurirow.html.j2 → ...ray/templates/context_shellurirow.html.j2 b/...ray/templates/context_shellurirow.html.j2 → ...ray/templates/context_shellurirow.html.j2
diff --git a/...m/preview/vertex_ray/util/_gapic_utils.py → ...iplatform/vertex_ray/util/_gapic_utils.py b/...m/preview/vertex_ray/util/_gapic_utils.py → ...iplatform/vertex_ray/util/_gapic_utils.py
@@ -25,8 +25,8 @@
 from google.cloud.aiplatform.utils import (
     PersistentResourceClientWithOverride,
 )
-from google.cloud.aiplatform.preview.vertex_ray.util import _validation_utils
-from google.cloud.aiplatform.preview.vertex_ray.util.resources import (
+from google.cloud.aiplatform.vertex_ray.util import _validation_utils
+from google.cloud.aiplatform.vertex_ray.util.resources import (
     Cluster,
     Resources,
 )

diff --git a/...view/vertex_ray/util/_validation_utils.py → ...form/vertex_ray/util/_validation_utils.py b/...view/vertex_ray/util/_validation_utils.py → ...form/vertex_ray/util/_validation_utils.py
diff --git a/...form/preview/vertex_ray/util/resources.py → ...d/aiplatform/vertex_ray/util/resources.py b/...form/preview/vertex_ray/util/resources.py → ...d/aiplatform/vertex_ray/util/resources.py
diff --git a/setup.py b/setup.py
@@ -41,9 +41,9 @@
 
 # Add vertex_ray relative packages
 packages += [
-    package.replace("google.cloud.aiplatform.preview.vertex_ray", "vertex_ray")
+    package.replace("google.cloud.aiplatform.vertex_ray", "vertex_ray")
     for package in setuptools.PEP420PackageFinder.find()
-    if package.startswith("google.cloud.aiplatform.preview.vertex_ray")
+    if package.startswith("google.cloud.aiplatform.vertex_ray")
 ]
 
 tensorboard_extra_require = ["tensorflow >=2.3.0, <3.0.0dev; python_version<='3.11'"]
@@ -215,7 +215,7 @@
     description=description,
     long_description=readme,
     packages=packages,
-    package_dir={"vertex_ray": "google/cloud/aiplatform/preview/vertex_ray"},
+    package_dir={"vertex_ray": "google/cloud/aiplatform/vertex_ray"},
     package_data={"": ["*.html.j2"]},
     entry_points={
         "console_scripts": [

diff --git a/tests/system/vertex_ray/test_cluster_management.py b/tests/system/vertex_ray/test_cluster_management.py
@@ -16,7 +16,7 @@
 #
 
 from google.cloud import aiplatform
-from google.cloud.aiplatform.preview import vertex_ray
+from google.cloud.aiplatform import vertex_ray
 from tests.system.aiplatform import e2e_base
 import datetime
 import pytest

diff --git a/tests/system/vertex_ray/test_job_submission_dashboard.py b/tests/system/vertex_ray/test_job_submission_dashboard.py
@@ -16,7 +16,7 @@
 #
 
 from google.cloud import aiplatform
-from google.cloud.aiplatform.preview import vertex_ray
+from google.cloud.aiplatform import vertex_ray
 from ray.job_submission import JobSubmissionClient
 from tests.system.aiplatform import e2e_base
 import datetime
@@ -57,7 +57,7 @@ def test_job_submission_dashboard(self, cluster_ray_version):
 
         # Need to use the full path since the installation is editable, not from a release
         client = JobSubmissionClient(
-            "google.cloud.aiplatform.preview.vertex_ray://{}".format(
+            "google.cloud.aiplatform.vertex_ray://{}".format(
                 cluster_details.dashboard_address
             )
         )