Merge pull request #70 from MaxSagebaum/feature/codipack_version_change

Prepare for CoDiPack v3.

Author: MathieuMorlighem

src/c/cores/controlvalidation_core.cpp

@@ -97,7 +97,7 @@ void simul_stoptrace2(){/*{{{*/
 
 	#elif defined(_HAVE_CODIPACK_)
 
-	#if _CODIPACK_MAJOR_==2
+	#if _CODIPACK_MAJOR_>=2
 	auto& tape_codi = IssmDouble::getTape();
 	#elif _CODIPACK_MAJOR_==1
 	auto& tape_codi = IssmDouble::getGlobalTape();

src/c/toolkits/codipack/CoDiPackCommon.hpp

@@ -34,7 +34,7 @@ inline void setVectorPrimal(Real* vec, const Passive* pasVec, int n) {
 template<typename Real, typename Data>
 inline void getVectorGradData(const Real* vec, Data* dataVec, int n) {
   for(int i = 0; i < n; ++i) {
-	 #if _CODIPACK_MAJOR_==2
+	 #if _CODIPACK_MAJOR_>=2
     dataVec[i]=vec[i].getIdentifier();
 	 #elif _CODIPACK_MAJOR_==1
 	 dataVec[i]=vec[i].getGradientData();
@@ -48,7 +48,7 @@ template<typename Real, typename Passive, typename Data>
 inline void getVectorPrimalAndGradData(const Real* vec, Passive* pasVec, Data* dataVec, int n) {
   for(int i = 0; i < n; ++i) {
     pasVec[i]=vec[i].getValue();
-	 #if _CODIPACK_MAJOR_==2
+	 #if _CODIPACK_MAJOR_>=2
     dataVec[i]=vec[i].getIdentifier();
 	 #elif _CODIPACK_MAJOR_==1
 	 dataVec[i]=vec[i].getGradientData();
@@ -61,7 +61,7 @@ inline void getVectorPrimalAndGradData(const Real* vec, Passive* pasVec, Data* d
 template<typename Real, typename Passive, typename Data>
 inline void getPrimalAndGradData(const Real& value, Passive& pas, Data& data) {
   pas=value.getValue();
-  #if _CODIPACK_MAJOR_==2
+  #if _CODIPACK_MAJOR_>=2
   data=value.getIdentifier();
   #elif _CODIPACK_MAJOR_==1
   data=value.getGradientData();
@@ -72,7 +72,7 @@ inline void getPrimalAndGradData(const Real& value, Passive& pas, Data& data) {
 
 template<typename Real, typename Data>
 inline void registerVector(Real* vec, Data* dataVec, int n) {
-	#if _CODIPACK_MAJOR_==2
+	#if _CODIPACK_MAJOR_>=2
 	typename Real::Tape& tape = Real::getTape();
 	#elif _CODIPACK_MAJOR_==1
 	typename Real::TapeType& tape = Real::getGlobalTape();
@@ -82,7 +82,7 @@ inline void registerVector(Real* vec, Data* dataVec, int n) {
 
   for(int i = 0; i < n; ++i) {
     tape.registerInput(vec[i]);
-	 #if _CODIPACK_MAJOR_==2
+	 #if _CODIPACK_MAJOR_>=2
     dataVec[i]=vec[i].getIdentifier();
 	 #elif _CODIPACK_MAJOR_==1
 	 dataVec[i]=vec[i].getGradientData();

src/c/toolkits/gsl/DenseGslSolve.cpp

@@ -253,7 +253,7 @@ void SolverxSeq(IssmDouble *X,IssmDouble *A,IssmDouble *B,int n, Parameters* par
 #endif
 
 #ifdef _HAVE_CODIPACK_
-#if _CODIPACK_MAJOR_==2
+#if _CODIPACK_MAJOR_>=2
 using Tape = typename IssmDouble::Tape;
 using AccessInterface = codi::VectorAccessInterface<typename Tape::Real, typename Tape::Identifier>;
 void SolverxSeq_codi_b(Tape* tape,void* data_in, AccessInterface* ra) {/*{{{*/

src/c/toolkits/mpi/issmmpi.h

@@ -33,7 +33,7 @@
 			//#include <codi/externals/codiMpiTypes.hpp>
 			//using MpiTypes = CoDiMpiTypes<IssmDouble>;
 			/*New implementation*/
-			#if _CODIPACK_MAJOR_==2
+			#if _CODIPACK_MAJOR_>=2
 			#include <codi/tools/mpi/codiMpiTypes.hpp>
 			using MpiTypes = codi::CoDiMpiTypes<IssmDouble>;
 

src/c/toolkits/mumps/MumpsSolve.cpp

@@ -484,7 +484,7 @@ int fos_reverse_mumpsSolveEDF(int iArrLength, int* iArr, int m, IssmPDouble *dp_
 #endif
 
 #ifdef _HAVE_CODIPACK_
-#if _CODIPACK_MAJOR_==2
+#if _CODIPACK_MAJOR_>=2
 using Tape = typename IssmDouble::Tape;
 using AccessInterface = codi::VectorAccessInterface<typename Tape::Real, typename Tape::Identifier>;
 void MumpsSolve_codi_b(Tape* tape, void* data_in, AccessInterface* ra) {/*{{{*/