Changeset 13767


Ignore:
Timestamp:
10/20/12 00:24:34 (12 years ago)
Author:
Eric.Larour
Message:

CHG: made necessary changes to repair the broken adolc compile. Had to introduce _WRAPPER_ symbol
for the matlab and python wrapper compile, as they were calling on AD specific capabilities!

Location:
issm/trunk-jpl/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/AdolcEdf.h

    r13530 r13767  
    99#define _ADOLC_EDF_H_
    1010
    11 #ifdef _HAVE_ADOLC_
     11#ifdef HAVE_CONFIG_H
     12        #include <config.h>
     13#else
     14#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
     15#endif
     16
     17
     18#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
    1219
    1320struct Adolc_edf {

  • issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h

    r13623 r13767  
    9191};
    9292
    93 #ifdef _HAVE_ADOLC_ //We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization.
     93#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) //We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization.
    9494template <> inline void GenericOption<IssmPDouble*>::Get(IssmPDouble** pvalue){ /*{{{*/
    9595

  • issm/trunk-jpl/src/c/include/types.h

    r13613 r13767  
    2626#endif 
    2727
    28 #ifdef _HAVE_ADOLC_
     28#if defined(_HAVE_ADOLC_) &&  !defined(_WRAPPERS_)
    2929#include "adolc/adolc.h"
    3030// for active variables

  • issm/trunk-jpl/src/c/modules/Solverx/Solverx.h

    r13623 r13767  
    2727void SolverxSeq(IssmPDouble *X, IssmPDouble *A, IssmPDouble *B,int n);
    2828
    29 #ifdef _HAVE_ADOLC_
     29#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
    3030void SolverxSeq(IssmDouble *X,IssmDouble *A,IssmDouble *B,int n, Parameters* parameters);
    3131// call back functions:

  • issm/trunk-jpl/src/c/shared/Numerics/isnan.h

    r12583 r13767  
    55#ifndef _XISNAN_H_
    66#define _XISNAN_H_
     7
     8#ifdef HAVE_CONFIG_H
     9   #include <config.h>
     10#else
     11#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
     12#endif
     13
    714
    815#include <cmath>
    … …  
    1623}
    1724
    18 #ifdef _HAVE_ADOLC_
     25#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
    1926template <> int xIsNan<adouble> (const adouble& X);
    2027#endif

  • issm/trunk-jpl/src/c/shared/Numerics/recast.h

    r12546 r13767  
    99#define _RECAST_H_
    1010
    11 #ifndef _HAVE_ADOLC_
     11#ifdef HAVE_CONFIG_H
     12   #include <config.h>
     13#else
     14#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
     15#endif
     16
     17#if !defined(_HAVE_ADOLC_) || defined(_WRAPPERS_)
    1218
    1319template<class To, class From>

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r13753 r13767  
    2424                                ./io/MatlabMatrixToDoubleMatrix.cpp\
    2525                                ./io/MatlabMatrixToSeqMat.cpp\
    26                                 ./io/MatlabVectorToSeqVec.cpp\
    27                                 ./io/MatlabMatrixToPetscMat.cpp\
     26                                ./io/MatlabVectorToSeqVec.cpp
     27                               
     28if PETSC
     29io_sources= += ./io/MatlabMatrixToPetscMat.cpp\
    2830                                ./io/MatlabVectorToPetscVec.cpp
    29 
    30 ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXFLAGS) $(CXXOPTFLAGS)
     31endif
     32
     33
     34
     35ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS)
    3136libISSMMatlab_a_SOURCES = $(io_sources)
    3237libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS)
    … …  
    8994
    9095#Triangle library
    91 AM_CXXFLAGS =  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
     96AM_CXXFLAGS =  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER -D_WRAPPERS_
    9297
    9398#Matlab part
    … …  
    105110endif
    106111
    107 AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
     112AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_  -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
    108113
    109114if SHAREDLIBS

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToPetscMat.cpp

    r13749 r13767  
    1111
    1212/*Petsc includes: */
     13#ifdef _HAVE_PETSC_
    1314#include <petscmat.h>
    1415#include <petscvec.h>
    1516#include <petscksp.h>
     17#endif
    1618
    1719/*Matlab includes: */

  • issm/trunk-jpl/src/wrappers/python/Makefile.am

    r13749 r13767  
    1717                                ./io/FetchPythonData.cpp
    1818
    19 ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXFLAGS) $(CXXOPTFLAGS)
     19ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS)
    2020libISSMPython_a_SOURCES = $(io_sources)
    2121libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS)
    … …  
    6565endif
    6666
    67 AM_CXXFLAGS +=  -D_HAVE_PYTHON_MODULES_  -fPIC
     67AM_CXXFLAGS +=  -D_HAVE_PYTHON_MODULES_   -fPIC
    6868if PYTHON3
    6969AM_CXXFLAGS +=  -DNPY_NO_DEPRECATED_API
Note: See TracChangeset for help on using the changeset viewer.