Updated code

SeldonIO · Dec 20, 2019 · e54087d · e54087d
1 parent 2cb40dd
commit e54087d
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 9,028 deletions.
diff --git a/go/Makefile b/go/Makefile
@@ -1,13 +1,16 @@
-.PHONY: compile_tensorflow_proto
-compile_tensorflow_proto:
-	./generate_tensorflow_proto.sh
+SELDON_CORE_DIR=..
 
 .PHONY: compile_proto
-compile_proto: compile_tensorflow_proto
-	mkdir -p pkg/api
-	rm -rf pkg/api/tensorflow
-	cp -r vendor/github.com/tensorflow  pkg/api/
-	cp ../proto/prediction.proto pkg/api
-	cd pkg/api && protoc -I. -I${CURDIR}/tensorflow --go_out=paths=source_relative,plugins=grpc:. prediction.proto
-	rm pkg/api/prediction.proto
-	find ./pkg -name "*.pb.go" -type f -exec perl -e "s/github\.com\/tensorflow/github\.com\/seldonio\/seldon-core\/go\/pkg\/api\/tensorflow/g" -pi {} +
+compile_proto:
+	rm -rf pkg/api && mkdir -p pkg/api
+
+	cp ${SELDON_CORE_DIR}/proto/prediction.proto pkg/api
+
+	$(MAKE) -C ${SELDON_CORE_DIR}/proto/tensorflow/ create_protos
+	cp -r $(SELDON_CORE_DIR)/proto/tensorflow/tensorflow pkg/api
+
+	cd pkg/api && protoc -I. -I./tensorflow --go_out=paths=source_relative,plugins=grpc:. *.proto
+	cd pkg/api && protoc -I. -I./tensorflow --go_out=paths=source_relative,plugins=grpc:. ./tensorflow/core/framework/*.proto
+
+	find ./pkg -name "*.pb.go" -type f -exec perl -e "s/github\.com\/tensorflow\/tensorflow/github\.com\/seldonio\/seldon-core\/go\/pkg\/api/g" -pi {} +
+	find ./pkg -name "*.proto" -type f -delete
diff --git a/go/generate_tensorflow_proto.sh b/go/generate_tensorflow_proto.sh
diff --git a/go/pkg/api/prediction.pb.go b/go/pkg/api/prediction.pb.go
diff --git a/...w/go/core/framework/resource_handle.pb.go → ...flow/core/framework/resource_handle.pb.go b/...w/go/core/framework/resource_handle.pb.go → ...flow/core/framework/resource_handle.pb.go
diff --git a/...tensorflow/go/core/framework/tensor.pb.go → ...pi/tensorflow/core/framework/tensor.pb.go b/...tensorflow/go/core/framework/tensor.pb.go → ...pi/tensorflow/core/framework/tensor.pb.go
diff --git a/...flow/go/core/framework/tensor_shape.pb.go → ...sorflow/core/framework/tensor_shape.pb.go b/...flow/go/core/framework/tensor_shape.pb.go → ...sorflow/core/framework/tensor_shape.pb.go
diff --git a/.../tensorflow/go/core/framework/types.pb.go → ...api/tensorflow/core/framework/types.pb.go b/.../tensorflow/go/core/framework/types.pb.go → ...api/tensorflow/core/framework/types.pb.go
diff --git a/go/pkg/api/tensorflow/tensorflow/tensorflow/go/core/example/example.pb.go b/go/pkg/api/tensorflow/tensorflow/tensorflow/go/core/example/example.pb.go