From 854df203d1f6232b25394506a99ec81e9396ab03 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Wed, 20 Aug 2025 22:00:12 -0700 Subject: [PATCH 01/15] chore: update protobuc version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4d3309..6c1485c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: Install Go dependencies run: | - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.8 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 - name: Generate protobuf code run: make generate From b4c75346ee207a88f099e8f385c9bbc090092de8 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 01:38:06 -0700 Subject: [PATCH 02/15] chore: update generated protobuf code --- zerfoo.pb.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zerfoo.pb.go b/zerfoo.pb.go index 6fa63a8..bcda108 100644 --- a/zerfoo.pb.go +++ b/zerfoo.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.6 -// protoc v5.29.3 +// protoc v6.32.0 // source: zerfoo.proto package zmf From 3311ced988e308e56cb11309362bc852197032ce Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 01:41:03 -0700 Subject: [PATCH 03/15] chore: update protoc version in CI to match local --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c1485c..b1b1092 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,8 @@ jobs: with: go-version: '1.25' - uses: arduino/setup-protoc@v2 + with: + protoc-version: '6.32.0' - name: Install Go dependencies run: | From 8c2db526c7a64112ca853ed71b098b9de4d27cdb Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 01:43:51 -0700 Subject: [PATCH 04/15] fix: remove format package references and regenerate protobufs --- zerfoo.pb.go | 115 ++++++++++++++++++++++++++------------------------- zerfoo.proto | 2 +- 2 files changed, 59 insertions(+), 58 deletions(-) diff --git a/zerfoo.pb.go b/zerfoo.pb.go index bcda108..b72a4e7 100644 --- a/zerfoo.pb.go +++ b/zerfoo.pb.go @@ -283,7 +283,7 @@ type ValueInfo struct { // The name of the tensor. Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // The data type of the tensor. - Dtype Tensor_DataType `protobuf:"varint,2,opt,name=dtype,proto3,enum=format.Tensor_DataType" json:"dtype,omitempty"` + Dtype Tensor_DataType `protobuf:"varint,2,opt,name=dtype,proto3,enum=zmf.Tensor_DataType" json:"dtype,omitempty"` // The shape of the tensor. A value of -1 can be used for dynamic dimensions. Shape []int64 `protobuf:"varint,3,rep,packed,name=shape,proto3" json:"shape,omitempty"` unknownFields protoimpl.UnknownFields @@ -429,7 +429,7 @@ func (x *Node) GetAttributes() map[string]*Attribute { // Tensor represents a multi-dimensional array of data (e.g., a weight matrix). type Tensor struct { state protoimpl.MessageState `protogen:"open.v1"` - Dtype Tensor_DataType `protobuf:"varint,1,opt,name=dtype,proto3,enum=format.Tensor_DataType" json:"dtype,omitempty"` + Dtype Tensor_DataType `protobuf:"varint,1,opt,name=dtype,proto3,enum=zmf.Tensor_DataType" json:"dtype,omitempty"` // The shape (dimensions) of the tensor. Shape []int64 `protobuf:"varint,2,rep,packed,name=shape,proto3" json:"shape,omitempty"` // The raw tensor data, stored as bytes. @@ -773,41 +773,42 @@ var File_zerfoo_proto protoreflect.FileDescriptor const file_zerfoo_proto_rawDesc = "" + "\n" + - "\fzerfoo.proto\x12\x06format\"Z\n" + - "\x05Model\x12#\n" + - "\x05graph\x18\x01 \x01(\v2\r.format.GraphR\x05graph\x12,\n" + - "\bmetadata\x18\x02 \x01(\v2\x10.format.MetadataR\bmetadata\"\x7f\n" + + "\fzerfoo.proto\x12\x03zmf\"T\n" + + "\x05Model\x12 \n" + + "\x05graph\x18\x01 \x01(\v2\n" + + ".zmf.GraphR\x05graph\x12)\n" + + "\bmetadata\x18\x02 \x01(\v2\r.zmf.MetadataR\bmetadata\"\x7f\n" + "\bMetadata\x12#\n" + "\rproducer_name\x18\x01 \x01(\tR\fproducerName\x12)\n" + "\x10producer_version\x18\x02 \x01(\tR\x0fproducerVersion\x12#\n" + - "\ropset_version\x18\x03 \x01(\x03R\fopsetVersion\"\x91\x02\n" + - "\x05Graph\x12=\n" + + "\ropset_version\x18\x03 \x01(\x03R\fopsetVersion\"\x82\x02\n" + + "\x05Graph\x12:\n" + "\n" + - "parameters\x18\x01 \x03(\v2\x1d.format.Graph.ParametersEntryR\n" + - "parameters\x12\"\n" + - "\x05nodes\x18\x02 \x03(\v2\f.format.NodeR\x05nodes\x12)\n" + - "\x06inputs\x18\x03 \x03(\v2\x11.format.ValueInfoR\x06inputs\x12+\n" + - "\aoutputs\x18\x04 \x03(\v2\x11.format.ValueInfoR\aoutputs\x1aM\n" + + "parameters\x18\x01 \x03(\v2\x1a.zmf.Graph.ParametersEntryR\n" + + "parameters\x12\x1f\n" + + "\x05nodes\x18\x02 \x03(\v2\t.zmf.NodeR\x05nodes\x12&\n" + + "\x06inputs\x18\x03 \x03(\v2\x0e.zmf.ValueInfoR\x06inputs\x12(\n" + + "\aoutputs\x18\x04 \x03(\v2\x0e.zmf.ValueInfoR\aoutputs\x1aJ\n" + "\x0fParametersEntry\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\x12$\n" + - "\x05value\x18\x02 \x01(\v2\x0e.format.TensorR\x05value:\x028\x01\"d\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12!\n" + + "\x05value\x18\x02 \x01(\v2\v.zmf.TensorR\x05value:\x028\x01\"a\n" + "\tValueInfo\x12\x12\n" + - "\x04name\x18\x01 \x01(\tR\x04name\x12-\n" + - "\x05dtype\x18\x02 \x01(\x0e2\x17.format.Tensor.DataTypeR\x05dtype\x12\x14\n" + - "\x05shape\x18\x03 \x03(\x03R\x05shape\"\xf5\x01\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12*\n" + + "\x05dtype\x18\x02 \x01(\x0e2\x14.zmf.Tensor.DataTypeR\x05dtype\x12\x14\n" + + "\x05shape\x18\x03 \x03(\x03R\x05shape\"\xef\x01\n" + "\x04Node\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x17\n" + "\aop_type\x18\x02 \x01(\tR\x06opType\x12\x16\n" + "\x06inputs\x18\x03 \x03(\tR\x06inputs\x12\x18\n" + - "\aoutputs\x18\x04 \x03(\tR\aoutputs\x12<\n" + + "\aoutputs\x18\x04 \x03(\tR\aoutputs\x129\n" + "\n" + - "attributes\x18\x05 \x03(\v2\x1c.format.Node.AttributesEntryR\n" + - "attributes\x1aP\n" + + "attributes\x18\x05 \x03(\v2\x19.zmf.Node.AttributesEntryR\n" + + "attributes\x1aM\n" + "\x0fAttributesEntry\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\x12'\n" + - "\x05value\x18\x02 \x01(\v2\x11.format.AttributeR\x05value:\x028\x01\"\xc4\x01\n" + - "\x06Tensor\x12-\n" + - "\x05dtype\x18\x01 \x01(\x0e2\x17.format.Tensor.DataTypeR\x05dtype\x12\x14\n" + + "\x03key\x18\x01 \x01(\tR\x03key\x12$\n" + + "\x05value\x18\x02 \x01(\v2\x0e.zmf.AttributeR\x05value:\x028\x01\"\xc1\x01\n" + + "\x06Tensor\x12*\n" + + "\x05dtype\x18\x01 \x01(\x0e2\x14.zmf.Tensor.DataTypeR\x05dtype\x12\x14\n" + "\x05shape\x18\x02 \x03(\x03R\x05shape\x12\x12\n" + "\x04data\x18\x03 \x01(\fR\x04data\"a\n" + "\bDataType\x12\v\n" + @@ -818,14 +819,14 @@ const file_zerfoo_proto_rawDesc = "" + "\x06FLOAT8\x10\x03\x12\t\n" + "\x05INT32\x10\x04\x12\t\n" + "\x05INT64\x10\x05\x12\v\n" + - "\aFLOAT64\x10\x06\"\xbf\x01\n" + + "\aFLOAT64\x10\x06\"\xb6\x01\n" + "\tAttribute\x12\x0e\n" + "\x01f\x18\x01 \x01(\x02H\x00R\x01f\x12\x0e\n" + "\x01i\x18\x02 \x01(\x03H\x00R\x01i\x12\x0e\n" + - "\x01s\x18\x03 \x01(\tH\x00R\x01s\x12(\n" + - "\x06floats\x18\x04 \x01(\v2\x0e.format.FloatsH\x00R\x06floats\x12\"\n" + - "\x04ints\x18\x05 \x01(\v2\f.format.IntsH\x00R\x04ints\x12+\n" + - "\astrings\x18\x06 \x01(\v2\x0f.format.StringsH\x00R\astringsB\a\n" + + "\x01s\x18\x03 \x01(\tH\x00R\x01s\x12%\n" + + "\x06floats\x18\x04 \x01(\v2\v.zmf.FloatsH\x00R\x06floats\x12\x1f\n" + + "\x04ints\x18\x05 \x01(\v2\t.zmf.IntsH\x00R\x04ints\x12(\n" + + "\astrings\x18\x06 \x01(\v2\f.zmf.StringsH\x00R\astringsB\a\n" + "\x05value\"\x1a\n" + "\x06Floats\x12\x10\n" + "\x03val\x18\x01 \x03(\x02R\x03val\"\x18\n" + @@ -849,35 +850,35 @@ func file_zerfoo_proto_rawDescGZIP() []byte { var file_zerfoo_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_zerfoo_proto_msgTypes = make([]protoimpl.MessageInfo, 12) var file_zerfoo_proto_goTypes = []any{ - (Tensor_DataType)(0), // 0: format.Tensor.DataType - (*Model)(nil), // 1: format.Model - (*Metadata)(nil), // 2: format.Metadata - (*Graph)(nil), // 3: format.Graph - (*ValueInfo)(nil), // 4: format.ValueInfo - (*Node)(nil), // 5: format.Node - (*Tensor)(nil), // 6: format.Tensor - (*Attribute)(nil), // 7: format.Attribute - (*Floats)(nil), // 8: format.Floats - (*Ints)(nil), // 9: format.Ints - (*Strings)(nil), // 10: format.Strings - nil, // 11: format.Graph.ParametersEntry - nil, // 12: format.Node.AttributesEntry + (Tensor_DataType)(0), // 0: zmf.Tensor.DataType + (*Model)(nil), // 1: zmf.Model + (*Metadata)(nil), // 2: zmf.Metadata + (*Graph)(nil), // 3: zmf.Graph + (*ValueInfo)(nil), // 4: zmf.ValueInfo + (*Node)(nil), // 5: zmf.Node + (*Tensor)(nil), // 6: zmf.Tensor + (*Attribute)(nil), // 7: zmf.Attribute + (*Floats)(nil), // 8: zmf.Floats + (*Ints)(nil), // 9: zmf.Ints + (*Strings)(nil), // 10: zmf.Strings + nil, // 11: zmf.Graph.ParametersEntry + nil, // 12: zmf.Node.AttributesEntry } var file_zerfoo_proto_depIdxs = []int32{ - 3, // 0: format.Model.graph:type_name -> format.Graph - 2, // 1: format.Model.metadata:type_name -> format.Metadata - 11, // 2: format.Graph.parameters:type_name -> format.Graph.ParametersEntry - 5, // 3: format.Graph.nodes:type_name -> format.Node - 4, // 4: format.Graph.inputs:type_name -> format.ValueInfo - 4, // 5: format.Graph.outputs:type_name -> format.ValueInfo - 0, // 6: format.ValueInfo.dtype:type_name -> format.Tensor.DataType - 12, // 7: format.Node.attributes:type_name -> format.Node.AttributesEntry - 0, // 8: format.Tensor.dtype:type_name -> format.Tensor.DataType - 8, // 9: format.Attribute.floats:type_name -> format.Floats - 9, // 10: format.Attribute.ints:type_name -> format.Ints - 10, // 11: format.Attribute.strings:type_name -> format.Strings - 6, // 12: format.Graph.ParametersEntry.value:type_name -> format.Tensor - 7, // 13: format.Node.AttributesEntry.value:type_name -> format.Attribute + 3, // 0: zmf.Model.graph:type_name -> zmf.Graph + 2, // 1: zmf.Model.metadata:type_name -> zmf.Metadata + 11, // 2: zmf.Graph.parameters:type_name -> zmf.Graph.ParametersEntry + 5, // 3: zmf.Graph.nodes:type_name -> zmf.Node + 4, // 4: zmf.Graph.inputs:type_name -> zmf.ValueInfo + 4, // 5: zmf.Graph.outputs:type_name -> zmf.ValueInfo + 0, // 6: zmf.ValueInfo.dtype:type_name -> zmf.Tensor.DataType + 12, // 7: zmf.Node.attributes:type_name -> zmf.Node.AttributesEntry + 0, // 8: zmf.Tensor.dtype:type_name -> zmf.Tensor.DataType + 8, // 9: zmf.Attribute.floats:type_name -> zmf.Floats + 9, // 10: zmf.Attribute.ints:type_name -> zmf.Ints + 10, // 11: zmf.Attribute.strings:type_name -> zmf.Strings + 6, // 12: zmf.Graph.ParametersEntry.value:type_name -> zmf.Tensor + 7, // 13: zmf.Node.AttributesEntry.value:type_name -> zmf.Attribute 14, // [14:14] is the sub-list for method output_type 14, // [14:14] is the sub-list for method input_type 14, // [14:14] is the sub-list for extension type_name diff --git a/zerfoo.proto b/zerfoo.proto index c15eb70..2a26461 100644 --- a/zerfoo.proto +++ b/zerfoo.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package format; +package zmf; option go_package = "github.com/zerfoo/zmf"; From 09dc1b61614090ebb8cc7e91d27f55a907a2aa63 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 01:46:32 -0700 Subject: [PATCH 05/15] chore: Add CI diagnostic steps for protobuf generation --- .github/workflows/ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1b1092..b16d5ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,13 +18,51 @@ jobs: with: protoc-version: '6.32.0' + - name: Diagnose Protoc and Go Environment + run: | + echo "--- Protoc Version ---" + protoc --version + echo "--- Go Environment ---" + go env + echo "--- protoc-gen-go location and version ---" + # Try to find protoc-gen-go and print its version if possible + GOPATH=$(go env GOPATH) + if [ -f "$GOPATH/bin/protoc-gen-go" ]; then + echo "protoc-gen-go found at $GOPATH/bin/protoc-gen-go" + "$GOPATH/bin/protoc-gen-go" --version || echo "Could not get protoc-gen-go version via --version" + else + echo "protoc-gen-go not found in $GOPATH/bin" + fi + echo "--- zerfoo.pb.go details ---" + ls -l zerfoo.pb.go + - name: Install Go dependencies run: | go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.8 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 + - name: Diagnose Protoc and Go Environment + run: | + echo "--- protoc version ---" + protoc --version + echo "--- protoc-gen-go path ---" + which protoc-gen-go + echo "--- go env ---" + go env - name: Generate protobuf code run: make generate + - name: Diagnose protoc and generated code + run: | + echo "--- protoc version in CI ---" + protoc --version + echo "--- protoc-gen-go version in CI ---" + # This might not work directly, but worth a try + protoc-gen-go --version || echo "protoc-gen-go --version failed, trying go list" + go list -m google.golang.org/protobuf/cmd/protoc-gen-go + echo "--- Diff after make generate in CI ---" + git diff zerfoo.pb.go + echo "--- End of diagnostics ---" + - name: Verify generated code is up-to-date run: | if ! git diff --exit-code; then From 131538281109abf0b03612c685b723ecea39a3eb Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 01:47:22 -0700 Subject: [PATCH 06/15] fix: Clean up and add precise CI diagnostic steps for protobuf generation --- .github/workflows/ci.yml | 47 +++++++++++++--------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b16d5ec..2f48d1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,13 +18,16 @@ jobs: with: protoc-version: '6.32.0' - - name: Diagnose Protoc and Go Environment + - name: Install Go dependencies + run: | + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.8 + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 + + - name: Diagnose protoc and generated code run: | - echo "--- Protoc Version ---" + echo "--- protoc version in CI ---" protoc --version - echo "--- Go Environment ---" - go env - echo "--- protoc-gen-go location and version ---" + echo "--- protoc-gen-go version in CI ---" # Try to find protoc-gen-go and print its version if possible GOPATH=$(go env GOPATH) if [ -f "$GOPATH/bin/protoc-gen-go" ]; then @@ -33,38 +36,18 @@ jobs: else echo "protoc-gen-go not found in $GOPATH/bin" fi - echo "--- zerfoo.pb.go details ---" - ls -l zerfoo.pb.go + echo "--- Diff before make generate in CI (should be empty) ---" + git diff zerfoo.pb.go + echo "--- End of pre-generate diagnostics ---" - - name: Install Go dependencies - run: | - go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.8 - go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 - - name: Diagnose Protoc and Go Environment - run: | - echo "--- protoc version ---" - protoc --version - echo "--- protoc-gen-go path ---" - which protoc-gen-go - echo "--- go env ---" - go env - name: Generate protobuf code run: make generate - - name: Diagnose protoc and generated code - run: | - echo "--- protoc version in CI ---" - protoc --version - echo "--- protoc-gen-go version in CI ---" - # This might not work directly, but worth a try - protoc-gen-go --version || echo "protoc-gen-go --version failed, trying go list" - go list -m google.golang.org/protobuf/cmd/protoc-gen-go - echo "--- Diff after make generate in CI ---" - git diff zerfoo.pb.go - echo "--- End of diagnostics ---" - - name: Verify generated code is up-to-date run: | + echo "--- Diff after make generate in CI (should be empty for success) ---" + git diff zerfoo.pb.go + echo "--- End of post-generate diagnostics ---" if ! git diff --exit-code; then echo "Generated code is not up-to-date. Please run 'make generate' and commit the changes." exit 1 @@ -88,4 +71,4 @@ jobs: with: go-version: '1.25' - name: Run tests - run: go test ./... + run: go test ./... \ No newline at end of file From b47c9aaa43568b5536b94692cca83f679fad1ff6 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 01:59:22 -0700 Subject: [PATCH 07/15] fix: Align CI protoc version with generated code --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f48d1c..7755f43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: go-version: '1.25' - uses: arduino/setup-protoc@v2 with: - protoc-version: '6.32.0' + protoc-version: '4.23.4' - name: Install Go dependencies run: | From 8d060481613baadf2720bf96784eb936b7222b53 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:01:39 -0700 Subject: [PATCH 08/15] chore: Regenerate protobufs with aligned protoc versions --- zerfoo.pb.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zerfoo.pb.go b/zerfoo.pb.go index b72a4e7..7206e1e 100644 --- a/zerfoo.pb.go +++ b/zerfoo.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.8 // protoc v6.32.0 // source: zerfoo.proto From c7f28081bbdd9febba9db1008850c196b54e60eb Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:02:03 -0700 Subject: [PATCH 09/15] chore: Remove CI diagnostic steps --- .github/workflows/ci.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7755f43..671e392 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,22 +23,7 @@ jobs: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.8 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 - - name: Diagnose protoc and generated code - run: | - echo "--- protoc version in CI ---" - protoc --version - echo "--- protoc-gen-go version in CI ---" - # Try to find protoc-gen-go and print its version if possible - GOPATH=$(go env GOPATH) - if [ -f "$GOPATH/bin/protoc-gen-go" ]; then - echo "protoc-gen-go found at $GOPATH/bin/protoc-gen-go" - "$GOPATH/bin/protoc-gen-go" --version || echo "Could not get protoc-gen-go version via --version" - else - echo "protoc-gen-go not found in $GOPATH/bin" - fi - echo "--- Diff before make generate in CI (should be empty) ---" - git diff zerfoo.pb.go - echo "--- End of pre-generate diagnostics ---" + - name: Generate protobuf code run: make generate From 250b30d97e38d0bbb2826c1bde1e0ac207c016d3 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:02:25 -0700 Subject: [PATCH 10/15] fixup! chore: Regenerate protobufs with aligned protoc versions --- zerfoo.pb.go | 118 +++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/zerfoo.pb.go b/zerfoo.pb.go index 7206e1e..c546256 100644 --- a/zerfoo.pb.go +++ b/zerfoo.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.36.8 // protoc v6.32.0 -// source: zerfoo.proto +// source: zmf/zerfoo.proto package zmf @@ -67,11 +67,11 @@ func (x Tensor_DataType) String() string { } func (Tensor_DataType) Descriptor() protoreflect.EnumDescriptor { - return file_zerfoo_proto_enumTypes[0].Descriptor() + return file_zmf_zerfoo_proto_enumTypes[0].Descriptor() } func (Tensor_DataType) Type() protoreflect.EnumType { - return &file_zerfoo_proto_enumTypes[0] + return &file_zmf_zerfoo_proto_enumTypes[0] } func (x Tensor_DataType) Number() protoreflect.EnumNumber { @@ -80,7 +80,7 @@ func (x Tensor_DataType) Number() protoreflect.EnumNumber { // Deprecated: Use Tensor_DataType.Descriptor instead. func (Tensor_DataType) EnumDescriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{5, 0} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{5, 0} } // Model is the top-level container for a serialized Zerfoo model. @@ -96,7 +96,7 @@ type Model struct { func (x *Model) Reset() { *x = Model{} - mi := &file_zerfoo_proto_msgTypes[0] + mi := &file_zmf_zerfoo_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -108,7 +108,7 @@ func (x *Model) String() string { func (*Model) ProtoMessage() {} func (x *Model) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[0] + mi := &file_zmf_zerfoo_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -121,7 +121,7 @@ func (x *Model) ProtoReflect() protoreflect.Message { // Deprecated: Use Model.ProtoReflect.Descriptor instead. func (*Model) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{0} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{0} } func (x *Model) GetGraph() *Graph { @@ -153,7 +153,7 @@ type Metadata struct { func (x *Metadata) Reset() { *x = Metadata{} - mi := &file_zerfoo_proto_msgTypes[1] + mi := &file_zmf_zerfoo_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -165,7 +165,7 @@ func (x *Metadata) String() string { func (*Metadata) ProtoMessage() {} func (x *Metadata) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[1] + mi := &file_zmf_zerfoo_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -178,7 +178,7 @@ func (x *Metadata) ProtoReflect() protoreflect.Message { // Deprecated: Use Metadata.ProtoReflect.Descriptor instead. func (*Metadata) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{1} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{1} } func (x *Metadata) GetProducerName() string { @@ -221,7 +221,7 @@ type Graph struct { func (x *Graph) Reset() { *x = Graph{} - mi := &file_zerfoo_proto_msgTypes[2] + mi := &file_zmf_zerfoo_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -233,7 +233,7 @@ func (x *Graph) String() string { func (*Graph) ProtoMessage() {} func (x *Graph) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[2] + mi := &file_zmf_zerfoo_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -246,7 +246,7 @@ func (x *Graph) ProtoReflect() protoreflect.Message { // Deprecated: Use Graph.ProtoReflect.Descriptor instead. func (*Graph) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{2} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{2} } func (x *Graph) GetParameters() map[string]*Tensor { @@ -292,7 +292,7 @@ type ValueInfo struct { func (x *ValueInfo) Reset() { *x = ValueInfo{} - mi := &file_zerfoo_proto_msgTypes[3] + mi := &file_zmf_zerfoo_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -304,7 +304,7 @@ func (x *ValueInfo) String() string { func (*ValueInfo) ProtoMessage() {} func (x *ValueInfo) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[3] + mi := &file_zmf_zerfoo_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -317,7 +317,7 @@ func (x *ValueInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ValueInfo.ProtoReflect.Descriptor instead. func (*ValueInfo) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{3} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{3} } func (x *ValueInfo) GetName() string { @@ -363,7 +363,7 @@ type Node struct { func (x *Node) Reset() { *x = Node{} - mi := &file_zerfoo_proto_msgTypes[4] + mi := &file_zmf_zerfoo_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -375,7 +375,7 @@ func (x *Node) String() string { func (*Node) ProtoMessage() {} func (x *Node) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[4] + mi := &file_zmf_zerfoo_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -388,7 +388,7 @@ func (x *Node) ProtoReflect() protoreflect.Message { // Deprecated: Use Node.ProtoReflect.Descriptor instead. func (*Node) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{4} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{4} } func (x *Node) GetName() string { @@ -440,7 +440,7 @@ type Tensor struct { func (x *Tensor) Reset() { *x = Tensor{} - mi := &file_zerfoo_proto_msgTypes[5] + mi := &file_zmf_zerfoo_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -452,7 +452,7 @@ func (x *Tensor) String() string { func (*Tensor) ProtoMessage() {} func (x *Tensor) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[5] + mi := &file_zmf_zerfoo_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -465,7 +465,7 @@ func (x *Tensor) ProtoReflect() protoreflect.Message { // Deprecated: Use Tensor.ProtoReflect.Descriptor instead. func (*Tensor) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{5} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{5} } func (x *Tensor) GetDtype() Tensor_DataType { @@ -507,7 +507,7 @@ type Attribute struct { func (x *Attribute) Reset() { *x = Attribute{} - mi := &file_zerfoo_proto_msgTypes[6] + mi := &file_zmf_zerfoo_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -519,7 +519,7 @@ func (x *Attribute) String() string { func (*Attribute) ProtoMessage() {} func (x *Attribute) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[6] + mi := &file_zmf_zerfoo_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -532,7 +532,7 @@ func (x *Attribute) ProtoReflect() protoreflect.Message { // Deprecated: Use Attribute.ProtoReflect.Descriptor instead. func (*Attribute) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{6} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{6} } func (x *Attribute) GetValue() isAttribute_Value { @@ -646,7 +646,7 @@ type Floats struct { func (x *Floats) Reset() { *x = Floats{} - mi := &file_zerfoo_proto_msgTypes[7] + mi := &file_zmf_zerfoo_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -658,7 +658,7 @@ func (x *Floats) String() string { func (*Floats) ProtoMessage() {} func (x *Floats) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[7] + mi := &file_zmf_zerfoo_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -671,7 +671,7 @@ func (x *Floats) ProtoReflect() protoreflect.Message { // Deprecated: Use Floats.ProtoReflect.Descriptor instead. func (*Floats) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{7} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{7} } func (x *Floats) GetVal() []float32 { @@ -690,7 +690,7 @@ type Ints struct { func (x *Ints) Reset() { *x = Ints{} - mi := &file_zerfoo_proto_msgTypes[8] + mi := &file_zmf_zerfoo_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -702,7 +702,7 @@ func (x *Ints) String() string { func (*Ints) ProtoMessage() {} func (x *Ints) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[8] + mi := &file_zmf_zerfoo_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -715,7 +715,7 @@ func (x *Ints) ProtoReflect() protoreflect.Message { // Deprecated: Use Ints.ProtoReflect.Descriptor instead. func (*Ints) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{8} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{8} } func (x *Ints) GetVal() []int64 { @@ -734,7 +734,7 @@ type Strings struct { func (x *Strings) Reset() { *x = Strings{} - mi := &file_zerfoo_proto_msgTypes[9] + mi := &file_zmf_zerfoo_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -746,7 +746,7 @@ func (x *Strings) String() string { func (*Strings) ProtoMessage() {} func (x *Strings) ProtoReflect() protoreflect.Message { - mi := &file_zerfoo_proto_msgTypes[9] + mi := &file_zmf_zerfoo_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -759,7 +759,7 @@ func (x *Strings) ProtoReflect() protoreflect.Message { // Deprecated: Use Strings.ProtoReflect.Descriptor instead. func (*Strings) Descriptor() ([]byte, []int) { - return file_zerfoo_proto_rawDescGZIP(), []int{9} + return file_zmf_zerfoo_proto_rawDescGZIP(), []int{9} } func (x *Strings) GetVal() []string { @@ -769,11 +769,11 @@ func (x *Strings) GetVal() []string { return nil } -var File_zerfoo_proto protoreflect.FileDescriptor +var File_zmf_zerfoo_proto protoreflect.FileDescriptor -const file_zerfoo_proto_rawDesc = "" + +const file_zmf_zerfoo_proto_rawDesc = "" + "\n" + - "\fzerfoo.proto\x12\x03zmf\"T\n" + + "\x10zmf/zerfoo.proto\x12\x03zmf\"T\n" + "\x05Model\x12 \n" + "\x05graph\x18\x01 \x01(\v2\n" + ".zmf.GraphR\x05graph\x12)\n" + @@ -836,20 +836,20 @@ const file_zerfoo_proto_rawDesc = "" + "\x03val\x18\x01 \x03(\tR\x03valB\x17Z\x15github.com/zerfoo/zmfb\x06proto3" var ( - file_zerfoo_proto_rawDescOnce sync.Once - file_zerfoo_proto_rawDescData []byte + file_zmf_zerfoo_proto_rawDescOnce sync.Once + file_zmf_zerfoo_proto_rawDescData []byte ) -func file_zerfoo_proto_rawDescGZIP() []byte { - file_zerfoo_proto_rawDescOnce.Do(func() { - file_zerfoo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_zerfoo_proto_rawDesc), len(file_zerfoo_proto_rawDesc))) +func file_zmf_zerfoo_proto_rawDescGZIP() []byte { + file_zmf_zerfoo_proto_rawDescOnce.Do(func() { + file_zmf_zerfoo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_zmf_zerfoo_proto_rawDesc), len(file_zmf_zerfoo_proto_rawDesc))) }) - return file_zerfoo_proto_rawDescData + return file_zmf_zerfoo_proto_rawDescData } -var file_zerfoo_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_zerfoo_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_zerfoo_proto_goTypes = []any{ +var file_zmf_zerfoo_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_zmf_zerfoo_proto_msgTypes = make([]protoimpl.MessageInfo, 12) +var file_zmf_zerfoo_proto_goTypes = []any{ (Tensor_DataType)(0), // 0: zmf.Tensor.DataType (*Model)(nil), // 1: zmf.Model (*Metadata)(nil), // 2: zmf.Metadata @@ -864,7 +864,7 @@ var file_zerfoo_proto_goTypes = []any{ nil, // 11: zmf.Graph.ParametersEntry nil, // 12: zmf.Node.AttributesEntry } -var file_zerfoo_proto_depIdxs = []int32{ +var file_zmf_zerfoo_proto_depIdxs = []int32{ 3, // 0: zmf.Model.graph:type_name -> zmf.Graph 2, // 1: zmf.Model.metadata:type_name -> zmf.Metadata 11, // 2: zmf.Graph.parameters:type_name -> zmf.Graph.ParametersEntry @@ -886,12 +886,12 @@ var file_zerfoo_proto_depIdxs = []int32{ 0, // [0:14] is the sub-list for field type_name } -func init() { file_zerfoo_proto_init() } -func file_zerfoo_proto_init() { - if File_zerfoo_proto != nil { +func init() { file_zmf_zerfoo_proto_init() } +func file_zmf_zerfoo_proto_init() { + if File_zmf_zerfoo_proto != nil { return } - file_zerfoo_proto_msgTypes[6].OneofWrappers = []any{ + file_zmf_zerfoo_proto_msgTypes[6].OneofWrappers = []any{ (*Attribute_F)(nil), (*Attribute_I)(nil), (*Attribute_S)(nil), @@ -903,18 +903,18 @@ func file_zerfoo_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_zerfoo_proto_rawDesc), len(file_zerfoo_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_zmf_zerfoo_proto_rawDesc), len(file_zmf_zerfoo_proto_rawDesc)), NumEnums: 1, NumMessages: 12, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_zerfoo_proto_goTypes, - DependencyIndexes: file_zerfoo_proto_depIdxs, - EnumInfos: file_zerfoo_proto_enumTypes, - MessageInfos: file_zerfoo_proto_msgTypes, + GoTypes: file_zmf_zerfoo_proto_goTypes, + DependencyIndexes: file_zmf_zerfoo_proto_depIdxs, + EnumInfos: file_zmf_zerfoo_proto_enumTypes, + MessageInfos: file_zmf_zerfoo_proto_msgTypes, }.Build() - File_zerfoo_proto = out.File - file_zerfoo_proto_goTypes = nil - file_zerfoo_proto_depIdxs = nil + File_zmf_zerfoo_proto = out.File + file_zmf_zerfoo_proto_goTypes = nil + file_zmf_zerfoo_proto_depIdxs = nil } From 58e45536196da00680fa9948d9d70b4450a905b5 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:06:17 -0700 Subject: [PATCH 11/15] fixup! fixup! chore: Regenerate protobufs with aligned protoc versions --- zerfoo.pb.go | 118 +++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/zerfoo.pb.go b/zerfoo.pb.go index c546256..7206e1e 100644 --- a/zerfoo.pb.go +++ b/zerfoo.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.36.8 // protoc v6.32.0 -// source: zmf/zerfoo.proto +// source: zerfoo.proto package zmf @@ -67,11 +67,11 @@ func (x Tensor_DataType) String() string { } func (Tensor_DataType) Descriptor() protoreflect.EnumDescriptor { - return file_zmf_zerfoo_proto_enumTypes[0].Descriptor() + return file_zerfoo_proto_enumTypes[0].Descriptor() } func (Tensor_DataType) Type() protoreflect.EnumType { - return &file_zmf_zerfoo_proto_enumTypes[0] + return &file_zerfoo_proto_enumTypes[0] } func (x Tensor_DataType) Number() protoreflect.EnumNumber { @@ -80,7 +80,7 @@ func (x Tensor_DataType) Number() protoreflect.EnumNumber { // Deprecated: Use Tensor_DataType.Descriptor instead. func (Tensor_DataType) EnumDescriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{5, 0} + return file_zerfoo_proto_rawDescGZIP(), []int{5, 0} } // Model is the top-level container for a serialized Zerfoo model. @@ -96,7 +96,7 @@ type Model struct { func (x *Model) Reset() { *x = Model{} - mi := &file_zmf_zerfoo_proto_msgTypes[0] + mi := &file_zerfoo_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -108,7 +108,7 @@ func (x *Model) String() string { func (*Model) ProtoMessage() {} func (x *Model) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[0] + mi := &file_zerfoo_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -121,7 +121,7 @@ func (x *Model) ProtoReflect() protoreflect.Message { // Deprecated: Use Model.ProtoReflect.Descriptor instead. func (*Model) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{0} + return file_zerfoo_proto_rawDescGZIP(), []int{0} } func (x *Model) GetGraph() *Graph { @@ -153,7 +153,7 @@ type Metadata struct { func (x *Metadata) Reset() { *x = Metadata{} - mi := &file_zmf_zerfoo_proto_msgTypes[1] + mi := &file_zerfoo_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -165,7 +165,7 @@ func (x *Metadata) String() string { func (*Metadata) ProtoMessage() {} func (x *Metadata) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[1] + mi := &file_zerfoo_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -178,7 +178,7 @@ func (x *Metadata) ProtoReflect() protoreflect.Message { // Deprecated: Use Metadata.ProtoReflect.Descriptor instead. func (*Metadata) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{1} + return file_zerfoo_proto_rawDescGZIP(), []int{1} } func (x *Metadata) GetProducerName() string { @@ -221,7 +221,7 @@ type Graph struct { func (x *Graph) Reset() { *x = Graph{} - mi := &file_zmf_zerfoo_proto_msgTypes[2] + mi := &file_zerfoo_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -233,7 +233,7 @@ func (x *Graph) String() string { func (*Graph) ProtoMessage() {} func (x *Graph) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[2] + mi := &file_zerfoo_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -246,7 +246,7 @@ func (x *Graph) ProtoReflect() protoreflect.Message { // Deprecated: Use Graph.ProtoReflect.Descriptor instead. func (*Graph) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{2} + return file_zerfoo_proto_rawDescGZIP(), []int{2} } func (x *Graph) GetParameters() map[string]*Tensor { @@ -292,7 +292,7 @@ type ValueInfo struct { func (x *ValueInfo) Reset() { *x = ValueInfo{} - mi := &file_zmf_zerfoo_proto_msgTypes[3] + mi := &file_zerfoo_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -304,7 +304,7 @@ func (x *ValueInfo) String() string { func (*ValueInfo) ProtoMessage() {} func (x *ValueInfo) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[3] + mi := &file_zerfoo_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -317,7 +317,7 @@ func (x *ValueInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ValueInfo.ProtoReflect.Descriptor instead. func (*ValueInfo) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{3} + return file_zerfoo_proto_rawDescGZIP(), []int{3} } func (x *ValueInfo) GetName() string { @@ -363,7 +363,7 @@ type Node struct { func (x *Node) Reset() { *x = Node{} - mi := &file_zmf_zerfoo_proto_msgTypes[4] + mi := &file_zerfoo_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -375,7 +375,7 @@ func (x *Node) String() string { func (*Node) ProtoMessage() {} func (x *Node) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[4] + mi := &file_zerfoo_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -388,7 +388,7 @@ func (x *Node) ProtoReflect() protoreflect.Message { // Deprecated: Use Node.ProtoReflect.Descriptor instead. func (*Node) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{4} + return file_zerfoo_proto_rawDescGZIP(), []int{4} } func (x *Node) GetName() string { @@ -440,7 +440,7 @@ type Tensor struct { func (x *Tensor) Reset() { *x = Tensor{} - mi := &file_zmf_zerfoo_proto_msgTypes[5] + mi := &file_zerfoo_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -452,7 +452,7 @@ func (x *Tensor) String() string { func (*Tensor) ProtoMessage() {} func (x *Tensor) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[5] + mi := &file_zerfoo_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -465,7 +465,7 @@ func (x *Tensor) ProtoReflect() protoreflect.Message { // Deprecated: Use Tensor.ProtoReflect.Descriptor instead. func (*Tensor) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{5} + return file_zerfoo_proto_rawDescGZIP(), []int{5} } func (x *Tensor) GetDtype() Tensor_DataType { @@ -507,7 +507,7 @@ type Attribute struct { func (x *Attribute) Reset() { *x = Attribute{} - mi := &file_zmf_zerfoo_proto_msgTypes[6] + mi := &file_zerfoo_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -519,7 +519,7 @@ func (x *Attribute) String() string { func (*Attribute) ProtoMessage() {} func (x *Attribute) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[6] + mi := &file_zerfoo_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -532,7 +532,7 @@ func (x *Attribute) ProtoReflect() protoreflect.Message { // Deprecated: Use Attribute.ProtoReflect.Descriptor instead. func (*Attribute) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{6} + return file_zerfoo_proto_rawDescGZIP(), []int{6} } func (x *Attribute) GetValue() isAttribute_Value { @@ -646,7 +646,7 @@ type Floats struct { func (x *Floats) Reset() { *x = Floats{} - mi := &file_zmf_zerfoo_proto_msgTypes[7] + mi := &file_zerfoo_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -658,7 +658,7 @@ func (x *Floats) String() string { func (*Floats) ProtoMessage() {} func (x *Floats) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[7] + mi := &file_zerfoo_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -671,7 +671,7 @@ func (x *Floats) ProtoReflect() protoreflect.Message { // Deprecated: Use Floats.ProtoReflect.Descriptor instead. func (*Floats) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{7} + return file_zerfoo_proto_rawDescGZIP(), []int{7} } func (x *Floats) GetVal() []float32 { @@ -690,7 +690,7 @@ type Ints struct { func (x *Ints) Reset() { *x = Ints{} - mi := &file_zmf_zerfoo_proto_msgTypes[8] + mi := &file_zerfoo_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -702,7 +702,7 @@ func (x *Ints) String() string { func (*Ints) ProtoMessage() {} func (x *Ints) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[8] + mi := &file_zerfoo_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -715,7 +715,7 @@ func (x *Ints) ProtoReflect() protoreflect.Message { // Deprecated: Use Ints.ProtoReflect.Descriptor instead. func (*Ints) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{8} + return file_zerfoo_proto_rawDescGZIP(), []int{8} } func (x *Ints) GetVal() []int64 { @@ -734,7 +734,7 @@ type Strings struct { func (x *Strings) Reset() { *x = Strings{} - mi := &file_zmf_zerfoo_proto_msgTypes[9] + mi := &file_zerfoo_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -746,7 +746,7 @@ func (x *Strings) String() string { func (*Strings) ProtoMessage() {} func (x *Strings) ProtoReflect() protoreflect.Message { - mi := &file_zmf_zerfoo_proto_msgTypes[9] + mi := &file_zerfoo_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -759,7 +759,7 @@ func (x *Strings) ProtoReflect() protoreflect.Message { // Deprecated: Use Strings.ProtoReflect.Descriptor instead. func (*Strings) Descriptor() ([]byte, []int) { - return file_zmf_zerfoo_proto_rawDescGZIP(), []int{9} + return file_zerfoo_proto_rawDescGZIP(), []int{9} } func (x *Strings) GetVal() []string { @@ -769,11 +769,11 @@ func (x *Strings) GetVal() []string { return nil } -var File_zmf_zerfoo_proto protoreflect.FileDescriptor +var File_zerfoo_proto protoreflect.FileDescriptor -const file_zmf_zerfoo_proto_rawDesc = "" + +const file_zerfoo_proto_rawDesc = "" + "\n" + - "\x10zmf/zerfoo.proto\x12\x03zmf\"T\n" + + "\fzerfoo.proto\x12\x03zmf\"T\n" + "\x05Model\x12 \n" + "\x05graph\x18\x01 \x01(\v2\n" + ".zmf.GraphR\x05graph\x12)\n" + @@ -836,20 +836,20 @@ const file_zmf_zerfoo_proto_rawDesc = "" + "\x03val\x18\x01 \x03(\tR\x03valB\x17Z\x15github.com/zerfoo/zmfb\x06proto3" var ( - file_zmf_zerfoo_proto_rawDescOnce sync.Once - file_zmf_zerfoo_proto_rawDescData []byte + file_zerfoo_proto_rawDescOnce sync.Once + file_zerfoo_proto_rawDescData []byte ) -func file_zmf_zerfoo_proto_rawDescGZIP() []byte { - file_zmf_zerfoo_proto_rawDescOnce.Do(func() { - file_zmf_zerfoo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_zmf_zerfoo_proto_rawDesc), len(file_zmf_zerfoo_proto_rawDesc))) +func file_zerfoo_proto_rawDescGZIP() []byte { + file_zerfoo_proto_rawDescOnce.Do(func() { + file_zerfoo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_zerfoo_proto_rawDesc), len(file_zerfoo_proto_rawDesc))) }) - return file_zmf_zerfoo_proto_rawDescData + return file_zerfoo_proto_rawDescData } -var file_zmf_zerfoo_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_zmf_zerfoo_proto_msgTypes = make([]protoimpl.MessageInfo, 12) -var file_zmf_zerfoo_proto_goTypes = []any{ +var file_zerfoo_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_zerfoo_proto_msgTypes = make([]protoimpl.MessageInfo, 12) +var file_zerfoo_proto_goTypes = []any{ (Tensor_DataType)(0), // 0: zmf.Tensor.DataType (*Model)(nil), // 1: zmf.Model (*Metadata)(nil), // 2: zmf.Metadata @@ -864,7 +864,7 @@ var file_zmf_zerfoo_proto_goTypes = []any{ nil, // 11: zmf.Graph.ParametersEntry nil, // 12: zmf.Node.AttributesEntry } -var file_zmf_zerfoo_proto_depIdxs = []int32{ +var file_zerfoo_proto_depIdxs = []int32{ 3, // 0: zmf.Model.graph:type_name -> zmf.Graph 2, // 1: zmf.Model.metadata:type_name -> zmf.Metadata 11, // 2: zmf.Graph.parameters:type_name -> zmf.Graph.ParametersEntry @@ -886,12 +886,12 @@ var file_zmf_zerfoo_proto_depIdxs = []int32{ 0, // [0:14] is the sub-list for field type_name } -func init() { file_zmf_zerfoo_proto_init() } -func file_zmf_zerfoo_proto_init() { - if File_zmf_zerfoo_proto != nil { +func init() { file_zerfoo_proto_init() } +func file_zerfoo_proto_init() { + if File_zerfoo_proto != nil { return } - file_zmf_zerfoo_proto_msgTypes[6].OneofWrappers = []any{ + file_zerfoo_proto_msgTypes[6].OneofWrappers = []any{ (*Attribute_F)(nil), (*Attribute_I)(nil), (*Attribute_S)(nil), @@ -903,18 +903,18 @@ func file_zmf_zerfoo_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: unsafe.Slice(unsafe.StringData(file_zmf_zerfoo_proto_rawDesc), len(file_zmf_zerfoo_proto_rawDesc)), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_zerfoo_proto_rawDesc), len(file_zerfoo_proto_rawDesc)), NumEnums: 1, NumMessages: 12, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_zmf_zerfoo_proto_goTypes, - DependencyIndexes: file_zmf_zerfoo_proto_depIdxs, - EnumInfos: file_zmf_zerfoo_proto_enumTypes, - MessageInfos: file_zmf_zerfoo_proto_msgTypes, + GoTypes: file_zerfoo_proto_goTypes, + DependencyIndexes: file_zerfoo_proto_depIdxs, + EnumInfos: file_zerfoo_proto_enumTypes, + MessageInfos: file_zerfoo_proto_msgTypes, }.Build() - File_zmf_zerfoo_proto = out.File - file_zmf_zerfoo_proto_goTypes = nil - file_zmf_zerfoo_proto_depIdxs = nil + File_zerfoo_proto = out.File + file_zerfoo_proto_goTypes = nil + file_zerfoo_proto_depIdxs = nil } From 2e74a3e6fedee9e39420c0090896739417b427be Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:07:52 -0700 Subject: [PATCH 12/15] fix: Correct protoc version parameter in CI workflow --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 671e392..297eb69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: go-version: '1.25' - uses: arduino/setup-protoc@v2 with: - protoc-version: '4.23.4' + version: '4.23.4' - name: Install Go dependencies run: | From 2e5fe1f04254f70f8dbf92b54db802517a7860ff Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:11:32 -0700 Subject: [PATCH 13/15] fix: Manually install protoc v4.23.4 in CI --- .github/workflows/ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 297eb69..eb81c49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,12 @@ jobs: - uses: actions/setup-go@v5 with: go-version: '1.25' - - uses: arduino/setup-protoc@v2 - with: - version: '4.23.4' + - name: Install protoc v4.23.4 + run: | + curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip + sudo unzip -o protoc-23.4-linux-x86_64.zip -d /usr/local bin/protoc + sudo unzip -o protoc-23.4-linux-x86_64.zip -d /usr/local 'include/*' + rm protoc-23.4-linux-x86_64.zip - name: Install Go dependencies run: | From e15b3a86b5c6ec528a7900373512aba4609b5738 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:29:46 -0700 Subject: [PATCH 14/15] fix: Manually install protoc v6.32.0 in CI --- .github/workflows/ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb81c49..cf33da9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,11 @@ jobs: - uses: actions/setup-go@v5 with: go-version: '1.25' - - name: Install protoc v4.23.4 + - name: Install protoc v6.32.0 run: | - curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip - sudo unzip -o protoc-23.4-linux-x86_64.zip -d /usr/local bin/protoc - sudo unzip -o protoc-23.4-linux-x86_64.zip -d /usr/local 'include/*' + curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v32.0/protoc-32.0-linux-x86_64.zip + sudo unzip -o protoc-32.0-linux-x86_64.zip -d /usr/local bin/protoc + sudo unzip -o protoc-32.0-linux-x86_64.zip -d /usr/local 'include/*' rm protoc-23.4-linux-x86_64.zip - name: Install Go dependencies @@ -26,8 +26,6 @@ jobs: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.8 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 - - - name: Generate protobuf code run: make generate @@ -59,4 +57,4 @@ jobs: with: go-version: '1.25' - name: Run tests - run: go test ./... \ No newline at end of file + run: go test ./... From e666ebfb8f9a86725695b110117764514edc5714 Mon Sep 17 00:00:00 2001 From: David Ndungu Date: Thu, 21 Aug 2025 02:37:01 -0700 Subject: [PATCH 15/15] fixup! fix: Manually install protoc v6.32.0 in CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf33da9..decdeb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v32.0/protoc-32.0-linux-x86_64.zip sudo unzip -o protoc-32.0-linux-x86_64.zip -d /usr/local bin/protoc sudo unzip -o protoc-32.0-linux-x86_64.zip -d /usr/local 'include/*' - rm protoc-23.4-linux-x86_64.zip + rm protoc-32.0-linux-x86_64.zip - name: Install Go dependencies run: |