Skip to content
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.

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

feat(tpu): add tpu queued resources time bound sample. #9617

Merged
merged 29 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b951997
Changed package, added information to CODEOWNERS
TetyanaYahodska Oct 15, 2024
9ee20d7
Added information to CODEOWNERS
TetyanaYahodska Oct 15, 2024
f0b8314
Added timeout
TetyanaYahodska Oct 16, 2024
055d61e
Merge branch 'main' into tpu-vm-crud-operations
TetyanaYahodska Oct 16, 2024
d3e1dee
Fixed parameters for test
TetyanaYahodska Oct 16, 2024
2253b54
Fixed DeleteTpuVm and naming
TetyanaYahodska Oct 17, 2024
d29a6b5
Added comment, created Util class
TetyanaYahodska Oct 18, 2024
d832b31
Merge branch 'main' into tpu-vm-crud-operations
TetyanaYahodska Oct 23, 2024
6956852
Fixed naming
TetyanaYahodska Oct 23, 2024
478beaa
Fixed whitespace
TetyanaYahodska Oct 23, 2024
f6b76cc
Merge branch 'main' into tpu-vm-crud-operations
TetyanaYahodska Oct 29, 2024
ec13f4d
Split PR into smaller, deleted redundant code
TetyanaYahodska Oct 29, 2024
b804cc8
Merge branch 'main' into tpu-vm-crud-operations
TetyanaYahodska Oct 29, 2024
66ae551
Implemented tpu_queued_resources_create, tpu_queued_resources_get, tp…
TetyanaYahodska Oct 29, 2024
6b14833
Implemented tpu_queued_resources_time_bound sample, created test
TetyanaYahodska Oct 30, 2024
a63690f
Merged changes from main
TetyanaYahodska Oct 30, 2024
e67b971
Changed zone for tpu
TetyanaYahodska Oct 30, 2024
3c37ec0
Cleanup resources
TetyanaYahodska Nov 4, 2024
0554808
Merged changes from main
TetyanaYahodska Nov 18, 2024
adc1ac7
Fixed tests
TetyanaYahodska Nov 18, 2024
a53bcf5
Merged changes from main
TetyanaYahodska Nov 20, 2024
8a49815
Merged changes from main
TetyanaYahodska Nov 26, 2024
8e98108
Merge branch 'main' into tpu_queued_resources_time_bound
TetyanaYahodska Dec 19, 2024
b58fc0f
Fixed test
TetyanaYahodska Dec 19, 2024
00642e6
Resolved merge conflict
TetyanaYahodska Dec 23, 2024
1cb9ab5
Merge branch 'main' into tpu_queued_resources_time_bound
TetyanaYahodska Dec 27, 2024
5d86f58
Fixed code as requested in the comments
TetyanaYahodska Dec 30, 2024
b4db847
Merge branch 'main' into tpu_queued_resources_time_bound
TetyanaYahodska Dec 31, 2024
5321ce9
Fixed code as requested in the comments
TetyanaYahodska Dec 31, 2024
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
110 changes: 110 additions & 0 deletions tpu/src/main/java/tpu/CreateTimeBoundQueuedResource.java
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented out code is not the best practice. It makes a difficult dev experience in docs.
Please remove all the commented imports and code.

If you want to show more than one option, I've suggested a simpler format.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Fixed code

Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*
* Copyright 2024 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.
*/

package tpu;

// [START tpu_queued_resources_time_bound]
import com.google.cloud.tpu.v2alpha1.CreateQueuedResourceRequest;
import com.google.cloud.tpu.v2alpha1.Node;
import com.google.cloud.tpu.v2alpha1.QueuedResource;
import com.google.cloud.tpu.v2alpha1.TpuClient;
import com.google.protobuf.Duration;
import java.io.IOException;
import java.util.concurrent.ExecutionException;

public class CreateTimeBoundQueuedResource {

public static void main(String[] args)
throws IOException, ExecutionException, InterruptedException {
// TODO(developer): Replace these variables before running the sample.
// Project ID or project number of the Google Cloud project you want to create a node.
String projectId = "YOUR_PROJECT_ID";
// The zone in which to create the TPU.
// For more information about supported TPU types for specific zones,
// see https://cloud.google.com/tpu/docs/regions-zones
String zone = "us-central2-b";
// The name of your node.
String nodeId = "YOUR_NODE_ID";
// The accelerator type that specifies the version and size of the Cloud TPU you want to create.
// For more information about supported accelerator types for each TPU version,
// see https://cloud.google.com/tpu/docs/system-architecture-tpu-vm#versions.
String acceleratorType = "v2-8";
// Software version that specifies the version of the TPU runtime to install.
// For more information see https://cloud.google.com/tpu/docs/runtimes
String runtimeVersion = "tpu-vm-tf-2.14.1";
// The name of your Queued Resource.
String queuedResourceId = "YOUR_QUEUED_RESOURCE_ID";

createTimeBoundQueuedResource(projectId, nodeId,
queuedResourceId, zone, acceleratorType, runtimeVersion);
}

// Creates a Queued Resource with time bound configuration.
public static QueuedResource createTimeBoundQueuedResource(
String projectId, String nodeId, String queuedResourceId,
String zone, String acceleratorType, String runtimeVersion)
throws IOException, ExecutionException, InterruptedException {
// Initialize client that will be used to send requests. This client only needs to be created
// once, and can be reused for multiple requests.
try (TpuClient tpuClient = TpuClient.create()) {
String parent = String.format("projects/%s/locations/%s", projectId, zone);
// Create a Duration object representing 6 hours.
Duration validAfterDuration = Duration.newBuilder().setSeconds(6 * 3600).build();
// You could also use timestamps like this:
// Timestamp validAfterTime = Timestamps.parse("2024-10-14T09:00:00Z");

Node node =
Node.newBuilder()
.setName(nodeId)
.setAcceleratorType(acceleratorType)
.setRuntimeVersion(runtimeVersion)
.setQueuedResource(
String.format(
"projects/%s/locations/%s/queuedResources/%s",
projectId, zone, queuedResourceId))
.build();

QueuedResource queuedResource =
QueuedResource.newBuilder()
.setName(queuedResourceId)
.setTpu(
QueuedResource.Tpu.newBuilder()
.addNodeSpec(
QueuedResource.Tpu.NodeSpec.newBuilder()
.setParent(parent)
.setNode(node)
.setNodeId(nodeId)
.build())
.build())
.setQueueingPolicy(
QueuedResource.QueueingPolicy.newBuilder()
.setValidAfterDuration(validAfterDuration)
// .setValidAfterTime(validAfterTime)
.build())
.build();

CreateQueuedResourceRequest request =
CreateQueuedResourceRequest.newBuilder()
.setParent(parent)
.setQueuedResource(queuedResource)
.setQueuedResourceId(queuedResourceId)
.build();

return tpuClient.createQueuedResourceAsync(request).get();
}
}
}
// [END tpu_queued_resources_time_bound]
26 changes: 26 additions & 0 deletions tpu/src/test/java/tpu/QueuedResourceIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,30 @@ public void testCreateSpotQueuedResource() throws Exception {
assertEquals(returnedQueuedResource.getName(), mockQueuedResource.getName());
}
}

@Test
public void testCreateTimeBoundQueuedResource() throws Exception {
try (MockedStatic<TpuClient> mockedTpuClient = mockStatic(TpuClient.class)) {
QueuedResource mockQueuedResource = QueuedResource.newBuilder()
.setName("QueuedResourceName")
.build();
TpuClient mockTpuClient = mock(TpuClient.class);
OperationFuture mockFuture = mock(OperationFuture.class);

mockedTpuClient.when(TpuClient::create).thenReturn(mockTpuClient);
when(mockTpuClient.createQueuedResourceAsync(any(CreateQueuedResourceRequest.class)))
.thenReturn(mockFuture);
when(mockFuture.get()).thenReturn(mockQueuedResource);

QueuedResource returnedQueuedResource =
CreateTimeBoundQueuedResource.createTimeBoundQueuedResource(
PROJECT_ID, ZONE, QUEUED_RESOURCE_NAME, NODE_NAME,
TPU_TYPE, TPU_SOFTWARE_VERSION);

verify(mockTpuClient, times(1))
.createQueuedResourceAsync(any(CreateQueuedResourceRequest.class));
verify(mockFuture, times(1)).get();
assertEquals(returnedQueuedResource.getName(), mockQueuedResource.getName());
}
}
}
Loading