fastmachinelearning
diff --git a/‎Core/interface/SonicClientBase.h‎
Lines changed: 3 additions & 2 deletions b/‎Core/interface/SonicClientBase.h‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎Core/interface/SonicEDProducer.h‎
Lines changed: 33 additions & 4 deletions b/‎Core/interface/SonicEDProducer.h‎
Lines changed: 33 additions & 4 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎TensorRT/BuildFile.xml‎
Lines changed: 6 additions & 0 deletions b/‎TensorRT/BuildFile.xml‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎TensorRT/README.md‎
Lines changed: 6 additions & 2 deletions b/‎TensorRT/README.md‎
Lines changed: 6 additions & 2 deletions
@@ -28,10 +28,11 @@ class SonicClientBase {
 		}
 
 		void finish(std::exception_ptr eptr = std::exception_ptr{}) {
+            /*unsigned int clientTime = 0;
 			if(setTime_){
 				auto t1 = std::chrono::high_resolution_clock::now();
-				edm::LogInfo(debugName_) << "Client time: " << std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0_).count();
-			}
+				clientTime = (unsigned int)std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0_).count();
+			}*/
 			holder_.doneWaiting(eptr);
 		}
 
 
@@ -7,9 +7,10 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Concurrency/interface/WaitingTaskWithArenaHolder.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-
+#include <sstream>
 #include <string>
 #include <chrono>
+#include <fstream>
 
 //this is a stream producer because client operations are not multithread-safe in general
 //it is designed such that the user never has to interact with the client or the acquire() callback directly
@@ -20,17 +21,40 @@ class SonicEDProducer : public edm::stream::EDProducer<edm::ExternalWork, Capabi
 		typedef typename Client::Input Input;
 		typedef typename Client::Output Output;
 		//constructor
-		SonicEDProducer(edm::ParameterSet const& cfg) : client_(cfg.getParameter<edm::ParameterSet>("Client")) {}
+		SonicEDProducer(edm::ParameterSet const& cfg) : client_(cfg.getParameter<edm::ParameterSet>("Client")) {
+            sumLoadTime = 0;
+            numLoadTime = 0;
+        }
+
 		//destructor
-		virtual ~SonicEDProducer() {}
+		~SonicEDProducer() {
+            /*
+            std::stringstream msg;
+            msg << "Produced by SonicEDProducer" << std::endl;
+            if (numLoadTime == 0) {
+                msg << "numLoadTime was 0." << std::endl;
+            }
+            else {
+                msg << "Load time: " << float(sumLoadTime) / numLoadTime << std::endl;
+            }
+
+            writeData(&msg);
+
+            std::ofstream file("./data/producer-data.dat");
+            file << msg.str();
+            file.close();*/
+        }
 
 		//derived classes use a dedicated acquire() interface that incorporates client_.input()
 		//(no need to interact with callback holder)
 		void acquire(edm::Event const& iEvent, edm::EventSetup const& iSetup, edm::WaitingTaskWithArenaHolder holder) override final {
 			auto t0 = std::chrono::high_resolution_clock::now();
 			acquire(iEvent, iSetup, client_.input());
 			auto t1 = std::chrono::high_resolution_clock::now();
-			if(!debugName_.empty()) edm::LogInfo(debugName_) << "Load time: " << std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0).count();
+			if(!debugName_.empty()) {
+               sumLoadTime += (unsigned int)std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0).count();
+               numLoadTime++;
+            }
 			client_.predict(holder);
 		}
 		virtual void acquire(edm::Event const& iEvent, edm::EventSetup const& iSetup, Input& iInput) = 0;
@@ -50,6 +74,11 @@ class SonicEDProducer : public edm::stream::EDProducer<edm::ExternalWork, Capabi
 		//members
 		Client client_;
 		std::string debugName_;
+
+    private:
+        virtual void writeData(std::stringstream* msg) {}
+        unsigned int sumLoadTime;
+        unsigned int numLoadTime;
 };
 
 #endif
 
@@ -6,7 +6,7 @@ For this branch, please use the following script to set up the work area:
 ```
 wget https://raw.githubusercontent.com/hls-fpga-machine-learning/SonicCMS/master/setup.sh
 chmod +x setup.sh
-./setup.sh
+./setup.sh -f jeffkrupa -j 4 -p TensorRT
 cd CMSSW_10_6_6/src
 cmsenv
 ```
 
@@ -1,4 +1,10 @@
+<use   name="CalibCalorimetry/HcalAlgos"/>
+<use   name="CalibFormats/HcalObjects"/>
+<use   name="Geometry/Records"/>
+<use   name="Geometry/CaloGeometry"/>
 <use   name="DataFormats/JetReco"/>
+<use   name="DataFormats/HcalDigi"/>
+<use   name="DataFormats/FEDRawData"/>
 <use   name="DataFormats/Candidate"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/PluginManager"/>
 
@@ -1,12 +1,16 @@
 Remote mode:
 ```
 cd python
-cmsRun jetImageTest_mc_cfg.py address=ailab01.fnal.gov port=8001 maxEvents=25
+cmsRun HcalTest_mc_cfg.py maxEvents=25 port=<port> address=<server address> batchsize=16000 modelname=facile  maxEvents=10
 ```
-(or the same for `HcalTest_mc_cfg.py`)
 
 All the different client options can be tested with an additional argument:
 `mode=Async` (default), `mode=Sync`, `mode=PseudoAsync`.
 
 Other available servers:
 * `prp-gpu-1.t2.ucsd.edu`
+
+## Timing
+Some timing data will be recorded in `SonicCMS/TensorRT/python/data`. The most interesting timing data is stored in `client-data.dat`. Some parts of `TRTClient.cc` have commented-out lines of code which could collect timing data, but since we have not yet needed that data, it is not saved to the file. This could be easily remedied. 
+
+
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,11 @@ class SonicClientBase {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`void finish(std::exception_ptr eptr = std::exception_ptr{}) {`
	`31`	`+ /*unsigned int clientTime = 0;`
`31`	`32`	`if(setTime_){`
`32`	`33`	`auto t1 = std::chrono::high_resolution_clock::now();`
`33`		`- edm::LogInfo(debugName_) << "Client time: " << std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0_).count();`
`34`		`- }`
	`34`	`+ clientTime = (unsigned int)std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0_).count();`
	`35`	`+ }*/`
`35`	`36`	`holder_.doneWaiting(eptr);`
`36`	`37`	`}`
`37`	`38`