Skip to content

Commit

Permalink
feat: [batch] Add gpu driver version field (#9609)
Browse files Browse the repository at this point in the history 
* docs: Add image shortcut example for Batch HPC CentOS Image

PiperOrigin-RevId: 545368122

Source-Link: googleapis/googleapis@dcd6ad7

Source-Link: googleapis/googleapis-gen@d332a89
Copy-Tag: eyJwIjoiamF2YS1iYXRjaC8uT3dsQm90LnlhbWwiLCJoIjoiZDMzMmE4OWY1Y2RmNTRkZjU0ZDEwNmJmOWRhMDk4Y2NkOWI5OGVlMCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* feat: Add gpu driver version field

docs: Add image shortcut example for Batch HPC CentOS Image
PiperOrigin-RevId: 545417413

Source-Link: googleapis/googleapis@8cd04fb

Source-Link: googleapis/googleapis-gen@fd64df7
Copy-Tag: eyJwIjoiamF2YS1iYXRjaC8uT3dsQm90LnlhbWwiLCJoIjoiZmQ2NGRmN2ZkOTUyYjNlZTIyNDBiN2ViZmZmZmUxN2U1M2ZlMzRiNCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] and gcf-owl-bot[bot] committed Jul 7, 2023
1 parent 333aff0 commit 79b80a3
Show file tree
Hide file tree
Showing 9 changed files with 432 additions and 142 deletions.
4 changes: 2 additions & 2 deletions java-batch/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.17.0</version>
<version>26.18.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-batch.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-batch/0.19.0
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-batch/0.20.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
Expand Down
22 changes: 17 additions & 5 deletions ...proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/AllocationPolicy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,7 @@ public interface DiskOrBuilder
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand All @@ -1282,6 +1283,7 @@ public interface DiskOrBuilder
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand All @@ -1307,6 +1309,7 @@ public interface DiskOrBuilder
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -1555,6 +1558,7 @@ public DataSourceCase getDataSourceCase() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -1582,6 +1586,7 @@ public boolean hasImage() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -1622,6 +1627,7 @@ public java.lang.String getImage() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -2361,6 +2367,7 @@ public Builder clearDataSource() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -2389,6 +2396,7 @@ public boolean hasImage() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -2430,6 +2438,7 @@ public java.lang.String getImage() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -2471,6 +2480,7 @@ public com.google.protobuf.ByteString getImageBytes() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -2505,6 +2515,7 @@ public Builder setImage(java.lang.String value) {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -2537,6 +2548,7 @@ public Builder clearImage() {
* * "batch-debian": use Batch Debian images.
* * "batch-centos": use Batch CentOS images.
* * "batch-cos": use Batch Container-Optimized images.
* * "batch-hpc-centos": use Batch HPC CentOS images.
* </pre>
*
* <code>string image = 4;</code>
Expand Down Expand Up @@ -4379,7 +4391,7 @@ public interface AcceleratorOrBuilder
* <code>bool install_gpu_drivers = 3 [deprecated = true];</code>
*
* @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is
* deprecated. See google/cloud/batch/v1/job.proto;l=322
* deprecated. See google/cloud/batch/v1/job.proto;l=324
* @return The installGpuDrivers.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -4512,7 +4524,7 @@ public long getCount() {
* <code>bool install_gpu_drivers = 3 [deprecated = true];</code>
*
* @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is
* deprecated. See google/cloud/batch/v1/job.proto;l=322
* deprecated. See google/cloud/batch/v1/job.proto;l=324
* @return The installGpuDrivers.
*/
@java.lang.Override
Expand Down Expand Up @@ -5087,7 +5099,7 @@ public Builder clearCount() {
* <code>bool install_gpu_drivers = 3 [deprecated = true];</code>
*
* @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is
* deprecated. See google/cloud/batch/v1/job.proto;l=322
* deprecated. See google/cloud/batch/v1/job.proto;l=324
* @return The installGpuDrivers.
*/
@java.lang.Override
Expand All @@ -5105,7 +5117,7 @@ public boolean getInstallGpuDrivers() {
* <code>bool install_gpu_drivers = 3 [deprecated = true];</code>
*
* @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is
* deprecated. See google/cloud/batch/v1/job.proto;l=322
* deprecated. See google/cloud/batch/v1/job.proto;l=324
* @param value The installGpuDrivers to set.
* @return This builder for chaining.
*/
Expand All @@ -5127,7 +5139,7 @@ public Builder setInstallGpuDrivers(boolean value) {
* <code>bool install_gpu_drivers = 3 [deprecated = true];</code>
*
* @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is
* deprecated. See google/cloud/batch/v1/job.proto;l=322
* deprecated. See google/cloud/batch/v1/job.proto;l=324
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand Down
20 changes: 18 additions & 2 deletions ...-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobStatus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,15 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
* Protobuf enum {@code google.cloud.batch.v1.JobStatus.State}
*/
public enum State implements com.google.protobuf.ProtocolMessageEnum {
/** <code>STATE_UNSPECIFIED = 0;</code> */
/**
*
*
* <pre>
* Job state unspecified.
* </pre>
*
* <code>STATE_UNSPECIFIED = 0;</code>
*/
STATE_UNSPECIFIED(0),
/**
*
Expand Down Expand Up @@ -153,7 +161,15 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
UNRECOGNIZED(-1),
;

/** <code>STATE_UNSPECIFIED = 0;</code> */
/**
*
*
* <pre>
* Job state unspecified.
* </pre>
*
* <code>STATE_UNSPECIFIED = 0;</code>
*/
public static final int STATE_UNSPECIFIED_VALUE = 0;
/**
*
Expand Down
2 changes: 2 additions & 0 deletions java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/job.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ message JobStatus {

// Valid Job states.
enum State {
// Job state unspecified.
STATE_UNSPECIFIED = 0;

// Job is admitted (validated and persisted) and waiting for resources.
Expand Down Expand Up @@ -262,6 +263,7 @@ message AllocationPolicy {
// * "batch-debian": use Batch Debian images.
// * "batch-centos": use Batch CentOS images.
// * "batch-cos": use Batch Container-Optimized images.
// * "batch-hpc-centos": use Batch HPC CentOS images.
string image = 4;

// Name of a snapshot used as the data source.
Expand Down
Loading

0 comments on commit 79b80a3

Please sign in to comment.