Changeset 13516

Timestamp:

10/03/12 09:09:23 (12 years ago)

Author:

Eric.Larour

Message:

CHG: modified the way we set keep for trace initialization in AD mode. This is now
decided by the AutodiffKeepEnum boolean, which is initialized by the autodiff class,
instead of this logic happening inside IoModel.cpp.
Also added test3020 which tests forward difference vs AD driver.

Location:

issm/trunk-jpl

Files:

• configs/config-macosx64-larour-bothapis.sh (modified) (1 diff)
• externalpackages/esmf/esmf_4_0_0rp2_src.tar.gz (added)
• src/c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• src/c/classes/IoModel.cpp (modified) (2 diffs)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (2 diffs)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (5 diffs)
• src/m/classes/autodiff.m (modified) (2 diffs)
• src/m/classes/autodiff.py (modified) (1 diff)
• src/m/enum/AutodiffKeepEnum.m (added)
• src/m/enum/EnumDefinitions.py (modified) (2 diffs)
• src/m/enum/MaximumNumberOfEnums.m (modified) (1 diff)
• test/Archives/Archive3020.nc (added)
• test/NightlyRun/test3019.m (modified) (1 diff)
• test/NightlyRun/test3020.m (added)

issm/trunk-jpl/configs/config-macosx64-larour-bothapis.sh

@@ -12 +12 @@
         --with-python-dir=$ISSM_DIR/externalpackages/python/install\
         --with-python-version=$pythonversion \
-        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
+        --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/Library/Frameworks/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
         --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -31 +31 @@
         AutodiffFosReverseIndexEnum,
         AutodiffMassFluxSegmentsPresentEnum,
+        AutodiffKeepEnum,
         BalancethicknessSpcthicknessEnum,
         BalancethicknessStabilizationEnum,

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

@@ -212 +212 @@
         int         numberofvertices;
         int         dummy;
-        char*       driver=NULL;
+        bool        keep=false;
 
 
@@ -226 +226 @@
                 #ifdef _HAVE_ADOLC_
 
-                /*Start the trace:  {{{
-                 * to do so, figure out what kind of driver we are running. Then, according to ADOLC documentation, 
-                 * we'll need to activate keep. 
-                 *
-                 * From ADOLC userdoc: 
-                 * The optional integer argument keep of trace on determines whether the numerical values of all active variables are 
-                 * recorded in a buffered temporary array or file called the taylor stack. This option takes effect if keep = 1 and 
-                 * prepares the scene for an immediately following gradient evaluation by a call to a routine implementing the reverse 
-                 * mode as described in the Section 4 and Section 5. 
-                 *
-                 */
-                this->FetchData(&driver,AutodiffDriverEnum);
-                if (strlen(driver)<=3){
-                        /*there is no "_reverse" string within the driver string: */
-                        if(VerboseAutodiff())_pprintLine_("   trace activated with keep off");
-                        trace_on(1);
-                }
-                else{
-                        if (strncmp((const char*)(driver+3),"_reverse",8)==0){
-                                if(VerboseAutodiff())_pprintLine_("   trace activated with keep on");
-                                trace_on(1,1);
-                        }
-                        else{
-                                if(VerboseAutodiff())_pprintLine_("   trace activated with keep off");
-                                trace_on(1);
-                        }
-                }
-                xDelete<char>(driver);
+                /*Start trace: {{{*/
+                this->FetchData(&keep,AutodiffKeepEnum);
+                if(keep)trace_on(1,1);
+                else    trace_on(1);
+
                 /*}}}*/
                 /*build dataset made of independent objects: {{{*/

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -36 +36 @@
                 case AutodiffFosReverseIndexEnum : return "AutodiffFosReverseIndex";
                 case AutodiffMassFluxSegmentsPresentEnum : return "AutodiffMassFluxSegmentsPresent";
+                case AutodiffKeepEnum : return "AutodiffKeep";
                 case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
                 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";

issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp

@@ -38 +38 @@
         
         if(autodiff_analysis){
+        
+                /*Copy some parameters from IoModel to parameters dataset: */
+                parameters->AddObject(iomodel->CopyConstantObject(AutodiffKeepEnum));
 
-                /*retrieve driver: */
+                /*retrieve driver: {{{*/
                 iomodel->Constant(&autodiff_driver,AutodiffDriverEnum);
                 parameters->AddObject(iomodel->CopyConstantObject(AutodiffDriverEnum));
@@ -55 +58 @@
                         xDelete<int>(indices);
                 }
-
+                /*}}}*/
                 /*Deal with dependents first: {{{*/
                 iomodel->Constant(&num_dependent_objects,AutodiffNumDependentObjectsEnum);

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -37 +37 @@
               else if (strcmp(name,"AutodiffFosReverseIndex")==0) return AutodiffFosReverseIndexEnum;
               else if (strcmp(name,"AutodiffMassFluxSegmentsPresent")==0) return AutodiffMassFluxSegmentsPresentEnum;
+              else if (strcmp(name,"AutodiffKeep")==0) return AutodiffKeepEnum;
               else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
               else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
@@ -137 +138 @@
               else if (strcmp(name,"MeshDimension")==0) return MeshDimensionEnum;
               else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum;
-              else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
+              if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum;
+              else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
               else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum;
               else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
@@ -260 +261 @@
               else if (strcmp(name,"SurfaceSlopeAnalysis")==0) return SurfaceSlopeAnalysisEnum;
               else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
-              else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
+              if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum;
+              else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
               else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
               else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
@@ -383 +384 @@
               else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
               else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
-              else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
+              if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
+              else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
               else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
               else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
@@ -506 +507 @@
               else if (strcmp(name,"Verbose")==0) return VerboseEnum;
               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
-              else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
+              if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
+              else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
               else if (strcmp(name,"XY")==0) return XYEnum;
               else if (strcmp(name,"XYZP")==0) return XYZPEnum;

issm/trunk-jpl/src/m/classes/autodiff.m

@@ -58 +58 @@
                         if ~obj.isautodiff, 
                                 WriteData(fid,'data',false,'enum',AutodiffMassFluxSegmentsPresentEnum,'format','Boolean');
+                                WriteData(fid,'data',false,'enum',AutodiffKeepEnum,'format','Boolean');
                                 return; 
                         end
@@ -180 +181 @@
                         WriteData(fid,'data',flag,'enum',AutodiffMassFluxSegmentsPresentEnum,'format','Boolean');
                         %}}}
+                        %deal with trace keep on: {{{
+                        keep=false;
+
+                        %From ADOLC userdoc: 
+                        % The optional integer argument keep of trace on determines whether the numerical values of all active variables are 
+                        % recorded in a buffered temporary array or file called the taylor stack. This option takes effect if keep = 1 and 
+                        % prepares the scene for an immediately following gradient evaluation by a call to a routine implementing the reverse 
+                        % mode as described in the Section 4 and Section 5. 
+                        %
+
+                        if length(obj.driver)<=3,
+                                keep=false; %there is no "_reverse" string within the driver string: 
+                        else
+                                if strncmpi(obj.driver(4:end),'_reverse',8),
+                                        keep=true;
+                                else
+                                        keep=false;
+                                end
+                        end
+                        WriteData(fid,'data',keep,'enum',AutodiffKeepEnum,'format','Boolean');
+                        %}}}
 
                 end % }}}

issm/trunk-jpl/src/m/classes/autodiff.py

@@ -40 +40 @@
                 WriteData(fid,'object',self,'fieldname','isautodiff','format','Boolean')
                 WriteData(fid,'data',False,'enum',AutodiffMassFluxSegmentsPresentEnum(),'format','Boolean');
+                WriteData(fid,'data',False,'enum',AutodiffKeepEnum(),'format','Boolean');
         # }}}
 

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -199 +199 @@
         return StringToEnum('AutodiffMassFluxSegmentsPresent')[0]
 
+def AutodiffKeepEnum():
+        """
+        AUTODIFFKEEPENUM - Enum of AutodiffKeep
+
+           Usage:
+              macro=AutodiffKeepEnum()
+        """
+
+        return StringToEnum('AutodiffKeep')[0]
+
 def BalancethicknessSpcthicknessEnum():
         """
@@ -4937 +4947 @@
         """
 
-        return 492
-
+        return 493
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=492;
+macro=493;

issm/trunk-jpl/test/NightlyRun/test3019.m

@@ +1 @@
+%test reverse scalar vs forward vectorial drivers in ADOLC, using the test3009 setup, equivalent to test109 setup.
 md=triangle(model,'../Exp/Square.exp',100000);
 md=setmask(md,'all','');