Skip to content

Commit

Permalink
Pipelines with Join (#136)
Browse files Browse the repository at this point in the history
* rename stream to modelgateway

* initial commit

* v2 transforms

* convert json to proto

* add some tests

* add docker and k8s resources

* pipeline testing

* fix lint

* test updates - protoc diffs

* initial fixes for pipeline-dataflow integration

* lint

* create topics from dataflow on demand

* pipeline infer tests

* updated local examples

* json output update

* add dataflow engine img to makefile

* docker compose testing

* update cli

* fixes for pipeline status and docker compose use

* Add extra tests for envoy

* chaining models with tensor name conversions

* update to just have tensorMap

* join

* fix kotlin tests

* small updates from review
  • Loading branch information
ukclivecox authored Apr 4, 2022
1 parent d4e6dca commit 73d901d
Show file tree
Hide file tree
Showing 111 changed files with 7,196 additions and 1,369 deletions.
26 changes: 26 additions & 0 deletions apis/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,29 @@ build-v2-python:
$(PROTOC_IMPORT_PATH) \
$(PROTOC_PYTHON_OPTIONS) \
./mlops/v2_dataplane/v2_dataplane.proto

.PHONY: download-java-protoc
download-java-protoc:
wget https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.45.1/protoc-gen-grpc-java-1.45.1-linux-x86_64.exe
chmod u+x protoc-gen-grpc-java-1.45.1-linux-x86_64.exe
mv protoc-gen-grpc-java-1.45.1-linux-x86_64.exe kotlin

.PHONY: download-kotlin-protoc
download-kotlin-protoc:
wget https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-kotlin/1.2.1/protoc-gen-grpc-kotlin-1.2.1-jdk7.jar
mv protoc-gen-grpc-kotlin-1.2.1-jdk7.jar kotlin

.PHONY: download-jvm-protoc
download-jvm-protoc: download-kotlin-protoc download-java-protoc

.PHONY: build-kotlin
build-kotlin:
cd ./mlops/chainer && protoc \
--proto_path=. \
--plugin=protoc-gen-grpc-java=../../kotlin/protoc-gen-grpc-java-1.45.1-linux-x86_64.exe \
--java_out=./kotlin \
--grpc-java_out=./kotlin \
--plugin=protoc-gen-grpckt=../../kotlin/protoc-gen-grpc-kotlin.sh \
--kotlin_out=./kotlin \
--grpckt_out=./kotlin \
chainer.proto
2 changes: 2 additions & 0 deletions apis/kotlin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
protoc-gen-grpc-java-1.45.1-linux-x86_64.exe
protoc-gen-grpc-kotlin-1.2.1-jdk7.jar
4 changes: 4 additions & 0 deletions apis/kotlin/protoc-gen-grpc-kotlin.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh

java -jar ../../kotlin/protoc-gen-grpc-kotlin-1.2.1-jdk7.jar "$@"

2 changes: 1 addition & 1 deletion apis/mlops/agent/agent.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/mlops/agent_debug/agent_debug.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

142 changes: 88 additions & 54 deletions apis/mlops/chainer/chainer.pb.go

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions apis/mlops/chainer/chainer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ message PipelineStepUpdate {
PipelineJoinType ty = 3;
bool passEmptyResponses = 4; // Forward empty response to following steps, default false
optional uint32 joinWindowMs = 5; // Join window millisecs, some nozero default (TBD)
repeated string tensorNames = 6; // optional list of output tensors - must be same cardinality as tensors in inputs
map<string,string> tensorMap = 7; // optional map of tensor name mappings
}

message PipelineUpdateStatusMessage {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
*/
@javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.44.1)",
value = "by gRPC proto compiler (version 1.45.1)",
comments = "Source: chainer.proto")
@io.grpc.stub.annotations.GrpcGenerated
public final class ChainerGrpc {
Expand Down
Loading

0 comments on commit 73d901d

Please sign in to comment.