refactor and clean up

AnalysisFW/BuildFile.xml

@@ -4,6 +4,7 @@
 <use   name="FWCore/PluginManager"/>
 <use   name="PhysicsTools/TensorFlow"/>
 <use   name="grpc"/>
+<use   name="tensorflow-cc"/>
 <use   name="tensorflow-serving"/>
 <export>
   <lib   name="1"/>

AnalysisFW/interface/TFClientBase.h

@@ -0,0 +1,22 @@
+#ifndef TFCLIENTBASE_H
+#define TFCLIENTBASE_H
+
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
+#include "tensorflow/core/framework/tensor.h"
+
+//base class for local and remote clients
+class TFClientBase {
+	public:
+		//constructor
+		TFClientBase() {}
+		//destructor
+		virtual ~TFClientBase() {}
+
+		//input is "image" in tensor form
+		virtual bool predict(const tensorflow::Tensor& img, tensorflow::Tensor& result) const {
+			return true;
+		}
+};
+
+#endif

AnalysisFW/interface/TFClientLocal.h

@@ -0,0 +1,34 @@
+#ifndef TFCLIENTLOCAL_H
+#define TFCLIENTLOCAL_H
+
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "TFClientBase.h"
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/graph/default_device.h"
+
+class TFClientLocal : public TFClientBase {
+	public:
+		//constructors (timeout in seconds)
+		TFClientLocal() : TFClientBase() {}
+		TFClientLocal(const std::string& featurizer_file, const std::string& classifier_file);
+
+		//input is "image" in tensor form
+		bool predict(const tensorflow::Tensor& img, tensorflow::Tensor& result) const override;
+
+	private:
+		void loadModel(const std::string& featurizer_file, const std::string& classifier_file);
+		std::vector<tensorflow::Tensor> runFeaturizer(const tensorflow::Tensor& inputImage) const;
+		std::vector<tensorflow::Tensor> runClassifier(const tensorflow::Tensor& inputClassifier) const;
+		tensorflow::Tensor createFeatureList(const tensorflow::Tensor& input) const;
+
+		//members
+		tensorflow::GraphDef* graphDefFeaturizer_;
+		tensorflow::GraphDef* graphDefClassifier_;
+};
+
+#endif

AnalysisFW/interface/TFClientRemote.h

@@ -0,0 +1,30 @@
+#ifndef TFCLIENTREMOTE_H
+#define TFCLIENTREMOTE_H
+
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "TFClientBase.h"
+
+#include <string>
+#include <memory>
+
+#include "grpc++/create_channel.h"
+#include "tensorflow_serving/apis/prediction_service.grpc.pb.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/util/command_line_flags.h"
+
+class TFClientRemote : public TFClientBase {
+	public:
+		//constructors (timeout in seconds)
+		TFClientRemote() : TFClientBase() {}
+		TFClientRemote(const std::string& address, int port, unsigned timeout);
+
+		//input is "image" in tensor form
+		bool predict(const tensorflow::Tensor& img, tensorflow::Tensor& result) const override;
+
+	private:
+		std::shared_ptr<grpc::Channel> channel_;
+		std::unique_ptr<tensorflow::serving::PredictionService::Stub> stub_;
+		unsigned timeout_;
+};
+
+#endif

AnalysisFW/plugins/BuildFile.xml

@@ -5,7 +5,7 @@
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/PluginManager"/>
 <use   name="SonicCMS/AnalysisFW"/>
-<use   name="PhysicsTools/TensorFlow"/>
+<use   name="tensorflow-cc"/>
 <flags   EDM_PLUGIN="1"/>
 </library>