From c392d7b35f68ce4254bbbda148e0e63b40425612 Mon Sep 17 00:00:00 2001 From: Michael Kovalski Date: Mon, 13 Dec 2021 16:25:37 +0000 Subject: [PATCH 1/2] fix: Important the correct constants and use v1 for tensorboard experiments --- .../cloud_profiler/plugins/tensorflow/tensorboard_api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py b/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py index 4da8381b4c..042130b020 100644 --- a/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py +++ b/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py @@ -29,10 +29,11 @@ from google.api_core import exceptions from google.cloud import aiplatform from google.cloud import storage +from google.cloud.aiplatform.constants import base as constants from google.cloud.aiplatform.utils import TensorboardClientWithOverride from google.cloud.aiplatform.tensorboard import uploader_utils from google.cloud.aiplatform.compat.types import ( - tensorboard_experiment_v1beta1 as tensorboard_experiment, + tensorboard_experiment, ) from google.cloud.aiplatform.tensorboard.plugins.tf_profiler import profile_uploader from google.cloud.aiplatform import training_utils @@ -42,9 +43,10 @@ def _get_api_client() -> TensorboardClientWithOverride: """Creates an Tensorboard API client.""" - aiplatform.constants.API_BASE_PATH = ( + constants.API_BASE_PATH = ( training_utils.environment_variables.tensorboard_api_uri ) + m = re.match( "projects/.*/locations/(.*)/tensorboards/.*", training_utils.environment_variables.tensorboard_resource_name, From 814ea2de563d7e49b9818854dc773cef915ae6b0 Mon Sep 17 00:00:00 2001 From: Michael Kovalski Date: Tue, 14 Dec 2021 03:57:00 +0000 Subject: [PATCH 2/2] fix: fixing linting errors --- .../cloud_profiler/plugins/tensorflow/tensorboard_api.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py b/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py index 042130b020..fcb881a75c 100644 --- a/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py +++ b/google/cloud/aiplatform/training_utils/cloud_profiler/plugins/tensorflow/tensorboard_api.py @@ -32,9 +32,7 @@ from google.cloud.aiplatform.constants import base as constants from google.cloud.aiplatform.utils import TensorboardClientWithOverride from google.cloud.aiplatform.tensorboard import uploader_utils -from google.cloud.aiplatform.compat.types import ( - tensorboard_experiment, -) +from google.cloud.aiplatform.compat.types import tensorboard_experiment from google.cloud.aiplatform.tensorboard.plugins.tf_profiler import profile_uploader from google.cloud.aiplatform import training_utils @@ -43,9 +41,7 @@ def _get_api_client() -> TensorboardClientWithOverride: """Creates an Tensorboard API client.""" - constants.API_BASE_PATH = ( - training_utils.environment_variables.tensorboard_api_uri - ) + constants.API_BASE_PATH = training_utils.environment_variables.tensorboard_api_uri m = re.match( "projects/.*/locations/(.*)/tensorboards/.*",