Adding onnx rpath to Makefile and ObjectNode change for COMB

Author: ahmetcansansar

CLA/Makefile

@@ -18,7 +18,7 @@ ifeq ($(strip $(ONNX_PATH)),)
 else
     # Library found
     $(info ONNX path is set to ${ONNX_PATH})
-    ONNX_LIB := -L$(ONNX_PATH)/lib -lonnxruntime
+    ONNX_LIB := -L$(ONNX_PATH)/lib -lonnxruntime -Wl,-rpath,$(ONNX_PATH)/lib
     ONNX_INC := -I$(ONNX_PATH)/include
 endif
 
@@ -153,4 +153,3 @@ clean:
 # clean everything including the auxiliaries we depend on
 cleanall: clean
 	$(MAKE) -C $(SUBDIRLOC)analysis_core clean
-

analysis_core/OMENode.h

@@ -63,9 +63,9 @@ class OMENode : public Node{
         uint32_t coreml_flags = 0;
 //           coreml_flags |= COREML_FLAG_ONLY_ENABLE_DEVICE_WITH_ANE;
 //           coreml_flags |= COREML_FLAG_ENABLE_ON_SUBGRAPH;
-             coreml_flags |= COREML_FLAG_USE_CPU_ONLY;
+//             coreml_flags |= COREML_FLAG_USE_CPU_ONLY;
 
-        Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CoreML(session_options, coreml_flags));
+//        Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CoreML(session_options, coreml_flags));
         session = new Ort::Session(env, model_file.c_str(), session_options);
 
         Ort::AllocatorWithDefaultOptions allocator;

analysis_core/ObjectNode.cpp

@@ -2515,7 +2515,7 @@ void createNewParti(AnalysisObjects* ao, vector<Node*> *criteria, std::vector<my
         alv.SetPxPyPzE(0,0,0,0);
         DEBUG("\n");
     }
-    ao->combos.insert( pair <string,vector<dbxParticle> > (name,     combination) );
+    (ao->combos)[name] = combination;
 
      vector<vector<int>> bad_combinations;
        set<vector<int>> good_combinations;
@@ -2569,8 +2569,8 @@ void createNewParti(AnalysisObjects* ao, vector<Node*> *criteria, std::vector<my
                    particles->at(jp)->index =temp_index[abs(1+tidx1)]; // means we respect order -1, -2 
                    DEBUG("new index: "<< particles->at(jp)->index  <<"\n");
                 } else {
-//                  particles->at(jp)->index=ipart;
-//                  particles->at(jp)->collection=name;
+                  particles->at(jp)->index=ipart;
+                  particles->at(jp)->collection=name;
                  ;
                 }
                }
@@ -2579,10 +2579,9 @@ void createNewParti(AnalysisObjects* ao, vector<Node*> *criteria, std::vector<my
                DEBUG("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ P or F: ~~~~~~ "<<ppassed<<"\n");
                if (!ppassed) {
 
-                              DEBUG("Removing:"<<name<<" " <<ipart<<"th combi.\n");
-			      (ao->combos).find(name)->second.erase( (ao->combos).find(name)->second.begin()+ipart);
-		 	      bad_combinations.push_back(combi_out[ipart]);
-		 	      good_combinations.erase(combi_out[ipart]);
+                              DEBUG("marking as bad:"<<name<<" " <<ipart<<"th combi.\n");
+			 	      bad_combinations.push_back(combi_out[ipart]);
+			 	      good_combinations.erase(combi_out[ipart]);
 	     		    } else {      
                               good_combinations.insert(combi_out[ipart]);
                             }
@@ -2650,10 +2649,20 @@ void createNewParti(AnalysisObjects* ao, vector<Node*> *criteria, std::vector<my
       cutIterator++;
     }// end of  cut iterator loop
 
+// remove the bad combinations here
+	for (int ipart=ipart_max-1; ipart>=0; ipart--){ // loop over combis
+          std::vector< vector<int> >::iterator itb; // bad list iterator
+          itb=find (bad_combinations.begin(), bad_combinations.end(), combi_out[ipart]);
+          if ( itb != bad_combinations.end() ) {
+             DEBUG("Removing:" <<ipart<<" of combis:"<<(ao->combos).find(name)->second.size() );
+  	     (ao->combos).find(name)->second.erase( (ao->combos).find(name)->second.begin()+ipart);
+          }
+         }
+
    if (requested_max<=0) { //probably no particle available,never here
      vector<vector<int>> table_B;
      indicesA indexA={table_B, 0, 0};
-     ao->combosA.insert( pair <string, indicesA > (name,     indexA) );
+     (ao->combosA)[name] = indexA;
      return;
    }
 
@@ -2739,7 +2748,7 @@ void createNewParti(AnalysisObjects* ao, vector<Node*> *criteria, std::vector<my
     }
 
     indicesA indexA={table_B, amaxrow, (int)table_B.size() };
-    ao->combosA.insert( pair <string, indicesA > (name,     indexA) );
+    (ao->combosA)[name] = indexA;
 
     out_selection.clear();
 //    NANT's code, to be commented in later