Changeset 26432

Timestamp:

09/04/21 18:06:05 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on integrating CoDiPack 2.0, still not working

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (2 diffs)
• classes/IoModel.cpp (modified) (5 diffs)
• cores/ad_core.cpp (modified) (1 diff)
• cores/controladm1qn3_core.cpp (modified) (7 diffs)
• cores/controlvalidation_core.cpp (modified) (7 diffs)
• cores/transient_core.cpp (modified) (1 diff)
• shared/io/Marshalling/Marshalling.cpp (modified) (5 diffs)
• shared/io/Marshalling/Marshalling.h (modified) (3 diffs)
• toolkits/codipack/CoDiPackCommon.hpp (modified) (3 diffs)
• toolkits/gsl/DenseGslSolve.cpp (modified) (3 diffs)
• toolkits/mpi/issmmpi.h (modified) (1 diff)
• toolkits/mumps/MumpsSolve.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp ¶

@@ -2307 +2307 @@
 
                         #if defined(_HAVE_CODIPACK_)
-                        auto& tape_codi = IssmDouble::getGlobalTape();
+                        auto& tape_codi = IssmDouble::getTape();
                         #endif
 
@@ -2319 +2319 @@
                                                 tape_codi.registerOutput(output_value);
                                                 dependents[i] = output_value.getValue();
-                                                codi_global.output_indices.push_back(output_value.getGradientData());
+                                                codi_global.output_indices.push_back(output_value.getIdentifier());
                                         #else
                                                 output_value>>=dependents[i];

issm/trunk-jpl/src/c/classes/IoModel.cpp ¶

@@ -2065 +2065 @@
                                 scalar=pscalar;
                         }
-                        auto& tape_codi = IssmDouble::getGlobalTape();
+                        auto& tape_codi = IssmDouble::getTape();
                         tape_codi.registerInput(scalar);
-                        codi_global.input_indices.push_back(scalar.getGradientData());
+                        codi_global.input_indices.push_back(scalar.getIdentifier());
                 #else
                         if(X){
@@ -2138 +2138 @@
                         #if defined(_HAVE_CODIPACK_)
                                 // FIXME codi here we just assign instead of using "operator <<="
-                                auto& tape_codi = IssmDouble::getGlobalTape();
+                                auto& tape_codi = IssmDouble::getTape();
                                 if(X){
                                         for (int i=0;i<M*N;i++) {
                                                 matrix[i]=X[Xcount+i];
                                                 tape_codi.registerInput(matrix[i]);
-                                                codi_global.input_indices.push_back(matrix[i].getGradientData());
+                                                codi_global.input_indices.push_back(matrix[i].getIdentifier());
                                         }
                                 }
@@ -2150 +2150 @@
                                                 matrix[i]=buffer[i];
                                                 tape_codi.registerInput(matrix[i]);
-                                                codi_global.input_indices.push_back(matrix[i].getGradientData());
+                                                codi_global.input_indices.push_back(matrix[i].getIdentifier());
                                         }
                                 }
@@ -2963 +2963 @@
                  * -> These parameters are not read for the CoDiPack ISSM version!
                  */
-                auto& tape_codi = IssmDouble::getGlobalTape();
+                auto& tape_codi = IssmDouble::getTape();
                 tape_codi.setActive();
                 #if _AD_TAPE_ALLOC_
@@ -2976 +2976 @@
                 /*
                 std::stringstream out_s;
-                IssmDouble::getGlobalTape().printStatistics(out_s);
+                IssmDouble::getTape().printStatistics(out_s);
                 _printf0_("StartTrace::Tape Statistics     : TapeAlloc count=[" << codi_allocn << "]\n" << out_s.str());
                 */

issm/trunk-jpl/src/c/cores/ad_core.cpp ¶

@@ -326 +326 @@
 
                         /*First, stop tracing: */
-                        auto& tape_codi = IssmDouble::getGlobalTape();
+                        auto& tape_codi = IssmDouble::getTape();
                         tape_codi.setPassive();
 

issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp ¶

@@ -75 +75 @@
                  * -> These parameters are not read for the CoDiPack ISSM version!
                  */
-                auto& tape_codi = IssmDouble::getGlobalTape();
+                auto& tape_codi = IssmDouble::getTape();
                 tape_codi.setActive();
                 #if _AD_TAPE_ALLOC_
@@ -88 +88 @@
                 /*
                 std::stringstream out_s;
-                IssmDouble::getGlobalTape().printStatistics(out_s);
+                IssmDouble::getTape().printStatistics(out_s);
                 _printf0_("StartTrace::Tape Statistics     : TapeAlloc count=[" << codi_allocn << "]\n" << out_s.str());
                 */
@@ -153 +153 @@
                 #endif
                 std::stringstream out_s;
-                IssmDouble::getGlobalTape().printStatistics(out_s);
+                IssmDouble::getTape().printStatistics(out_s);
                 _printf0_("CoDiPack Profiling::Tape Statistics :\n" << out_s.str());
                 #endif
@@ -159 +159 @@
 
         #elif defined(_HAVE_CODIPACK_)
-        auto& tape_codi = IssmDouble::getGlobalTape();
+        auto& tape_codi = IssmDouble::getTape();
         tape_codi.setPassive();
         if(VerboseAutodiff()){
@@ -239 +239 @@
         }
         #elif defined(_HAVE_CODIPACK_)
-        auto& tape_codi = IssmDouble::getGlobalTape();
+        auto& tape_codi = IssmDouble::getTape();
         codi_global.input_indices.clear();
         if(my_rank==0){
@@ -245 +245 @@
                         aX[i]=X[i];
                         tape_codi.registerInput(aX[i]);
-                        codi_global.input_indices.push_back(aX[i].getGradientData());
+                        codi_global.input_indices.push_back(aX[i].getIdentifier());
                 }
         }
@@ -285 +285 @@
                         tape_codi.registerOutput(output_value);
                         dependents[i] = output_value.getValue();
-                        codi_global.output_indices.push_back(output_value.getGradientData());
+                        codi_global.output_indices.push_back(output_value.getIdentifier());
 
                         #elif defined(_HAVE_ADOLC_)

issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp ¶

@@ -50 +50 @@
                  * -> These parameters are not read for the CoDiPack ISSM version!
                  */
-                auto& tape_codi = IssmDouble::getGlobalTape();
+                auto& tape_codi = IssmDouble::getTape();
                 tape_codi.setActive();
                 #if _AD_TAPE_ALLOC_
@@ -63 +63 @@
                 /*
                 std::stringstream out_s;
-                IssmDouble::getGlobalTape().printStatistics(out_s);
+                IssmDouble::getTape().printStatistics(out_s);
                 _printf0_("StartTrace::Tape Statistics     : TapeAlloc count=[" << codi_allocn << "]\n" << out_s.str());
                 */
@@ -127 +127 @@
                 #endif
                 std::stringstream out_s;
-                IssmDouble::getGlobalTape().printStatistics(out_s);
+                IssmDouble::getTape().printStatistics(out_s);
                 _printf0_("CoDiPack Profiling::Tape Statistics :\n" << out_s.str());
                 #endif
@@ -133 +133 @@
 
         #elif defined(_HAVE_CODIPACK_)
-        auto& tape_codi = IssmDouble::getGlobalTape();
+        auto& tape_codi = IssmDouble::getTape();
         tape_codi.setPassive();
         if(VerboseAutodiff()){
@@ -190 +190 @@
         simul_starttrace2(femmodel);
         IssmDouble* aX=xNew<IssmDouble>(n);
-        auto& tape_codi = IssmDouble::getGlobalTape();
+        auto& tape_codi = IssmDouble::getTape();
         codi_global.input_indices.clear();
         if(my_rank==0){
@@ -196 +196 @@
                         aX[i]=X0[i];
                         tape_codi.registerInput(aX[i]);
-                        codi_global.input_indices.push_back(aX[i].getGradientData());
+                        codi_global.input_indices.push_back(aX[i].getIdentifier());
                 }
         }
@@ -230 +230 @@
                         tape_codi.registerOutput(output_value);
                         dependents[i] = output_value.getValue();
-                        codi_global.output_indices.push_back(output_value.getGradientData());
+                        codi_global.output_indices.push_back(output_value.getIdentifier());
                         J+=output_value;
                 }

issm/trunk-jpl/src/c/cores/transient_core.cpp ¶

@@ -374 +374 @@
 
         /*Start tracing*/
-        auto& tape_codi = IssmDouble::getGlobalTape();
+        auto& tape_codi = IssmDouble::getTape();
         tape_codi.setActive();
 

issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.cpp ¶

@@ -75 +75 @@
         this->identifiers  = identifiers_in;
         this->size_max         = size_max_in;
-        this->tape_codi    = &(IssmDouble::getGlobalTape());
+        this->tape_codi    = &(IssmDouble::getTape());
 }/*}}}*/
 void RegisterInputFunctor::Echo(void){/*{{{*/
@@ -84 +84 @@
         _assert_(this->double_count<size_max);
         this->tape_codi->registerInput(value);
-        this->identifiers[this->double_count] = value.getGradientData();
+        this->identifiers[this->double_count] = value.getIdentifier();
         this->double_count++;
 }/*}}}*/
@@ -92 +92 @@
                         _assert_(this->double_count<size_max);
                         this->tape_codi->registerInput(value[i]);
-                        this->identifiers[this->double_count] = value[i].getGradientData();
+                        this->identifiers[this->double_count] = value[i].getIdentifier();
                         this->double_count++;
                 }
@@ -100 +100 @@
 RegisterOutputFunctor::RegisterOutputFunctor(void) : MarshallHandle(AD_REGISTEROUTPUT){/*{{{*/
         this->double_count = 0;
-        this->tape_codi    = &(IssmDouble::getGlobalTape());
+        this->tape_codi    = &(IssmDouble::getTape());
 }/*}}}*/
 void RegisterOutputFunctor::Echo(void){/*{{{*/
@@ -121 +121 @@
 SetAdjointFunctor::SetAdjointFunctor(double* adjoint_in,int size_max_in) : MarshallHandle(AD_SETADJOINT){/*{{{*/
         this->double_count = 0;
-        this->tape_codi    = &(IssmDouble::getGlobalTape());
+        this->tape_codi    = &(IssmDouble::getTape());
         this->adjoint      = adjoint_in;
         this->size_max     = size_max_in;

issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h ¶

@@ -128 +128 @@
                 int *identifiers;
                 int  size_max;
-                IssmDouble::TapeType *tape_codi;
+                IssmDouble::Tape *tape_codi;
 
         public:
@@ -142 +142 @@
         private:
                 int   double_count;
-                IssmDouble::TapeType* tape_codi;
+                IssmDouble::Tape* tape_codi;
 
         public:
@@ -157 +157 @@
                 int                   double_count;
                 int                   size_max;
-                IssmDouble::TapeType* tape_codi;
+                IssmDouble::Tape* tape_codi;
                 double*               adjoint;
 

issm/trunk-jpl/src/c/toolkits/codipack/CoDiPackCommon.hpp ¶

@@ -35 +35 @@
 inline void getVectorGradData(const Real* vec, Data* dataVec, int n) {
   for(int i = 0; i < n; ++i) {
-    dataVec[i]=vec[i].getGradientData();
+    dataVec[i]=vec[i].getIdentifier();
   }
 }
@@ -43 +43 @@
   for(int i = 0; i < n; ++i) {
     pasVec[i]=vec[i].getValue();
-    dataVec[i]=vec[i].getGradientData();
+    dataVec[i]=vec[i].getIdentifier();
   }
 }
@@ -50 +50 @@
 inline void getPrimalAndGradData(const Real& value, Passive& pas, Data& data) {
   pas=value.getValue();
-  data=value.getGradientData();
+  data=value.getIdentifier();
 }
 
 template<typename Real, typename Data>
 inline void registerVector(Real* vec, Data* dataVec, int n) {
-  typename Real::TapeType& tape = Real::getGlobalTape();
+  typename Real::TapeType& tape = Real::getTape();
 
   for(int i = 0; i < n; ++i) {
     tape.registerInput(vec[i]);
-    dataVec[i]=vec[i].getGradientData();
+    dataVec[i]=vec[i].getIdentifier();
   }
 }

issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp ¶

@@ -258 +258 @@
         /*recast data_in and tape*/
         codi::DataStore* data = (codi::DataStore*)data_in;
-        //IssmDouble::TapeType& tape = (IssmDouble::TapeType&)tape_in;
-        IssmDouble::TapeType& tape = IssmDouble::getGlobalTape();
+        //IssmDouble::Tape& tape = (IssmDouble::Tape&)tape_in;
+        IssmDouble::Tape& tape = IssmDouble::getTape();
 
   IssmDouble::Real* valueATrans;
@@ -277 +277 @@
 
   // create the adjoint vector for x and reset the adjoint values on the tape
-  IssmDouble::GradientValue* adjX = xNew<IssmDouble::GradientValue>(n);
+  IssmDouble::Gradient* adjX = xNew<IssmDouble::Gradient>(n);
   getVectorAdjoint(tape, indexX, adjX, n);
 
-  IssmDouble::GradientValue* sol  = xNew<IssmDouble::GradientValue>(n);
+  IssmDouble::Gradient* sol  = xNew<IssmDouble::Gradient>(n);
   SolverxSeq(sol, valueATrans, adjX, n);
 
@@ -324 +324 @@
 /*}}}*/
 void SolverxSeq(IssmDouble *X,IssmDouble *A,IssmDouble *B,int n, Parameters* parameters){/*{{{*/
-  IssmDouble::TapeType& tape = IssmDouble::getGlobalTape();
+  IssmDouble::Tape& tape = IssmDouble::getTape();
   codi::DataStore* dataHandler = NULL;
 

issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h ¶

@@ -31 +31 @@
                         //#define AMPI_ADOUBLE TOOL::MPI_TYPE
                         //
+                        //#include <codi/externals/codiMpiTypes.hpp>
+                        //using MpiTypes = CoDiMpiTypes<IssmDouble>;
                         /*New implementation*/
-                        #include <codi/externals/codiMpiTypes.hpp>
-                        using MpiTypes = CoDiMpiTypes<IssmDouble>;
+                        #include <codi/tools/mpi/codiMpiTypes.hpp>
+         using MpiTypes = codi::CoDiMpiTypes<IssmDouble>;
                         extern MpiTypes* mpiTypes;
                         #define AMPI_ADOUBLE mpiTypes->MPI_TYPE

issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp ¶

@@ -489 +489 @@
         /*recast data_in and tape*/
   codi::DataStore* data = (codi::DataStore*)data_in;
-  //IssmDouble::TapeType& tape = (IssmDouble::TapeType&)tape_in;
-  IssmDouble::TapeType& tape = IssmDouble::getGlobalTape();
+  //IssmDouble::Tape& tape = (IssmDouble::Tape&)tape_in;
+  IssmDouble::Tape& tape = IssmDouble::getTape();
 
 
@@ -518 +518 @@
 
   // create the adjoint vector for x and reset the adjoint values on the tape
-  IssmDouble::GradientValue* adjX = xNew<IssmDouble::GradientValue>(n);
+  IssmDouble::Gradient* adjX = xNew<IssmDouble::Gradient>(n);
   getVectorAdjoint(tape, indexX, adjX, n);
 
@@ -581 +581 @@
 /*}}}*/
 void MumpsSolve(int n,int nnz,int local_nnz,int* irn_loc,int* jcn_loc,IssmDouble *a_loc,IssmDouble *rhs,Parameters* parameters){/*{{{*/
-  IssmDouble::TapeType& tape = IssmDouble::getGlobalTape();
+  IssmDouble::Tape& tape = IssmDouble::getTape();
   codi::DataStore* dataHandler = NULL;