Changeset 3895 in Sophya for trunk/AddOn/TAcq/brviscalc.cc

Timestamp:

Sep 28, 2010, 8:15:29 PM (15 years ago)

Author:

ansari

Message:

correction bugs divers ds calcul visibilites avec plusieurs threads en execution parallele et amelioration prints, Reza 28/09/2010

File:

• trunk/AddOn/TAcq/brviscalc.cc (modified) (10 diffs)

trunk/AddOn/TAcq/brviscalc.cc

@@ -69 +69 @@
 {
   if (totnbpaq_<1)   return; 
-  cout << " BRVisibilityCalculator - Visibility Datatable : " << endl;
+  cout << " ~BRVisibilityCalculator - Visibility Datatable : " << endl;
   cout << visdt_;
   
@@ -76 +76 @@
   if (nbcalc_>1) {
     char sbuff[32];
-    sprintf(sbuff,"visdt_%d",(int)calcid_);
+    sprintf(sbuff,"visdt_%d.ppf",(int)calcid_);
     filename = outpath_+sbuff;
   }
@@ -230 +230 @@
           POutPersist po(flnm);
           po << vismtx_;
-          cout << numfile_ << "-BRVisibilityCalculator[" << calcid_ << "]::run() NPaqProc="
-               << totnbpaq_ << "  -> Visibility Matrix in " << flnm << endl;
+          cout << numfile_ << "-BRVisCalc[" << calcid_ << "/" << nbcalc_ << "]::run() NPaqProc="
+               << totnbpaq_ << " TotMegaFLOP=" << (uint_8)TotNbMegaFLOP() << " -> VisibMtx in " << flnm << endl;
+
           FillVisibTable(moyfc_, moytt_);
           numfile_++;
@@ -237 +238 @@
         vismtx_ = complex<r_4>((r_4)0.,(r_4)0.);
         moyfc_=moytt_=0.;
-        first_fc_=curfc_[0];
-        first_tt_= (vpaq_[0].TimeTag()-ttfirst_[0]);
         first_tmstamp_.SetNow();  // Current date and time 
       }
@@ -260 +259 @@
           moytt_ += (vpaq_[0].TimeTag()-ttfirst_[0]);
           if ((fgcktt_)&&(calcid_==0))  CheckTimeTag();
+          if (totnbpaq_%nmean_ == 0) {
+            first_fc_=curfc_[0];
+            first_tt_= (vpaq_[0].TimeTag()-ttfirst_[0]);
+          }
           totnbpaq_++;
         }
       }  // Fin de boucle sur les paquets 
-      
+
       // Execution parallele  pour calcul des visibilites par bandes de frequence
       int rcpex=paralex_.execute();
@@ -314 +317 @@
       POutPersist po(flnm);
       po << vismtx_;
-      cout << numfile_ << "-BRVisibilityCalculator::Process() NPaqProc="
-           << totnbpaq_ << "  -> Visibility Matrix in " << flnm << endl;
+      cout << numfile_ << "-BRVisCalc[" << calcid_ << "/" << nbcalc_ << "]::Process() NPaqProc="
+           << totnbpaq_ << " TotMegaFLOP=" << (uint_8)TotNbMegaFLOP() << " -> VisibMtx in " << flnm << endl;
       FillVisibTable(moyfc_, moytt_);
       numfile_++;
@@ -327 +330 @@
 
 // kpair=numero sequentiel de la paire: 0->(0,0), 1->(0,1), 2->(0,2), 3->(0,3), 4->(1,1), 5->(1,2) ...
-  sa_size_t kpair=0;  
+  sa_size_t kpair=0;
+  sa_size_t k=0;     // numero de ligne dans la matrice des visibilites 
   for(size_t i=0; i<vpdata_.size(); i++) {
     for(size_t j=i; j<vpdata_.size(); j++) {
-      if (kpair<pairst_)  continue;
-      if (kpair>=(pairst_+nbpairs_))  break;
-      TVector< complex<r_4> > vis = vismtx_.Row(kpair);   
+      kpair++;
+      if (kpair<(pairst_+1))  continue;
+      if (kpair>=(pairst_+nbpairs_+1))  break;
+      TVector< complex<r_4> > vis = vismtx_.Row(k);  k++;   
       for(sa_size_t f=1; f<vis.Size(); f++) {
         vis(f) += complex<r_4>((r_4)vpdata_[i][f].realB(), (r_4)vpdata_[i][f].imagB()) * 
           complex<r_4>((r_4)vpdata_[j][f].realB(), -(r_4)vpdata_[j][f].imagB());
       }
-      kpair++;
-      nb_flop_ += (7.*(r_8)vis.Size());
+      nb_flop_ += (8.*(r_8)(vis.Size()-1));
     }
   }
@@ -385 +389 @@
   size_t paqsz=memgr_.PaqSize();
   BRPaquet ppaq(paqsz);
+
 
   sa_size_t fdelt = vismtx_.NCols()/nparthr_;
@@ -400 +405 @@
       pvpdata[2*fib+1] = ppaq.Data2C();
     }
+
+
 // kpair=numero sequentiel de la paire: 0->(0,0), 1->(0,1), 2->(0,2), 3->(0,3), 4->(1,1), 5->(1,2) ...
-    sa_size_t kpair=0;  
+    sa_size_t kpair=0;
+    sa_size_t k=0;     // numero de ligne dans la matrice des visibilites 
     for(size_t i=0; i<vpdata_.size(); i++) {
       for(size_t j=i; j<vpdata_.size(); j++) {
-        size_t kpair=i*vpdata_.size()+j;
-        if (kpair<pairst_)  continue;
-        if (kpair>=(pairst_+nbpairs_))  break;
-        TVector< complex<r_4> > vis = vismtx_.Row(kpair);  
+        kpair++;
+        if (kpair<(pairst_+1))  continue;
+        if (kpair>=(pairst_+nbpairs_+1))  break;
+        TVector< complex<r_4> > vis = vismtx_.Row(k);  k++;  
         for(sa_size_t f=fdeb; f<ffin; f++) {
           vis(f) += complex<r_4>((r_4)pvpdata[i][f].realB(), (r_4)pvpdata[i][f].imagB()) * 
             complex<r_4>((r_4)pvpdata[j][f].realB(), -(r_4)pvpdata[j][f].imagB());
         }
-        kpair++;
-        nb_flop_ += (7.*(r_8)(ffin-fdeb));
+        nb_flop_ += (8.*(r_8)(ffin-fdeb));
       }
     }
@@ -539 +546 @@
   for(size_t i=0; i<viscalcp_.size(); i++) {
     viscalcp_[i]->join();
+    //    cout << " BRVisCalcGroup::join()/ VisibCalc[" << i << "]->TotNbMegaFLOP()=" 
+    //   << viscalcp_[i]->TotNbFLOP()/1024e3 << endl;
     totflop += viscalcp_[i]->TotNbFLOP();
   }
   tm_.SplitQ();
   cout << "      ----------------------------------------------------------" << endl;
-  cout << " BRVisCalcGroup::join() : Finished , Elaspsed time: " << tm_.PartialElapsedTimems() 
-       << " ms (total:" << tm_.TotalElapsedTimems() << ")" << endl;
+  cout << " BRVisCalcGroup::join() : Finished " << viscalcp_.size() << " VisibilityCalculator(s)" << endl;
+  cout << " ... Elaspsed time: " << tm_.PartialElapsedTimems() 
+       << " ms (total:" << tm_.TotalElapsedTimems() << ")"  << endl;
+  double mflopsrate=totflop/(r_8)tm_.PartialElapsedTimems()/(1024.);
   cout << " ... TotalMegaFLOP= " << totflop/(1024.e3) << " @ " 
-       << totflop/(r_8)tm_.PartialElapsedTimems()/(1024) << " MFLOP/s" << endl; 
+       << mflopsrate << " MFLOP/s" << " (=" << mflopsrate/(r_8)viscalcp_.size() << "/VisibCalcObject)" << endl; 
   cout << "      ----------------------------------------------------------" << endl;
   return;