From ee11093a396d77f818b1bfe5752970e3388e4d4a Mon Sep 17 00:00:00 2001 From: Jeev B Date: Thu, 5 Oct 2023 14:54:22 -0700 Subject: [PATCH] First pass through PR Signed-off-by: Jeev B --- flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.cc | 24 +- flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.h | 6 +- flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go | 220 +++++++++--------- flyteidl/gen/pb-java/flyteidl/core/Tasks.java | 40 ++-- flyteidl/gen/pb-js/flyteidl.js | 4 +- .../gen/pb_python/flyteidl/core/tasks_pb2.py | 2 +- flyteidl/gen/pb_rust/flyteidl.core.rs | 2 +- flyteidl/protos/flyteidl/core/tasks.proto | 2 +- .../plugins/k8s/kfoperators/mpi/mpi_test.go | 13 +- .../k8s/kfoperators/pytorch/pytorch_test.go | 3 +- 10 files changed, 156 insertions(+), 160 deletions(-) diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.cc index ad25a54df8..7a06a09340 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.cc @@ -656,7 +656,7 @@ const char descriptor_table_protodef_flyteidl_2fcore_2ftasks_2eproto[] = "ice\030\001 \001(\t\022\027\n\runpartitioned\030\002 \001(\010H\000\022\030\n\016pa" "rtition_size\030\003 \001(\tH\000B\026\n\024partition_size_v" "alue\"K\n\021ExtendedResources\0226\n\017gpu_acceler" - "ator\030\003 \001(\0132\035.flyteidl.core.GPUAccelerato" + "ator\030\001 \001(\0132\035.flyteidl.core.GPUAccelerato" "r\"\225\001\n\017RuntimeMetadata\0228\n\004type\030\001 \001(\0162*.fl" "yteidl.core.RuntimeMetadata.RuntimeType\022" "\017\n\007version\030\002 \001(\t\022\016\n\006flavor\030\003 \001(\t\"\'\n\013Runt" @@ -2150,9 +2150,9 @@ const char* ExtendedResources::_InternalParse(const char* begin, const char* end ptr = ::google::protobuf::io::Parse32(ptr, &tag); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); switch (tag >> 3) { - // .flyteidl.core.GPUAccelerator gpu_accelerator = 3; - case 3: { - if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + // .flyteidl.core.GPUAccelerator gpu_accelerator = 1; + case 1: { + if (static_cast<::google::protobuf::uint8>(tag) != 10) goto handle_unusual; ptr = ::google::protobuf::io::ReadSize(ptr, &size); GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); parser_till_end = ::flyteidl::core::GPUAccelerator::_InternalParse; @@ -2193,9 +2193,9 @@ bool ExtendedResources::MergePartialFromCodedStream( tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // .flyteidl.core.GPUAccelerator gpu_accelerator = 3; - case 3: { - if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + // .flyteidl.core.GPUAccelerator gpu_accelerator = 1; + case 1: { + if (static_cast< ::google::protobuf::uint8>(tag) == (10 & 0xFF)) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessage( input, mutable_gpu_accelerator())); } else { @@ -2231,10 +2231,10 @@ void ExtendedResources::SerializeWithCachedSizes( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + // .flyteidl.core.GPUAccelerator gpu_accelerator = 1; if (this->has_gpu_accelerator()) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 3, HasBitSetters::gpu_accelerator(this), output); + 1, HasBitSetters::gpu_accelerator(this), output); } if (_internal_metadata_.have_unknown_fields()) { @@ -2250,11 +2250,11 @@ ::google::protobuf::uint8* ExtendedResources::InternalSerializeWithCachedSizesTo ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + // .flyteidl.core.GPUAccelerator gpu_accelerator = 1; if (this->has_gpu_accelerator()) { target = ::google::protobuf::internal::WireFormatLite:: InternalWriteMessageToArray( - 3, HasBitSetters::gpu_accelerator(this), target); + 1, HasBitSetters::gpu_accelerator(this), target); } if (_internal_metadata_.have_unknown_fields()) { @@ -2278,7 +2278,7 @@ size_t ExtendedResources::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; - // .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + // .flyteidl.core.GPUAccelerator gpu_accelerator = 1; if (this->has_gpu_accelerator()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSize( diff --git a/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.h b/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.h index 4023e06574..37446ea345 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/core/tasks.pb.h @@ -857,10 +857,10 @@ class ExtendedResources final : // accessors ------------------------------------------------------- - // .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + // .flyteidl.core.GPUAccelerator gpu_accelerator = 1; bool has_gpu_accelerator() const; void clear_gpu_accelerator(); - static const int kGpuAcceleratorFieldNumber = 3; + static const int kGpuAcceleratorFieldNumber = 1; const ::flyteidl::core::GPUAccelerator& gpu_accelerator() const; ::flyteidl::core::GPUAccelerator* release_gpu_accelerator(); ::flyteidl::core::GPUAccelerator* mutable_gpu_accelerator(); @@ -3134,7 +3134,7 @@ inline GPUAccelerator::PartitionSizeValueCase GPUAccelerator::partition_size_val // ExtendedResources -// .flyteidl.core.GPUAccelerator gpu_accelerator = 3; +// .flyteidl.core.GPUAccelerator gpu_accelerator = 1; inline bool ExtendedResources::has_gpu_accelerator() const { return this != internal_default_instance() && gpu_accelerator_ != nullptr; } diff --git a/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go b/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go index dec53ed134..d7310cce31 100644 --- a/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/core/tasks.pb.go @@ -455,7 +455,7 @@ func (*GPUAccelerator) XXX_OneofWrappers() []interface{} { type ExtendedResources struct { // GPU accelerator to select for task. Contains information about device type, and // for multi-instance GPUs, the partition size to use. - GpuAccelerator *GPUAccelerator `protobuf:"bytes,3,opt,name=gpu_accelerator,json=gpuAccelerator,proto3" json:"gpu_accelerator,omitempty"` + GpuAccelerator *GPUAccelerator `protobuf:"bytes,1,opt,name=gpu_accelerator,json=gpuAccelerator,proto3" json:"gpu_accelerator,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1409,117 +1409,117 @@ func init() { func init() { proto.RegisterFile("flyteidl/core/tasks.proto", fileDescriptor_bd8423ba58d6ed80) } var fileDescriptor_bd8423ba58d6ed80 = []byte{ - // 1785 bytes of a gzipped FileDescriptorProto + // 1787 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x57, 0xdd, 0x72, 0xdb, 0xb8, 0x15, 0xb6, 0x24, 0x5b, 0xb2, 0x8e, 0x2c, 0x9b, 0xc2, 0x6e, 0x52, 0xc6, 0x4d, 0xd2, 0x0c, 0xa7, - 0x9b, 0xa4, 0xdb, 0x46, 0x6e, 0xbc, 0x19, 0xdb, 0x9b, 0xee, 0xa4, 0x23, 0x47, 0x4c, 0xac, 0xda, + 0x9b, 0xa4, 0xdb, 0x46, 0x6e, 0xb4, 0x19, 0xdb, 0x9b, 0xee, 0xa4, 0x23, 0x47, 0x4c, 0xac, 0xda, 0xfa, 0x19, 0x48, 0xce, 0x36, 0xed, 0x74, 0x58, 0x98, 0x84, 0x69, 0xd6, 0x14, 0xc1, 0x80, 0xa0, 0xbb, 0xca, 0x5b, 0xb4, 0x2f, 0xd1, 0xe9, 0x4c, 0x6f, 0x7b, 0xd9, 0x77, 0xe8, 0x55, 0xdf, 0xa4, - 0x77, 0xbd, 0xe8, 0x00, 0xfc, 0xd1, 0x9f, 0x13, 0x8f, 0xaf, 0x88, 0x73, 0xce, 0x77, 0x0e, 0x80, - 0x83, 0xf3, 0x47, 0xb8, 0x77, 0xee, 0x4f, 0x04, 0xf5, 0x1c, 0x7f, 0xc7, 0x66, 0x9c, 0xee, 0x08, - 0x12, 0x5d, 0x46, 0xcd, 0x90, 0x33, 0xc1, 0x50, 0x3d, 0x13, 0x35, 0xa5, 0x68, 0xfb, 0xe1, 0x3c, - 0xd2, 0x73, 0x68, 0x20, 0xbc, 0x73, 0x8f, 0xf2, 0x04, 0xbe, 0xfd, 0x60, 0x41, 0x1e, 0x08, 0xca, - 0xcf, 0x89, 0x4d, 0x53, 0xf1, 0xfd, 0x79, 0xb1, 0xef, 0x09, 0xca, 0x89, 0x1f, 0x5d, 0x2f, 0x8d, - 0xa8, 0x1d, 0x73, 0x4f, 0x4c, 0x52, 0xe9, 0x43, 0x97, 0x31, 0xd7, 0xa7, 0x3b, 0x8a, 0x3a, 0x8b, - 0xcf, 0x77, 0x9c, 0x98, 0x13, 0xe1, 0xb1, 0x20, 0xd3, 0x5e, 0x94, 0x47, 0x82, 0xc7, 0xb6, 0x48, - 0xa4, 0xc6, 0xbf, 0x8b, 0x50, 0xc5, 0x34, 0x62, 0x31, 0xb7, 0x69, 0x84, 0x0e, 0x61, 0x9d, 0xd3, - 0x0f, 0x31, 0x8d, 0x44, 0xa4, 0x17, 0x1e, 0x95, 0x9e, 0xd6, 0x76, 0x1f, 0x37, 0xe7, 0x2e, 0xda, - 0xcc, 0xb1, 0xf9, 0xca, 0x0c, 0x04, 0x9f, 0xe0, 0x5c, 0x0f, 0xbd, 0x82, 0xb2, 0xef, 0x8d, 0x3d, - 0x11, 0xe9, 0xc5, 0x5b, 0x59, 0x48, 0xb5, 0xb6, 0xff, 0x08, 0xf5, 0x39, 0x01, 0xfa, 0x16, 0x56, - 0x03, 0x32, 0xa6, 0x7a, 0xe1, 0x51, 0xe1, 0xe9, 0xe6, 0xee, 0x57, 0x37, 0x9a, 0xeb, 0x91, 0x31, - 0xc5, 0x4a, 0x05, 0x7d, 0x09, 0x6b, 0x57, 0xc4, 0x8f, 0xa9, 0x5e, 0x7c, 0x54, 0x78, 0x5a, 0xc5, - 0x09, 0x61, 0xfc, 0x01, 0x36, 0x66, 0xb1, 0xa8, 0x06, 0x95, 0xd3, 0xde, 0x71, 0xaf, 0xff, 0x7d, - 0x4f, 0x5b, 0x41, 0x15, 0x28, 0xbd, 0x1e, 0x9c, 0x6a, 0x05, 0xb9, 0x78, 0x3b, 0x38, 0xd5, 0x8a, - 0x08, 0xa0, 0xdc, 0x35, 0xbb, 0x7d, 0xfc, 0x5e, 0x2b, 0x49, 0xe8, 0x70, 0xd4, 0xc7, 0xad, 0xb7, - 0xa6, 0xb6, 0x8a, 0xee, 0x40, 0xc3, 0x1c, 0x1c, 0x99, 0x5d, 0x13, 0xb7, 0x4e, 0xac, 0x8c, 0xbd, - 0x66, 0xfc, 0xa5, 0x00, 0x9b, 0x6f, 0x07, 0xa7, 0x2d, 0xdb, 0xa6, 0x3e, 0xe5, 0x44, 0x30, 0x8e, - 0xee, 0x42, 0xd9, 0xa1, 0x57, 0x9e, 0x9d, 0x5c, 0xa2, 0x8a, 0x53, 0x0a, 0x3d, 0x86, 0x7a, 0x1c, - 0x84, 0x84, 0x0b, 0x4f, 0x3e, 0x18, 0x75, 0xd4, 0x39, 0xd7, 0x8f, 0x56, 0xf0, 0x3c, 0x1b, 0x3d, - 0x81, 0xcd, 0x9c, 0xb4, 0x22, 0xef, 0x23, 0xd5, 0x4b, 0xd2, 0x8e, 0x04, 0xe6, 0xfc, 0xa1, 0xf7, - 0x91, 0x1e, 0xde, 0x85, 0x2f, 0xe7, 0x81, 0x56, 0x72, 0xe5, 0xdf, 0x43, 0xc3, 0xfc, 0x41, 0xd0, - 0xc0, 0xa1, 0xce, 0xf4, 0xb5, 0xdf, 0xc0, 0x96, 0x1b, 0xc6, 0x16, 0x99, 0x1e, 0x54, 0x99, 0xad, - 0xed, 0x3e, 0x58, 0xf0, 0xf1, 0xfc, 0x6d, 0xf0, 0xa6, 0x1b, 0xc6, 0x33, 0xb4, 0xf1, 0x8f, 0x02, - 0x6c, 0xe1, 0x38, 0x10, 0xde, 0x98, 0x76, 0xa9, 0x20, 0x0e, 0x11, 0x04, 0xbd, 0x82, 0x55, 0x31, - 0x09, 0xb3, 0x47, 0xfb, 0x7a, 0xf1, 0xd1, 0xe6, 0xd1, 0x19, 0x3d, 0x9a, 0x84, 0x14, 0x2b, 0x3d, - 0xa4, 0x43, 0xe5, 0x8a, 0xf2, 0xc8, 0x63, 0x41, 0xfa, 0x76, 0x19, 0x29, 0x7d, 0x79, 0xee, 0x93, - 0xab, 0xf4, 0xb0, 0x55, 0x9c, 0x52, 0xc6, 0x13, 0xa8, 0xcd, 0x98, 0x41, 0x55, 0x58, 0xeb, 0x8f, - 0x8e, 0x4c, 0xac, 0xad, 0xa0, 0x3a, 0x54, 0xdf, 0x9c, 0xbc, 0x1f, 0x99, 0xd6, 0xb0, 0x7d, 0xac, - 0x15, 0x8c, 0xff, 0xae, 0xc2, 0xc6, 0x88, 0x44, 0x97, 0xf9, 0x59, 0x0d, 0xd8, 0x70, 0xbc, 0xc8, - 0x66, 0x57, 0x94, 0x93, 0x33, 0x3f, 0x39, 0xf3, 0x3a, 0x9e, 0xe3, 0xa1, 0x03, 0xa8, 0xf0, 0xc4, - 0xba, 0x3a, 0x4f, 0x6d, 0xf7, 0xe1, 0xe7, 0xaf, 0x84, 0x33, 0x38, 0xfa, 0x06, 0x2a, 0xf2, 0xcb, - 0x62, 0xa1, 0xaf, 0x2a, 0xcd, 0x7b, 0xcd, 0x24, 0x23, 0x9b, 0x59, 0x46, 0x36, 0xdb, 0x69, 0xc6, - 0xe2, 0x0c, 0x89, 0xf6, 0xa0, 0xc2, 0xa9, 0xe0, 0x1e, 0x8d, 0xf4, 0x35, 0xa5, 0x74, 0x7f, 0x29, - 0xec, 0x05, 0x9f, 0x0c, 0x05, 0x27, 0x82, 0xba, 0x13, 0x9c, 0x81, 0xd1, 0xcf, 0xa1, 0x91, 0x1d, - 0x7b, 0x62, 0x65, 0x0e, 0x2c, 0x2b, 0x3f, 0x69, 0xb9, 0xe0, 0x5d, 0xea, 0xc9, 0x03, 0xd0, 0x1d, - 0x1a, 0x72, 0x6a, 0x13, 0x41, 0x1d, 0x8b, 0x72, 0xce, 0xb8, 0x35, 0xa6, 0x51, 0x44, 0x5c, 0xaa, - 0x57, 0x94, 0xce, 0xdd, 0xa9, 0xdc, 0x94, 0xe2, 0x6e, 0x22, 0x95, 0x71, 0xab, 0x4a, 0x18, 0x8f, - 0x43, 0xe1, 0x49, 0x97, 0xad, 0x67, 0x71, 0x3b, 0xc7, 0x46, 0xcf, 0x00, 0xd9, 0xc4, 0xbe, 0xa0, - 0x56, 0x44, 0xb9, 0x47, 0x7c, 0xef, 0xa3, 0xf2, 0x6f, 0x55, 0xf9, 0xb7, 0xa1, 0x24, 0xc3, 0x19, - 0x01, 0xfa, 0x0a, 0x36, 0x5d, 0x1a, 0xc8, 0xa8, 0xa2, 0x91, 0xe5, 0x50, 0xfb, 0x52, 0x07, 0x05, - 0xad, 0xe7, 0xdc, 0x36, 0xb5, 0x2f, 0x65, 0x41, 0x10, 0xc4, 0x8d, 0xf4, 0x9a, 0xaa, 0x2f, 0x8b, - 0x05, 0x61, 0xf6, 0x69, 0x9b, 0x23, 0xe2, 0x46, 0x49, 0x79, 0x51, 0x2a, 0xe8, 0x6b, 0x68, 0x84, - 0xcc, 0xb1, 0x04, 0x1d, 0x87, 0x3e, 0x11, 0xd4, 0x52, 0x85, 0x65, 0x43, 0xdd, 0x75, 0x2b, 0x64, - 0xce, 0x28, 0xe5, 0xcb, 0xb2, 0xb0, 0xbd, 0x0f, 0xd5, 0x5c, 0x1d, 0x69, 0x50, 0xba, 0xa4, 0x93, - 0x34, 0x7d, 0xe5, 0xf2, 0xfa, 0xda, 0xf2, 0xb2, 0x78, 0x50, 0x38, 0xbc, 0x03, 0x5f, 0xcc, 0xb9, - 0x21, 0xcd, 0xc1, 0xff, 0xac, 0x25, 0x71, 0x97, 0x6d, 0x82, 0x7e, 0x06, 0x45, 0xcf, 0x51, 0x26, - 0x65, 0x50, 0xcc, 0xdf, 0xa2, 0x93, 0x77, 0x10, 0x5c, 0xf4, 0x1c, 0x84, 0xd2, 0x74, 0x4a, 0xf6, - 0x4a, 0x52, 0x64, 0x1f, 0xd6, 0xc7, 0xe9, 0x3d, 0xd3, 0xbc, 0xfd, 0xf1, 0x67, 0x5c, 0x81, 0x73, - 0x30, 0xfa, 0x15, 0x54, 0xf3, 0x06, 0x94, 0xc6, 0xe4, 0x62, 0xc6, 0xcb, 0x14, 0x72, 0x3a, 0x19, - 0x08, 0x4f, 0xf1, 0x68, 0x07, 0xca, 0x76, 0x1c, 0x09, 0x36, 0x4e, 0x03, 0xf3, 0x47, 0x4b, 0xd1, - 0x3c, 0x54, 0xfd, 0x05, 0xa7, 0x30, 0x74, 0x00, 0x55, 0x9b, 0x05, 0x82, 0x78, 0x01, 0xe5, 0x2a, - 0x14, 0x6b, 0xbb, 0xfa, 0xc2, 0x6e, 0xaf, 0x33, 0xf9, 0xd1, 0x0a, 0x9e, 0x82, 0xd1, 0x2f, 0xa1, - 0x72, 0x79, 0x10, 0x59, 0x21, 0x73, 0xf4, 0x86, 0xd2, 0xbb, 0xb3, 0xa0, 0x77, 0x7c, 0x10, 0x0d, - 0x98, 0x73, 0xb4, 0x82, 0xcb, 0x97, 0x6a, 0x85, 0x1e, 0x43, 0x29, 0xfa, 0xe0, 0xeb, 0x48, 0xa1, - 0xd1, 0x02, 0x7a, 0xf8, 0xc1, 0x3f, 0x5a, 0xc1, 0x12, 0x20, 0xc3, 0x40, 0x36, 0x73, 0x4b, 0xfa, - 0x31, 0x4f, 0x13, 0x19, 0xf2, 0x6b, 0x78, 0x4b, 0x0a, 0xe4, 0xf5, 0xb3, 0x2c, 0xe9, 0x80, 0x96, - 0x75, 0x5c, 0x4b, 0x9e, 0x8d, 0xfe, 0x20, 0x54, 0xb8, 0x2f, 0x97, 0x80, 0x61, 0x0a, 0x7b, 0x9d, - 0xa0, 0xf0, 0x56, 0x34, 0xcf, 0x40, 0x7d, 0x40, 0x34, 0xad, 0xc2, 0x16, 0xcf, 0xca, 0xb0, 0x4a, - 0x87, 0xda, 0xee, 0xa3, 0x05, 0x63, 0x4b, 0xe5, 0x1a, 0x37, 0xe8, 0x52, 0x05, 0xff, 0x35, 0x94, - 0x6d, 0x16, 0x9c, 0x7b, 0xae, 0xae, 0xa9, 0x5c, 0x78, 0x72, 0x4d, 0x00, 0x64, 0xe1, 0x26, 0xbd, - 0x7c, 0xee, 0xb9, 0x69, 0xb3, 0x4d, 0xd4, 0xb6, 0xbf, 0x85, 0xda, 0x0c, 0xfb, 0x56, 0x51, 0xbe, - 0x0e, 0x65, 0x41, 0xb8, 0x4b, 0x85, 0xb1, 0x07, 0xf5, 0xfc, 0x05, 0x07, 0x8c, 0x0b, 0x99, 0xc7, - 0xf9, 0x2b, 0x5a, 0x21, 0xe3, 0x42, 0x59, 0xac, 0xe3, 0xba, 0x3d, 0x0b, 0x33, 0xfe, 0x57, 0x82, - 0x6a, 0xae, 0x28, 0x77, 0xf2, 0xc6, 0xb2, 0xf4, 0x24, 0xbb, 0x27, 0x84, 0xec, 0x03, 0x36, 0x1b, - 0x8f, 0x49, 0xe0, 0xa8, 0x71, 0xa2, 0x8a, 0x33, 0x52, 0xa6, 0x04, 0xe1, 0x6e, 0xa4, 0x97, 0x14, - 0x5b, 0xad, 0xd1, 0x1e, 0x54, 0xa7, 0x7e, 0x5d, 0xbd, 0x36, 0xd6, 0xa6, 0xfe, 0x9c, 0x42, 0xd1, - 0x33, 0x28, 0xd1, 0xe0, 0x4a, 0x5f, 0x53, 0x4e, 0x5c, 0xcc, 0xa2, 0x63, 0x3a, 0x79, 0x27, 0x6f, - 0x3d, 0x20, 0x1e, 0xc7, 0x12, 0x87, 0xf6, 0x73, 0xb7, 0x97, 0x6f, 0xd4, 0x38, 0x2c, 0xea, 0x85, - 0xcc, 0xdd, 0x68, 0x17, 0xd6, 0xa4, 0x3b, 0x22, 0xbd, 0xa2, 0xf4, 0xee, 0x7f, 0x2a, 0x0f, 0xa4, - 0x7b, 0x70, 0x02, 0x45, 0x2d, 0xa8, 0xc9, 0xac, 0xb5, 0xd2, 0x1d, 0xaf, 0x8f, 0x96, 0x36, 0x11, - 0xe4, 0x84, 0x11, 0xc7, 0x0b, 0xdc, 0xe4, 0x3d, 0x31, 0x48, 0xa5, 0x64, 0x8d, 0x3a, 0xb0, 0x41, - 0xb8, 0x7d, 0xe1, 0x09, 0x6a, 0x8b, 0x98, 0x53, 0x55, 0x55, 0x97, 0x27, 0xa9, 0x7c, 0xf7, 0x66, - 0x6b, 0x06, 0x8c, 0xe7, 0x54, 0x8d, 0x0e, 0x6c, 0xcc, 0x4a, 0xe7, 0x67, 0xa7, 0x2a, 0xac, 0xb5, - 0xba, 0xed, 0xbd, 0x17, 0x5a, 0x41, 0x2d, 0x71, 0x77, 0xef, 0x45, 0x32, 0x3f, 0xb5, 0x70, 0xd7, - 0x7a, 0xb7, 0xa7, 0x95, 0xf2, 0xf5, 0xbe, 0xb6, 0x6a, 0xfc, 0xb3, 0x08, 0xd0, 0xe9, 0x67, 0x3d, - 0x0c, 0x1d, 0x43, 0xdd, 0x61, 0x7f, 0x0e, 0x7c, 0x46, 0x1c, 0x6b, 0xcc, 0x9c, 0x6c, 0x74, 0x58, - 0x1c, 0x1f, 0xa7, 0x1a, 0xcd, 0x76, 0x0a, 0xef, 0x32, 0x87, 0xe2, 0x0d, 0x67, 0x86, 0x42, 0x26, - 0xd4, 0xe2, 0x70, 0x6a, 0xaa, 0xa8, 0x4c, 0xfd, 0xf4, 0xd3, 0xa6, 0x4e, 0xc3, 0xdc, 0x10, 0xc4, - 0xf9, 0xda, 0x38, 0x81, 0x8d, 0xd9, 0x4d, 0x10, 0x82, 0xcd, 0x76, 0xff, 0xfb, 0xde, 0x49, 0xbf, - 0xd5, 0xb6, 0xcc, 0xd6, 0x5b, 0x35, 0x5d, 0x7c, 0x01, 0x5b, 0x39, 0x6f, 0x38, 0xc2, 0x66, 0xab, - 0xab, 0x15, 0x12, 0xa6, 0xd5, 0xeb, 0x8f, 0xac, 0x4c, 0xa6, 0x15, 0x0d, 0x13, 0x60, 0xba, 0x8f, - 0xb4, 0x75, 0x3a, 0x50, 0x5a, 0xfd, 0x9e, 0x65, 0xfe, 0xb6, 0x33, 0xd2, 0x56, 0x90, 0x06, 0x1b, - 0x29, 0x2f, 0xb1, 0x5e, 0x40, 0x0d, 0xa8, 0xa7, 0x86, 0x12, 0x81, 0x56, 0x34, 0xfe, 0x56, 0x84, - 0xc6, 0xd2, 0x7b, 0xcb, 0x44, 0xa1, 0x81, 0xec, 0xa2, 0x4e, 0x3a, 0xbf, 0x64, 0x24, 0x7a, 0x00, - 0xe0, 0x05, 0x61, 0x2c, 0xac, 0x90, 0x88, 0x8b, 0x34, 0x8f, 0xab, 0x8a, 0x33, 0x20, 0xe2, 0x02, - 0xfd, 0x04, 0x6a, 0x2c, 0x16, 0xb9, 0x3c, 0x19, 0xaa, 0x20, 0x61, 0x29, 0x40, 0x07, 0xca, 0xe7, - 0x8c, 0x8f, 0x49, 0x32, 0xbf, 0x6c, 0xee, 0x3e, 0xbf, 0x29, 0xf6, 0x9a, 0x27, 0xc9, 0xff, 0x4b, - 0x97, 0x84, 0x6f, 0x94, 0x22, 0x4e, 0x0d, 0xa0, 0x97, 0x50, 0xf3, 0x98, 0x15, 0xa5, 0x5e, 0x4f, - 0x3b, 0xc8, 0xbd, 0x4f, 0x3e, 0x0b, 0x06, 0x8f, 0x65, 0x6b, 0xe3, 0x39, 0x68, 0x8b, 0x76, 0xd1, - 0x3a, 0xac, 0xfe, 0x66, 0xd8, 0x97, 0xa1, 0xb7, 0x0e, 0xab, 0xef, 0x5b, 0xdd, 0x93, 0x24, 0xf2, - 0x06, 0xb8, 0x3f, 0xea, 0x6b, 0x45, 0xe3, 0x5f, 0x05, 0x28, 0x27, 0x3d, 0x02, 0x7d, 0x37, 0xd3, - 0x2c, 0x0b, 0xd7, 0xa6, 0xd0, 0xf1, 0x41, 0xd4, 0x3f, 0xfb, 0x13, 0xb5, 0xc5, 0x35, 0x1d, 0x73, - 0x17, 0xd6, 0xe5, 0xd8, 0x10, 0x85, 0xd4, 0x4e, 0xc7, 0xbf, 0x4f, 0xb6, 0xbd, 0x4a, 0xc8, 0x9c, - 0x61, 0x48, 0xed, 0xc5, 0xbc, 0x2d, 0xdd, 0x3e, 0x6f, 0x8d, 0xbf, 0x17, 0xa1, 0xb1, 0x74, 0x2c, - 0xd4, 0x86, 0xb2, 0x4f, 0xce, 0xa8, 0x9f, 0xfd, 0xa2, 0xfd, 0xe2, 0xa6, 0x8b, 0x34, 0x4f, 0x14, - 0x3c, 0xfb, 0xcd, 0x52, 0x04, 0x1a, 0x42, 0x8d, 0x04, 0x01, 0x13, 0x6a, 0xf0, 0xcc, 0xfe, 0xd5, - 0x9e, 0xdf, 0x68, 0xaa, 0x35, 0xd5, 0x49, 0xec, 0xcd, 0x5a, 0x91, 0xed, 0x64, 0x66, 0xaf, 0xdb, - 0xb4, 0x93, 0xed, 0x57, 0xa0, 0x2d, 0xda, 0xbe, 0x8d, 0xbe, 0xf1, 0xd7, 0x02, 0x94, 0x86, 0x1f, - 0x7c, 0x74, 0x1f, 0xaa, 0x91, 0x20, 0x82, 0x8e, 0x69, 0x20, 0x52, 0xcd, 0x29, 0x03, 0xbd, 0x80, - 0x8a, 0xe3, 0x11, 0x9f, 0xda, 0x22, 0xad, 0x09, 0xdb, 0xcb, 0x43, 0x42, 0xb3, 0x9d, 0x20, 0x70, - 0x06, 0x35, 0xf6, 0xa1, 0x92, 0xf2, 0xe4, 0xbf, 0xc4, 0x69, 0xaf, 0x6d, 0xbe, 0xe9, 0xf4, 0xcc, - 0x76, 0x12, 0x76, 0xad, 0xde, 0xb0, 0xa3, 0x15, 0xe4, 0xea, 0xa8, 0xf3, 0xce, 0xd4, 0x8a, 0xd3, - 0x3f, 0x8f, 0xd2, 0xe1, 0x77, 0xbf, 0x7b, 0xe9, 0x7a, 0xe2, 0x22, 0x3e, 0x6b, 0xda, 0x6c, 0xbc, - 0xa3, 0x76, 0x62, 0xdc, 0x4d, 0x16, 0x3b, 0xf9, 0x5f, 0xbd, 0x4b, 0x83, 0x9d, 0xf0, 0xec, 0x99, - 0xcb, 0x76, 0xe6, 0x7e, 0xf4, 0xcf, 0xca, 0x2a, 0xb6, 0xbe, 0xf9, 0x7f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x38, 0x99, 0xc1, 0xfb, 0x87, 0x10, 0x00, 0x00, + 0x77, 0xbd, 0xe8, 0x00, 0xfc, 0xd1, 0x8f, 0x9d, 0x78, 0x7c, 0x45, 0x9c, 0x73, 0xbe, 0x73, 0x00, + 0x1c, 0x9c, 0x3f, 0xc2, 0xbd, 0x33, 0x7f, 0x2a, 0xa8, 0xe7, 0xf8, 0x3b, 0x36, 0xe3, 0x74, 0x47, + 0x90, 0xe8, 0x22, 0x6a, 0x86, 0x9c, 0x09, 0x86, 0xea, 0x99, 0xa8, 0x29, 0x45, 0xdb, 0x0f, 0x17, + 0x91, 0x9e, 0x43, 0x03, 0xe1, 0x9d, 0x79, 0x94, 0x27, 0xf0, 0xed, 0x07, 0x4b, 0xf2, 0x40, 0x50, + 0x7e, 0x46, 0x6c, 0x9a, 0x8a, 0xef, 0x2f, 0x8a, 0x7d, 0x4f, 0x50, 0x4e, 0xfc, 0xe8, 0x7a, 0x69, + 0x44, 0xed, 0x98, 0x7b, 0x62, 0x9a, 0x4a, 0x1f, 0xba, 0x8c, 0xb9, 0x3e, 0xdd, 0x51, 0xd4, 0x69, + 0x7c, 0xb6, 0xe3, 0xc4, 0x9c, 0x08, 0x8f, 0x05, 0x99, 0xf6, 0xb2, 0x3c, 0x12, 0x3c, 0xb6, 0x45, + 0x22, 0x35, 0xfe, 0x5d, 0x84, 0x2a, 0xa6, 0x11, 0x8b, 0xb9, 0x4d, 0x23, 0x74, 0x00, 0xeb, 0x9c, + 0x7e, 0x88, 0x69, 0x24, 0x22, 0xbd, 0xf0, 0xa8, 0xf4, 0xb4, 0xd6, 0x7a, 0xdc, 0x5c, 0xb8, 0x68, + 0x33, 0xc7, 0xe6, 0x2b, 0x33, 0x10, 0x7c, 0x8a, 0x73, 0x3d, 0xf4, 0x0a, 0xca, 0xbe, 0x37, 0xf1, + 0x44, 0xa4, 0x17, 0x6f, 0x65, 0x21, 0xd5, 0xda, 0xfe, 0x23, 0xd4, 0x17, 0x04, 0xe8, 0x5b, 0x58, + 0x0d, 0xc8, 0x84, 0xea, 0x85, 0x47, 0x85, 0xa7, 0x9b, 0xad, 0xaf, 0x6e, 0x34, 0xd7, 0x27, 0x13, + 0x8a, 0x95, 0x0a, 0xfa, 0x12, 0xd6, 0x2e, 0x89, 0x1f, 0x53, 0xbd, 0xf8, 0xa8, 0xf0, 0xb4, 0x8a, + 0x13, 0xc2, 0xf8, 0x03, 0x6c, 0xcc, 0x63, 0x51, 0x0d, 0x2a, 0x27, 0xfd, 0xa3, 0xfe, 0xe0, 0xfb, + 0xbe, 0xb6, 0x82, 0x2a, 0x50, 0x7a, 0x3d, 0x3c, 0xd1, 0x0a, 0x72, 0xf1, 0x76, 0x78, 0xa2, 0x15, + 0x11, 0x40, 0xb9, 0x67, 0xf6, 0x06, 0xf8, 0xbd, 0x56, 0x92, 0xd0, 0xd1, 0x78, 0x80, 0xdb, 0x6f, + 0x4d, 0x6d, 0x15, 0xdd, 0x81, 0x86, 0x39, 0x3c, 0x34, 0x7b, 0x26, 0x6e, 0x1f, 0x5b, 0x19, 0x7b, + 0xcd, 0xf8, 0x4b, 0x01, 0x36, 0xdf, 0x0e, 0x4f, 0xda, 0xb6, 0x4d, 0x7d, 0xca, 0x89, 0x60, 0x1c, + 0xdd, 0x85, 0xb2, 0x43, 0x2f, 0x3d, 0x3b, 0xb9, 0x44, 0x15, 0xa7, 0x14, 0x7a, 0x0c, 0xf5, 0x38, + 0x08, 0x09, 0x17, 0x9e, 0x7c, 0x30, 0xea, 0xa8, 0x73, 0xae, 0x1f, 0xae, 0xe0, 0x45, 0x36, 0x7a, + 0x02, 0x9b, 0x39, 0x69, 0x45, 0xde, 0x47, 0xaa, 0x97, 0xa4, 0x1d, 0x09, 0xcc, 0xf9, 0x23, 0xef, + 0x23, 0x3d, 0xb8, 0x0b, 0x5f, 0x2e, 0x02, 0xad, 0xe4, 0xca, 0xbf, 0x87, 0x86, 0xf9, 0x83, 0xa0, + 0x81, 0x43, 0x9d, 0xd9, 0x6b, 0xbf, 0x81, 0x2d, 0x37, 0x8c, 0x2d, 0x32, 0x3b, 0xa8, 0x3a, 0x5e, + 0xad, 0xf5, 0x60, 0xc9, 0xc7, 0x8b, 0xb7, 0xc1, 0x9b, 0x6e, 0x18, 0xcf, 0xd1, 0xc6, 0x3f, 0x0a, + 0xb0, 0x85, 0xe3, 0x40, 0x78, 0x13, 0xda, 0xa3, 0x82, 0x38, 0x44, 0x10, 0xf4, 0x0a, 0x56, 0xc5, + 0x34, 0xcc, 0x1e, 0xed, 0xeb, 0xe5, 0x47, 0x5b, 0x44, 0x67, 0xf4, 0x78, 0x1a, 0x52, 0xac, 0xf4, + 0x90, 0x0e, 0x95, 0x4b, 0xca, 0x23, 0x8f, 0x05, 0xe9, 0xdb, 0x65, 0xa4, 0xf4, 0xe5, 0x99, 0x4f, + 0x2e, 0x19, 0x4f, 0x7c, 0x80, 0x53, 0xca, 0x78, 0x02, 0xb5, 0x39, 0x33, 0xa8, 0x0a, 0x6b, 0x83, + 0xf1, 0xa1, 0x89, 0xb5, 0x15, 0x54, 0x87, 0xea, 0x9b, 0xe3, 0xf7, 0x63, 0xd3, 0x1a, 0x75, 0x8e, + 0xb4, 0x82, 0xf1, 0xdf, 0x55, 0xd8, 0x18, 0x93, 0xe8, 0x22, 0x3f, 0xab, 0x01, 0x1b, 0x8e, 0x17, + 0xd9, 0xec, 0x92, 0x72, 0x72, 0xea, 0x27, 0x67, 0x5e, 0xc7, 0x0b, 0x3c, 0xb4, 0x0f, 0x15, 0x9e, + 0x58, 0x57, 0xe7, 0xa9, 0xb5, 0x1e, 0x7e, 0xfe, 0x4a, 0x38, 0x83, 0xa3, 0x6f, 0xa0, 0x22, 0xbf, + 0x2c, 0x16, 0xfa, 0xaa, 0xd2, 0xbc, 0xd7, 0x4c, 0x32, 0xb2, 0x99, 0x65, 0x64, 0xb3, 0x93, 0x66, + 0x2c, 0xce, 0x90, 0x68, 0x17, 0x2a, 0x9c, 0x0a, 0xee, 0xd1, 0x48, 0x5f, 0x53, 0x4a, 0xf7, 0xaf, + 0x84, 0xbd, 0xe0, 0xd3, 0x91, 0xe0, 0x44, 0x50, 0x77, 0x8a, 0x33, 0x30, 0xfa, 0x39, 0x34, 0xb2, + 0x63, 0x4f, 0xad, 0xcc, 0x81, 0x65, 0xe5, 0x27, 0x2d, 0x17, 0xbc, 0x4b, 0x3d, 0xb9, 0x0f, 0xba, + 0x43, 0x43, 0x4e, 0x6d, 0x22, 0xa8, 0x63, 0x51, 0xce, 0x19, 0xb7, 0x26, 0x34, 0x8a, 0x88, 0x4b, + 0xf5, 0x8a, 0xd2, 0xb9, 0x3b, 0x93, 0x9b, 0x52, 0xdc, 0x4b, 0xa4, 0x32, 0x6e, 0x55, 0x09, 0xe3, + 0x71, 0x28, 0x3c, 0xe9, 0xb2, 0xf5, 0x2c, 0x6e, 0x17, 0xd8, 0xe8, 0x19, 0x20, 0x9b, 0xd8, 0xe7, + 0xd4, 0x8a, 0x28, 0xf7, 0x88, 0xef, 0x7d, 0x54, 0xfe, 0xad, 0x2a, 0xff, 0x36, 0x94, 0x64, 0x34, + 0x27, 0x40, 0x5f, 0xc1, 0xa6, 0x4b, 0x03, 0x19, 0x55, 0x34, 0xb2, 0x1c, 0x6a, 0x5f, 0xe8, 0xa0, + 0xa0, 0xf5, 0x9c, 0xdb, 0xa1, 0xf6, 0x85, 0x2c, 0x08, 0x82, 0xb8, 0x91, 0x5e, 0x53, 0xf5, 0x65, + 0xb9, 0x20, 0xcc, 0x3f, 0x6d, 0x73, 0x4c, 0xdc, 0x28, 0x29, 0x2f, 0x4a, 0x05, 0x7d, 0x0d, 0x8d, + 0x90, 0x39, 0x96, 0xa0, 0x93, 0xd0, 0x27, 0x82, 0x5a, 0xaa, 0xb0, 0x6c, 0xa8, 0xbb, 0x6e, 0x85, + 0xcc, 0x19, 0xa7, 0x7c, 0x59, 0x16, 0xb6, 0xf7, 0xa0, 0x9a, 0xab, 0x23, 0x0d, 0x4a, 0x17, 0x74, + 0x9a, 0xa6, 0xaf, 0x5c, 0x5e, 0x5f, 0x5b, 0x5e, 0x16, 0xf7, 0x0b, 0x07, 0x77, 0xe0, 0x8b, 0x05, + 0x37, 0xa4, 0x39, 0xf8, 0x9f, 0xb5, 0x24, 0xee, 0xb2, 0x4d, 0xd0, 0xcf, 0xa0, 0xe8, 0x39, 0x69, + 0xca, 0xdd, 0x5b, 0xba, 0x45, 0x37, 0xef, 0x20, 0xb8, 0xe8, 0x39, 0x08, 0xa5, 0xe9, 0x94, 0xec, + 0x95, 0xa4, 0xc8, 0x1e, 0xac, 0x4f, 0xd2, 0x7b, 0xaa, 0x54, 0xa8, 0xb5, 0x7e, 0xfc, 0x19, 0x57, + 0xe0, 0x1c, 0x8c, 0x7e, 0x05, 0xd5, 0xbc, 0x01, 0xa5, 0x31, 0xb9, 0x9c, 0xf1, 0x32, 0x85, 0x9c, + 0x6e, 0x06, 0xc2, 0x33, 0x3c, 0xda, 0x81, 0xb2, 0x1d, 0x47, 0x82, 0x4d, 0xd2, 0xc0, 0xfc, 0xd1, + 0x95, 0x68, 0x1e, 0xa9, 0xfe, 0x82, 0x53, 0x18, 0xda, 0x87, 0xaa, 0xcd, 0x02, 0x41, 0xbc, 0x80, + 0x72, 0x15, 0x8a, 0xb5, 0x96, 0xbe, 0xb4, 0xdb, 0xeb, 0x4c, 0x7e, 0xb8, 0x82, 0x67, 0x60, 0xf4, + 0x4b, 0xa8, 0x5c, 0xec, 0x47, 0x56, 0xc8, 0x1c, 0xbd, 0xa1, 0xf4, 0xee, 0x2c, 0xe9, 0x1d, 0xed, + 0x47, 0x43, 0xe6, 0x1c, 0xae, 0xe0, 0xf2, 0x85, 0x5a, 0xa1, 0xc7, 0x50, 0x8a, 0x3e, 0xf8, 0x3a, + 0x52, 0x68, 0xb4, 0x84, 0x1e, 0x7d, 0xf0, 0x0f, 0x57, 0xb0, 0x04, 0xc8, 0x30, 0x90, 0xcd, 0xdc, + 0x92, 0x7e, 0xcc, 0xd3, 0x44, 0x86, 0xfc, 0x1a, 0xde, 0x92, 0x02, 0x79, 0xfd, 0x2c, 0x4b, 0xba, + 0xa0, 0x65, 0x1d, 0xd7, 0x92, 0x67, 0xa3, 0x3f, 0x08, 0x15, 0xee, 0x57, 0x4b, 0xc0, 0x28, 0x85, + 0xbd, 0x4e, 0x50, 0x78, 0x2b, 0x5a, 0x64, 0xa0, 0x01, 0x20, 0x9a, 0x56, 0x61, 0x8b, 0x67, 0x65, + 0x58, 0xa5, 0x43, 0xad, 0xf5, 0x68, 0xc9, 0xd8, 0x95, 0x72, 0x8d, 0x1b, 0xf4, 0x4a, 0x05, 0xff, + 0x35, 0x94, 0x6d, 0x16, 0x9c, 0x79, 0xae, 0xae, 0xa9, 0x5c, 0x78, 0x72, 0x4d, 0x00, 0x64, 0xe1, + 0x26, 0xbd, 0x7c, 0xe6, 0xb9, 0x69, 0xb3, 0x4d, 0xd4, 0xb6, 0xbf, 0x85, 0xda, 0x1c, 0xfb, 0x56, + 0x51, 0xbe, 0x0e, 0x65, 0x41, 0xb8, 0x4b, 0x85, 0xb1, 0x0b, 0xf5, 0xfc, 0x05, 0x87, 0x8c, 0x0b, + 0x99, 0xc7, 0xf9, 0x2b, 0x5a, 0x21, 0xe3, 0x42, 0x59, 0xac, 0xe3, 0xba, 0x3d, 0x0f, 0x33, 0xfe, + 0x57, 0x82, 0x6a, 0xae, 0x28, 0x77, 0xf2, 0x26, 0xb2, 0xf4, 0x24, 0xbb, 0x27, 0x84, 0xec, 0x03, + 0x36, 0x9b, 0x4c, 0x48, 0xe0, 0xa8, 0x71, 0xa2, 0x8a, 0x33, 0x52, 0xa6, 0x04, 0xe1, 0x6e, 0xa4, + 0x97, 0x14, 0x5b, 0xad, 0xd1, 0x2e, 0x54, 0x67, 0x7e, 0x5d, 0xbd, 0x36, 0xd6, 0x66, 0xfe, 0x9c, + 0x41, 0xd1, 0x33, 0x28, 0xd1, 0xe0, 0x52, 0x5f, 0x53, 0x4e, 0x5c, 0xce, 0xa2, 0x23, 0x3a, 0x7d, + 0x27, 0x6f, 0x3d, 0x24, 0x1e, 0xc7, 0x12, 0x87, 0xf6, 0x72, 0xb7, 0x97, 0x6f, 0xd4, 0x38, 0x28, + 0xea, 0x85, 0xcc, 0xdd, 0xa8, 0x05, 0x6b, 0xd2, 0x1d, 0x91, 0x5e, 0x51, 0x7a, 0xf7, 0x3f, 0x95, + 0x07, 0xd2, 0x3d, 0x38, 0x81, 0xa2, 0x36, 0xd4, 0x64, 0xd6, 0x5a, 0xe9, 0x8e, 0xd7, 0x47, 0x4b, + 0x87, 0x08, 0x72, 0xcc, 0x88, 0xe3, 0x05, 0x6e, 0xf2, 0x9e, 0x18, 0xa4, 0x52, 0xb2, 0x46, 0x5d, + 0xd8, 0x20, 0xdc, 0x3e, 0xf7, 0x04, 0xb5, 0x45, 0xcc, 0xa9, 0xaa, 0xaa, 0x57, 0x27, 0xa9, 0x7c, + 0xf7, 0x66, 0x7b, 0x0e, 0x8c, 0x17, 0x54, 0x8d, 0x2e, 0x6c, 0xcc, 0x4b, 0x17, 0x67, 0xa7, 0x2a, + 0xac, 0xb5, 0x7b, 0x9d, 0xdd, 0x17, 0x5a, 0x41, 0x2d, 0x71, 0x6f, 0xf7, 0x45, 0x32, 0x3f, 0xb5, + 0x71, 0xcf, 0x7a, 0xb7, 0xab, 0x95, 0xf2, 0xf5, 0x9e, 0xb6, 0x6a, 0xfc, 0xb3, 0x08, 0xd0, 0x1d, + 0x64, 0x3d, 0x0c, 0x1d, 0x41, 0xdd, 0x61, 0x7f, 0x0e, 0x7c, 0x46, 0x1c, 0x6b, 0xc2, 0x9c, 0x6c, + 0x74, 0x58, 0x1e, 0x1f, 0x67, 0x1a, 0xcd, 0x4e, 0x0a, 0xef, 0x31, 0x87, 0xe2, 0x0d, 0x67, 0x8e, + 0x42, 0x26, 0xd4, 0xe2, 0x70, 0x66, 0xaa, 0xa8, 0x4c, 0xfd, 0xf4, 0xd3, 0xa6, 0x4e, 0xc2, 0xdc, + 0x10, 0xc4, 0xf9, 0xda, 0x38, 0x86, 0x8d, 0xf9, 0x4d, 0x10, 0x82, 0xcd, 0xce, 0xe0, 0xfb, 0xfe, + 0xf1, 0xa0, 0xdd, 0xb1, 0xcc, 0xf6, 0x5b, 0x35, 0x5d, 0x7c, 0x01, 0x5b, 0x39, 0x6f, 0x34, 0xc6, + 0x66, 0xbb, 0xa7, 0x15, 0x12, 0xa6, 0xd5, 0x1f, 0x8c, 0xad, 0x4c, 0xa6, 0x15, 0x0d, 0x13, 0x60, + 0xb6, 0x8f, 0xb4, 0x75, 0x32, 0x54, 0x5a, 0x83, 0xbe, 0x65, 0xfe, 0xb6, 0x3b, 0xd6, 0x56, 0x90, + 0x06, 0x1b, 0x29, 0x2f, 0xb1, 0x5e, 0x40, 0x0d, 0xa8, 0xa7, 0x86, 0x12, 0x81, 0x56, 0x34, 0xfe, + 0x56, 0x84, 0xc6, 0x95, 0xf7, 0x96, 0x89, 0x42, 0x03, 0xd9, 0x45, 0x9d, 0x74, 0x7e, 0xc9, 0x48, + 0xf4, 0x00, 0xc0, 0x0b, 0xc2, 0x58, 0x58, 0x21, 0x11, 0xe7, 0x69, 0x1e, 0x57, 0x15, 0x67, 0x48, + 0xc4, 0x39, 0xfa, 0x09, 0xd4, 0x58, 0x2c, 0x72, 0x79, 0x32, 0x54, 0x41, 0xc2, 0x52, 0x80, 0x2e, + 0x94, 0xcf, 0x18, 0x9f, 0x90, 0x64, 0x7e, 0xd9, 0x6c, 0x3d, 0xbf, 0x29, 0xf6, 0x9a, 0xc7, 0xc9, + 0xff, 0x4b, 0x8f, 0x84, 0x6f, 0x94, 0x22, 0x4e, 0x0d, 0xa0, 0x97, 0x50, 0xf3, 0x98, 0x15, 0xa5, + 0x5e, 0x4f, 0x3b, 0xc8, 0xbd, 0x4f, 0x3e, 0x0b, 0x06, 0x8f, 0x65, 0x6b, 0xe3, 0x39, 0x68, 0xcb, + 0x76, 0xd1, 0x3a, 0xac, 0xfe, 0x66, 0x34, 0x90, 0xa1, 0xb7, 0x0e, 0xab, 0xef, 0xdb, 0xbd, 0xe3, + 0x24, 0xf2, 0x86, 0x78, 0x30, 0x1e, 0x68, 0x45, 0xe3, 0x5f, 0x05, 0x28, 0x27, 0x3d, 0x02, 0x7d, + 0x37, 0xd7, 0x2c, 0x0b, 0xd7, 0xa6, 0xd0, 0xd1, 0x7e, 0x34, 0x38, 0xfd, 0x13, 0xb5, 0xc5, 0x35, + 0x1d, 0xb3, 0x05, 0xeb, 0x72, 0x6c, 0x88, 0x42, 0x6a, 0xa7, 0xe3, 0xdf, 0x27, 0xdb, 0x5e, 0x25, + 0x64, 0xce, 0x28, 0xa4, 0xf6, 0x72, 0xde, 0x96, 0x6e, 0x9f, 0xb7, 0xc6, 0xdf, 0x8b, 0xd0, 0xb8, + 0x72, 0x2c, 0xd4, 0x81, 0xb2, 0x4f, 0x4e, 0xa9, 0x9f, 0xfd, 0xa2, 0xfd, 0xe2, 0xa6, 0x8b, 0x34, + 0x8f, 0x15, 0x3c, 0xfb, 0xcd, 0x52, 0x04, 0x1a, 0x41, 0x8d, 0x04, 0x01, 0x13, 0x6a, 0xf0, 0xcc, + 0xfe, 0xd5, 0x9e, 0xdf, 0x68, 0xaa, 0x3d, 0xd3, 0x49, 0xec, 0xcd, 0x5b, 0x91, 0xed, 0x64, 0x6e, + 0xaf, 0xdb, 0xb4, 0x93, 0xed, 0x57, 0xa0, 0x2d, 0xdb, 0xbe, 0x8d, 0xbe, 0xf1, 0xd7, 0x02, 0x94, + 0x46, 0x1f, 0x7c, 0x74, 0x1f, 0xaa, 0x91, 0x20, 0x82, 0x4e, 0x68, 0x20, 0x52, 0xcd, 0x19, 0x03, + 0xbd, 0x80, 0x8a, 0xe3, 0x11, 0x9f, 0xda, 0x22, 0xad, 0x09, 0xdb, 0x57, 0x87, 0x84, 0x66, 0x27, + 0x41, 0xe0, 0x0c, 0x6a, 0xec, 0x41, 0x25, 0xe5, 0xc9, 0x7f, 0x89, 0x93, 0x7e, 0xc7, 0x7c, 0xd3, + 0xed, 0x9b, 0x9d, 0x24, 0xec, 0xda, 0xfd, 0x51, 0x57, 0x2b, 0xc8, 0xd5, 0x61, 0xf7, 0x9d, 0xa9, + 0x15, 0x67, 0x7f, 0x1e, 0xa5, 0x83, 0xef, 0x7e, 0xf7, 0xd2, 0xf5, 0xc4, 0x79, 0x7c, 0xda, 0xb4, + 0xd9, 0x64, 0x47, 0xed, 0xc4, 0xb8, 0x9b, 0x2c, 0x76, 0xf2, 0xbf, 0x7a, 0x97, 0x06, 0x3b, 0xe1, + 0xe9, 0x33, 0x97, 0xed, 0x2c, 0xfc, 0xe8, 0x9f, 0x96, 0x55, 0x6c, 0x7d, 0xf3, 0xff, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x61, 0xf6, 0x49, 0xdf, 0x87, 0x10, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-java/flyteidl/core/Tasks.java b/flyteidl/gen/pb-java/flyteidl/core/Tasks.java index b277831c8c..d4416668c6 100644 --- a/flyteidl/gen/pb-java/flyteidl/core/Tasks.java +++ b/flyteidl/gen/pb-java/flyteidl/core/Tasks.java @@ -3291,7 +3291,7 @@ public interface ExtendedResourcesOrBuilder extends * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ boolean hasGpuAccelerator(); /** @@ -3300,7 +3300,7 @@ public interface ExtendedResourcesOrBuilder extends * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator(); /** @@ -3309,7 +3309,7 @@ public interface ExtendedResourcesOrBuilder extends * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder(); } @@ -3357,7 +3357,7 @@ private ExtendedResources( case 0: done = true; break; - case 26: { + case 10: { flyteidl.core.Tasks.GPUAccelerator.Builder subBuilder = null; if (gpuAccelerator_ != null) { subBuilder = gpuAccelerator_.toBuilder(); @@ -3402,7 +3402,7 @@ private ExtendedResources( flyteidl.core.Tasks.ExtendedResources.class, flyteidl.core.Tasks.ExtendedResources.Builder.class); } - public static final int GPU_ACCELERATOR_FIELD_NUMBER = 3; + public static final int GPU_ACCELERATOR_FIELD_NUMBER = 1; private flyteidl.core.Tasks.GPUAccelerator gpuAccelerator_; /** * 
@@ -3410,7 +3410,7 @@ private ExtendedResources(
      * for multi-instance GPUs, the partition size to use.
      *
* - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public boolean hasGpuAccelerator() { return gpuAccelerator_ != null; @@ -3421,7 +3421,7 @@ public boolean hasGpuAccelerator() { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator() { return gpuAccelerator_ == null ? flyteidl.core.Tasks.GPUAccelerator.getDefaultInstance() : gpuAccelerator_; @@ -3432,7 +3432,7 @@ public flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator() { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder() { return getGpuAccelerator(); @@ -3453,7 +3453,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (gpuAccelerator_ != null) { - output.writeMessage(3, getGpuAccelerator()); + output.writeMessage(1, getGpuAccelerator()); } unknownFields.writeTo(output); } @@ -3466,7 +3466,7 @@ public int getSerializedSize() { size = 0; if (gpuAccelerator_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getGpuAccelerator()); + .computeMessageSize(1, getGpuAccelerator()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -3767,7 +3767,7 @@ public Builder mergeFrom( * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public boolean hasGpuAccelerator() { return gpuAcceleratorBuilder_ != null || gpuAccelerator_ != null; @@ -3778,7 +3778,7 @@ public boolean hasGpuAccelerator() { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator() { if (gpuAcceleratorBuilder_ == null) { @@ -3793,7 +3793,7 @@ public flyteidl.core.Tasks.GPUAccelerator getGpuAccelerator() { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public Builder setGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) { if (gpuAcceleratorBuilder_ == null) { @@ -3814,7 +3814,7 @@ public Builder setGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public Builder setGpuAccelerator( flyteidl.core.Tasks.GPUAccelerator.Builder builderForValue) { @@ -3833,7 +3833,7 @@ public Builder setGpuAccelerator( * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public Builder mergeGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) { if (gpuAcceleratorBuilder_ == null) { @@ -3856,7 +3856,7 @@ public Builder mergeGpuAccelerator(flyteidl.core.Tasks.GPUAccelerator value) { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public Builder clearGpuAccelerator() { if (gpuAcceleratorBuilder_ == null) { @@ -3875,7 +3875,7 @@ public Builder clearGpuAccelerator() { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public flyteidl.core.Tasks.GPUAccelerator.Builder getGpuAcceleratorBuilder() { @@ -3888,7 +3888,7 @@ public flyteidl.core.Tasks.GPUAccelerator.Builder getGpuAcceleratorBuilder() { * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ public flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder() { if (gpuAcceleratorBuilder_ != null) { @@ -3904,7 +3904,7 @@ public flyteidl.core.Tasks.GPUAcceleratorOrBuilder getGpuAcceleratorOrBuilder() * for multi-instance GPUs, the partition size to use. * * - * .flyteidl.core.GPUAccelerator gpu_accelerator = 3; + * .flyteidl.core.GPUAccelerator gpu_accelerator = 1; */ private com.google.protobuf.SingleFieldBuilderV3< flyteidl.core.Tasks.GPUAccelerator, flyteidl.core.Tasks.GPUAccelerator.Builder, flyteidl.core.Tasks.GPUAcceleratorOrBuilder> @@ -20635,7 +20635,7 @@ public flyteidl.core.Tasks.Sql getDefaultInstanceForType() { "ice\030\001 \001(\t\022\027\n\runpartitioned\030\002 \001(\010H\000\022\030\n\016pa" + "rtition_size\030\003 \001(\tH\000B\026\n\024partition_size_v" + "alue\"K\n\021ExtendedResources\0226\n\017gpu_acceler" + - "ator\030\003 \001(\0132\035.flyteidl.core.GPUAccelerato" + + "ator\030\001 \001(\0132\035.flyteidl.core.GPUAccelerato" + "r\"\225\001\n\017RuntimeMetadata\0228\n\004type\030\001 \001(\0162*.fl" + "yteidl.core.RuntimeMetadata.RuntimeType\022" + "\017\n\007version\030\002 \001(\t\022\016\n\006flavor\030\003 \001(\t\"\'\n\013Runt" + diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js index a540700640..3bfedddf6c 100644 --- a/flyteidl/gen/pb-js/flyteidl.js +++ b/flyteidl/gen/pb-js/flyteidl.js @@ -12517,7 +12517,7 @@ if (!writer) writer = $Writer.create(); if (message.gpuAccelerator != null && message.hasOwnProperty("gpuAccelerator")) - $root.flyteidl.core.GPUAccelerator.encode(message.gpuAccelerator, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + $root.flyteidl.core.GPUAccelerator.encode(message.gpuAccelerator, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; @@ -12539,7 +12539,7 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 3: + case 1: message.gpuAccelerator = $root.flyteidl.core.GPUAccelerator.decode(reader, reader.uint32()); break; default: diff --git a/flyteidl/gen/pb_python/flyteidl/core/tasks_pb2.py b/flyteidl/gen/pb_python/flyteidl/core/tasks_pb2.py index 94eedfd6b0..ba28b4716f 100644 --- a/flyteidl/gen/pb_python/flyteidl/core/tasks_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/core/tasks_pb2.py @@ -19,7 +19,7 @@ from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x66lyteidl/core/tasks.proto\x12\rflyteidl.core\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xd0\x02\n\tResources\x12\x42\n\x08requests\x18\x01 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x08requests\x12>\n\x06limits\x18\x02 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x06limits\x1a`\n\rResourceEntry\x12\x39\n\x04name\x18\x01 \x01(\x0e\x32%.flyteidl.core.Resources.ResourceNameR\x04name\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"]\n\x0cResourceName\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x43PU\x10\x01\x12\x07\n\x03GPU\x10\x02\x12\n\n\x06MEMORY\x10\x03\x12\x0b\n\x07STORAGE\x10\x04\x12\x15\n\x11\x45PHEMERAL_STORAGE\x10\x05\"\x91\x01\n\x0eGPUAccelerator\x12\x16\n\x06\x64\x65vice\x18\x01 \x01(\tR\x06\x64\x65vice\x12&\n\runpartitioned\x18\x02 \x01(\x08H\x00R\runpartitioned\x12\'\n\x0epartition_size\x18\x03 \x01(\tH\x00R\rpartitionSizeB\x16\n\x14partition_size_value\"[\n\x11\x45xtendedResources\x12\x46\n\x0fgpu_accelerator\x18\x03 \x01(\x0b\x32\x1d.flyteidl.core.GPUAcceleratorR\x0egpuAccelerator\"\xac\x01\n\x0fRuntimeMetadata\x12>\n\x04type\x18\x01 \x01(\x0e\x32*.flyteidl.core.RuntimeMetadata.RuntimeTypeR\x04type\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\x12\x16\n\x06\x66lavor\x18\x03 \x01(\tR\x06\x66lavor\"\'\n\x0bRuntimeType\x12\t\n\x05OTHER\x10\x00\x12\r\n\tFLYTE_SDK\x10\x01\"\xf5\x04\n\x0cTaskMetadata\x12\"\n\x0c\x64iscoverable\x18\x01 \x01(\x08R\x0c\x64iscoverable\x12\x38\n\x07runtime\x18\x02 \x01(\x0b\x32\x1e.flyteidl.core.RuntimeMetadataR\x07runtime\x12\x33\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationR\x07timeout\x12\x36\n\x07retries\x18\x05 \x01(\x0b\x32\x1c.flyteidl.core.RetryStrategyR\x07retries\x12+\n\x11\x64iscovery_version\x18\x06 \x01(\tR\x10\x64iscoveryVersion\x12\x38\n\x18\x64\x65precated_error_message\x18\x07 \x01(\tR\x16\x64\x65precatedErrorMessage\x12&\n\rinterruptible\x18\x08 \x01(\x08H\x00R\rinterruptible\x12-\n\x12\x63\x61\x63he_serializable\x18\t \x01(\x08R\x11\x63\x61\x63heSerializable\x12%\n\x0egenerates_deck\x18\n \x01(\x08R\rgeneratesDeck\x12\x39\n\x04tags\x18\x0b \x03(\x0b\x32%.flyteidl.core.TaskMetadata.TagsEntryR\x04tags\x12*\n\x11pod_template_name\x18\x0c \x01(\tR\x0fpodTemplateName\x1a\x37\n\tTagsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x15\n\x13interruptible_value\"\xd6\x05\n\x0cTaskTemplate\x12)\n\x02id\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x02id\x12\x12\n\x04type\x18\x02 \x01(\tR\x04type\x12\x37\n\x08metadata\x18\x03 \x01(\x0b\x32\x1b.flyteidl.core.TaskMetadataR\x08metadata\x12;\n\tinterface\x18\x04 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\tinterface\x12/\n\x06\x63ustom\x18\x05 \x01(\x0b\x32\x17.google.protobuf.StructR\x06\x63ustom\x12\x38\n\tcontainer\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ContainerH\x00R\tcontainer\x12\x30\n\x07k8s_pod\x18\x11 \x01(\x0b\x32\x15.flyteidl.core.K8sPodH\x00R\x06k8sPod\x12&\n\x03sql\x18\x12 \x01(\x0b\x32\x12.flyteidl.core.SqlH\x00R\x03sql\x12*\n\x11task_type_version\x18\x07 \x01(\x05R\x0ftaskTypeVersion\x12I\n\x10security_context\x18\x08 \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12O\n\x12\x65xtended_resources\x18\t \x01(\x0b\x32 .flyteidl.core.ExtendedResourcesR\x11\x65xtendedResources\x12?\n\x06\x63onfig\x18\x10 \x03(\x0b\x32\'.flyteidl.core.TaskTemplate.ConfigEntryR\x06\x63onfig\x1a\x39\n\x0b\x43onfigEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x08\n\x06target\"6\n\rContainerPort\x12%\n\x0e\x63ontainer_port\x18\x01 \x01(\rR\rcontainerPort\"\xfc\x03\n\tContainer\x12\x14\n\x05image\x18\x01 \x01(\tR\x05image\x12\x18\n\x07\x63ommand\x18\x02 \x03(\tR\x07\x63ommand\x12\x12\n\x04\x61rgs\x18\x03 \x03(\tR\x04\x61rgs\x12\x36\n\tresources\x18\x04 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x12-\n\x03\x65nv\x18\x05 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairR\x03\x65nv\x12\x37\n\x06\x63onfig\x18\x06 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairB\x02\x18\x01R\x06\x63onfig\x12\x32\n\x05ports\x18\x07 \x03(\x0b\x32\x1c.flyteidl.core.ContainerPortR\x05ports\x12\x41\n\x0b\x64\x61ta_config\x18\t \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\x12I\n\x0c\x61rchitecture\x18\n \x01(\x0e\x32%.flyteidl.core.Container.ArchitectureR\x0c\x61rchitecture\"I\n\x0c\x41rchitecture\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x41MD64\x10\x01\x12\t\n\x05\x41RM64\x10\x02\x12\n\n\x06\x41RM_V6\x10\x03\x12\n\n\x06\x41RM_V7\x10\x04\"\xb5\x02\n\nIOStrategy\x12K\n\rdownload_mode\x18\x01 \x01(\x0e\x32&.flyteidl.core.IOStrategy.DownloadModeR\x0c\x64ownloadMode\x12\x45\n\x0bupload_mode\x18\x02 \x01(\x0e\x32$.flyteidl.core.IOStrategy.UploadModeR\nuploadMode\"L\n\x0c\x44ownloadMode\x12\x12\n\x0e\x44OWNLOAD_EAGER\x10\x00\x12\x13\n\x0f\x44OWNLOAD_STREAM\x10\x01\x12\x13\n\x0f\x44O_NOT_DOWNLOAD\x10\x02\"E\n\nUploadMode\x12\x12\n\x0eUPLOAD_ON_EXIT\x10\x00\x12\x10\n\x0cUPLOAD_EAGER\x10\x01\x12\x11\n\rDO_NOT_UPLOAD\x10\x02\"\xa7\x02\n\x11\x44\x61taLoadingConfig\x12\x18\n\x07\x65nabled\x18\x01 \x01(\x08R\x07\x65nabled\x12\x1d\n\ninput_path\x18\x02 \x01(\tR\tinputPath\x12\x1f\n\x0boutput_path\x18\x03 \x01(\tR\noutputPath\x12I\n\x06\x66ormat\x18\x04 \x01(\x0e\x32\x31.flyteidl.core.DataLoadingConfig.LiteralMapFormatR\x06\x66ormat\x12:\n\x0bio_strategy\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.IOStrategyR\nioStrategy\"1\n\x10LiteralMapFormat\x12\x08\n\x04JSON\x10\x00\x12\x08\n\x04YAML\x10\x01\x12\t\n\x05PROTO\x10\x02\"\xbd\x01\n\x06K8sPod\x12<\n\x08metadata\x18\x01 \x01(\x0b\x32 .flyteidl.core.K8sObjectMetadataR\x08metadata\x12\x32\n\x08pod_spec\x18\x02 \x01(\x0b\x32\x17.google.protobuf.StructR\x07podSpec\x12\x41\n\x0b\x64\x61ta_config\x18\x03 \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\"\xa9\x02\n\x11K8sObjectMetadata\x12\x44\n\x06labels\x18\x01 \x03(\x0b\x32,.flyteidl.core.K8sObjectMetadata.LabelsEntryR\x06labels\x12S\n\x0b\x61nnotations\x18\x02 \x03(\x0b\x32\x31.flyteidl.core.K8sObjectMetadata.AnnotationsEntryR\x0b\x61nnotations\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x92\x01\n\x03Sql\x12\x1c\n\tstatement\x18\x01 \x01(\tR\tstatement\x12\x34\n\x07\x64ialect\x18\x02 \x01(\x0e\x32\x1a.flyteidl.core.Sql.DialectR\x07\x64ialect\"7\n\x07\x44ialect\x12\r\n\tUNDEFINED\x10\x00\x12\x08\n\x04\x41NSI\x10\x01\x12\x08\n\x04HIVE\x10\x02\x12\t\n\x05OTHER\x10\x03\x42\xb0\x01\n\x11\x63om.flyteidl.coreB\nTasksProtoP\x01Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x66lyteidl/core/tasks.proto\x12\rflyteidl.core\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/interface.proto\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x1c\x66lyteidl/core/security.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xd0\x02\n\tResources\x12\x42\n\x08requests\x18\x01 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x08requests\x12>\n\x06limits\x18\x02 \x03(\x0b\x32&.flyteidl.core.Resources.ResourceEntryR\x06limits\x1a`\n\rResourceEntry\x12\x39\n\x04name\x18\x01 \x01(\x0e\x32%.flyteidl.core.Resources.ResourceNameR\x04name\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value\"]\n\x0cResourceName\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x07\n\x03\x43PU\x10\x01\x12\x07\n\x03GPU\x10\x02\x12\n\n\x06MEMORY\x10\x03\x12\x0b\n\x07STORAGE\x10\x04\x12\x15\n\x11\x45PHEMERAL_STORAGE\x10\x05\"\x91\x01\n\x0eGPUAccelerator\x12\x16\n\x06\x64\x65vice\x18\x01 \x01(\tR\x06\x64\x65vice\x12&\n\runpartitioned\x18\x02 \x01(\x08H\x00R\runpartitioned\x12\'\n\x0epartition_size\x18\x03 \x01(\tH\x00R\rpartitionSizeB\x16\n\x14partition_size_value\"[\n\x11\x45xtendedResources\x12\x46\n\x0fgpu_accelerator\x18\x01 \x01(\x0b\x32\x1d.flyteidl.core.GPUAcceleratorR\x0egpuAccelerator\"\xac\x01\n\x0fRuntimeMetadata\x12>\n\x04type\x18\x01 \x01(\x0e\x32*.flyteidl.core.RuntimeMetadata.RuntimeTypeR\x04type\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\x12\x16\n\x06\x66lavor\x18\x03 \x01(\tR\x06\x66lavor\"\'\n\x0bRuntimeType\x12\t\n\x05OTHER\x10\x00\x12\r\n\tFLYTE_SDK\x10\x01\"\xf5\x04\n\x0cTaskMetadata\x12\"\n\x0c\x64iscoverable\x18\x01 \x01(\x08R\x0c\x64iscoverable\x12\x38\n\x07runtime\x18\x02 \x01(\x0b\x32\x1e.flyteidl.core.RuntimeMetadataR\x07runtime\x12\x33\n\x07timeout\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationR\x07timeout\x12\x36\n\x07retries\x18\x05 \x01(\x0b\x32\x1c.flyteidl.core.RetryStrategyR\x07retries\x12+\n\x11\x64iscovery_version\x18\x06 \x01(\tR\x10\x64iscoveryVersion\x12\x38\n\x18\x64\x65precated_error_message\x18\x07 \x01(\tR\x16\x64\x65precatedErrorMessage\x12&\n\rinterruptible\x18\x08 \x01(\x08H\x00R\rinterruptible\x12-\n\x12\x63\x61\x63he_serializable\x18\t \x01(\x08R\x11\x63\x61\x63heSerializable\x12%\n\x0egenerates_deck\x18\n \x01(\x08R\rgeneratesDeck\x12\x39\n\x04tags\x18\x0b \x03(\x0b\x32%.flyteidl.core.TaskMetadata.TagsEntryR\x04tags\x12*\n\x11pod_template_name\x18\x0c \x01(\tR\x0fpodTemplateName\x1a\x37\n\tTagsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x15\n\x13interruptible_value\"\xd6\x05\n\x0cTaskTemplate\x12)\n\x02id\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.IdentifierR\x02id\x12\x12\n\x04type\x18\x02 \x01(\tR\x04type\x12\x37\n\x08metadata\x18\x03 \x01(\x0b\x32\x1b.flyteidl.core.TaskMetadataR\x08metadata\x12;\n\tinterface\x18\x04 \x01(\x0b\x32\x1d.flyteidl.core.TypedInterfaceR\tinterface\x12/\n\x06\x63ustom\x18\x05 \x01(\x0b\x32\x17.google.protobuf.StructR\x06\x63ustom\x12\x38\n\tcontainer\x18\x06 \x01(\x0b\x32\x18.flyteidl.core.ContainerH\x00R\tcontainer\x12\x30\n\x07k8s_pod\x18\x11 \x01(\x0b\x32\x15.flyteidl.core.K8sPodH\x00R\x06k8sPod\x12&\n\x03sql\x18\x12 \x01(\x0b\x32\x12.flyteidl.core.SqlH\x00R\x03sql\x12*\n\x11task_type_version\x18\x07 \x01(\x05R\x0ftaskTypeVersion\x12I\n\x10security_context\x18\x08 \x01(\x0b\x32\x1e.flyteidl.core.SecurityContextR\x0fsecurityContext\x12O\n\x12\x65xtended_resources\x18\t \x01(\x0b\x32 .flyteidl.core.ExtendedResourcesR\x11\x65xtendedResources\x12?\n\x06\x63onfig\x18\x10 \x03(\x0b\x32\'.flyteidl.core.TaskTemplate.ConfigEntryR\x06\x63onfig\x1a\x39\n\x0b\x43onfigEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x08\n\x06target\"6\n\rContainerPort\x12%\n\x0e\x63ontainer_port\x18\x01 \x01(\rR\rcontainerPort\"\xfc\x03\n\tContainer\x12\x14\n\x05image\x18\x01 \x01(\tR\x05image\x12\x18\n\x07\x63ommand\x18\x02 \x03(\tR\x07\x63ommand\x12\x12\n\x04\x61rgs\x18\x03 \x03(\tR\x04\x61rgs\x12\x36\n\tresources\x18\x04 \x01(\x0b\x32\x18.flyteidl.core.ResourcesR\tresources\x12-\n\x03\x65nv\x18\x05 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairR\x03\x65nv\x12\x37\n\x06\x63onfig\x18\x06 \x03(\x0b\x32\x1b.flyteidl.core.KeyValuePairB\x02\x18\x01R\x06\x63onfig\x12\x32\n\x05ports\x18\x07 \x03(\x0b\x32\x1c.flyteidl.core.ContainerPortR\x05ports\x12\x41\n\x0b\x64\x61ta_config\x18\t \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\x12I\n\x0c\x61rchitecture\x18\n \x01(\x0e\x32%.flyteidl.core.Container.ArchitectureR\x0c\x61rchitecture\"I\n\x0c\x41rchitecture\x12\x0b\n\x07UNKNOWN\x10\x00\x12\t\n\x05\x41MD64\x10\x01\x12\t\n\x05\x41RM64\x10\x02\x12\n\n\x06\x41RM_V6\x10\x03\x12\n\n\x06\x41RM_V7\x10\x04\"\xb5\x02\n\nIOStrategy\x12K\n\rdownload_mode\x18\x01 \x01(\x0e\x32&.flyteidl.core.IOStrategy.DownloadModeR\x0c\x64ownloadMode\x12\x45\n\x0bupload_mode\x18\x02 \x01(\x0e\x32$.flyteidl.core.IOStrategy.UploadModeR\nuploadMode\"L\n\x0c\x44ownloadMode\x12\x12\n\x0e\x44OWNLOAD_EAGER\x10\x00\x12\x13\n\x0f\x44OWNLOAD_STREAM\x10\x01\x12\x13\n\x0f\x44O_NOT_DOWNLOAD\x10\x02\"E\n\nUploadMode\x12\x12\n\x0eUPLOAD_ON_EXIT\x10\x00\x12\x10\n\x0cUPLOAD_EAGER\x10\x01\x12\x11\n\rDO_NOT_UPLOAD\x10\x02\"\xa7\x02\n\x11\x44\x61taLoadingConfig\x12\x18\n\x07\x65nabled\x18\x01 \x01(\x08R\x07\x65nabled\x12\x1d\n\ninput_path\x18\x02 \x01(\tR\tinputPath\x12\x1f\n\x0boutput_path\x18\x03 \x01(\tR\noutputPath\x12I\n\x06\x66ormat\x18\x04 \x01(\x0e\x32\x31.flyteidl.core.DataLoadingConfig.LiteralMapFormatR\x06\x66ormat\x12:\n\x0bio_strategy\x18\x05 \x01(\x0b\x32\x19.flyteidl.core.IOStrategyR\nioStrategy\"1\n\x10LiteralMapFormat\x12\x08\n\x04JSON\x10\x00\x12\x08\n\x04YAML\x10\x01\x12\t\n\x05PROTO\x10\x02\"\xbd\x01\n\x06K8sPod\x12<\n\x08metadata\x18\x01 \x01(\x0b\x32 .flyteidl.core.K8sObjectMetadataR\x08metadata\x12\x32\n\x08pod_spec\x18\x02 \x01(\x0b\x32\x17.google.protobuf.StructR\x07podSpec\x12\x41\n\x0b\x64\x61ta_config\x18\x03 \x01(\x0b\x32 .flyteidl.core.DataLoadingConfigR\ndataConfig\"\xa9\x02\n\x11K8sObjectMetadata\x12\x44\n\x06labels\x18\x01 \x03(\x0b\x32,.flyteidl.core.K8sObjectMetadata.LabelsEntryR\x06labels\x12S\n\x0b\x61nnotations\x18\x02 \x03(\x0b\x32\x31.flyteidl.core.K8sObjectMetadata.AnnotationsEntryR\x0b\x61nnotations\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x92\x01\n\x03Sql\x12\x1c\n\tstatement\x18\x01 \x01(\tR\tstatement\x12\x34\n\x07\x64ialect\x18\x02 \x01(\x0e\x32\x1a.flyteidl.core.Sql.DialectR\x07\x64ialect\"7\n\x07\x44ialect\x12\r\n\tUNDEFINED\x10\x00\x12\x08\n\x04\x41NSI\x10\x01\x12\x08\n\x04HIVE\x10\x02\x12\t\n\x05OTHER\x10\x03\x42\xb0\x01\n\x11\x63om.flyteidl.coreB\nTasksProtoP\x01Z:github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core\xa2\x02\x03\x46\x43X\xaa\x02\rFlyteidl.Core\xca\x02\rFlyteidl\\Core\xe2\x02\x19\x46lyteidl\\Core\\GPBMetadata\xea\x02\x0e\x46lyteidl::Coreb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) diff --git a/flyteidl/gen/pb_rust/flyteidl.core.rs b/flyteidl/gen/pb_rust/flyteidl.core.rs index 3f64b3495e..b0c99fbfcb 100644 --- a/flyteidl/gen/pb_rust/flyteidl.core.rs +++ b/flyteidl/gen/pb_rust/flyteidl.core.rs @@ -1043,7 +1043,7 @@ pub mod gpu_accelerator { pub struct ExtendedResources { /// GPU accelerator to select for task. Contains information about device type, and /// for multi-instance GPUs, the partition size to use. - #[prost(message, optional, tag="3")] + #[prost(message, optional, tag="1")] pub gpu_accelerator: ::core::option::Option, } /// Runtime information. This is loosely defined to allow for extensibility. diff --git a/flyteidl/protos/flyteidl/core/tasks.proto b/flyteidl/protos/flyteidl/core/tasks.proto index 130a585da8..3d3f4b6abf 100644 --- a/flyteidl/protos/flyteidl/core/tasks.proto +++ b/flyteidl/protos/flyteidl/core/tasks.proto @@ -65,7 +65,7 @@ message GPUAccelerator { message ExtendedResources { // GPU accelerator to select for task. Contains information about device type, and // for multi-instance GPUs, the partition size to use. - GPUAccelerator gpu_accelerator = 3; + GPUAccelerator gpu_accelerator = 1; } // Runtime information. This is loosely defined to allow for extensibility. diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go index 63e35f53a9..8dc176d833 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/mpi/mpi_test.go @@ -57,14 +57,12 @@ var ( resourceRequirements = &corev1.ResourceRequirements{ Limits: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("1000m"), - corev1.ResourceMemory: resource.MustParse("1Gi"), - flytek8s.ResourceNvidiaGPU: resource.MustParse("1"), + corev1.ResourceCPU: resource.MustParse("1000m"), + corev1.ResourceMemory: resource.MustParse("1Gi"), }, Requests: corev1.ResourceList{ - corev1.ResourceCPU: resource.MustParse("100m"), - corev1.ResourceMemory: resource.MustParse("512Mi"), - flytek8s.ResourceNvidiaGPU: resource.MustParse("1"), + corev1.ResourceCPU: resource.MustParse("100m"), + corev1.ResourceMemory: resource.MustParse("512Mi"), }, } @@ -329,8 +327,7 @@ func TestBuildResourceMPI(t *testing.T) { } for _, replicaSpec := range mpiJob.Spec.MPIReplicaSpecs { - podSpec := replicaSpec.Template.Spec - for _, container := range podSpec.Containers { + for _, container := range replicaSpec.Template.Spec.Containers { assert.Equal(t, resourceRequirements.Requests, container.Resources.Requests) assert.Equal(t, resourceRequirements.Limits, container.Resources.Limits) } diff --git a/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go b/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go index 3f608198f5..a9e304842a 100644 --- a/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go +++ b/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch/pytorch_test.go @@ -378,8 +378,7 @@ func TestBuildResourcePytorch(t *testing.T) { for _, replicaSpec := range pytorchJob.Spec.PyTorchReplicaSpecs { var hasContainerWithDefaultPytorchName = false - podSpec := replicaSpec.Template.Spec - for _, container := range podSpec.Containers { + for _, container := range replicaSpec.Template.Spec.Containers { if container.Name == kubeflowv1.PytorchJobDefaultContainerName { hasContainerWithDefaultPytorchName = true }