Changeset 15091

Timestamp:

05/23/13 21:21:00 (12 years ago)

Author:

Eric.Larour

Message:

CHG: the Windows build requires using mexPrintf instead of printf throughout the core code.
To avoid having to recompiled libISSMCore twice (once for the issm.exe "c++" version of the
code, and once for the Matlab wrappers), we use an ApiPrintf routine, which gets resolved
differently in the wrappers than in the issm.exe build. This allows to handle matlab printf
specific behaviour without having to compile the core in several flavors.

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (2 diffs)
• c/shared/String/ApiPrintf.cpp (added)
• c/shared/String/sharedstring.h (modified) (1 diff)
• c/shared/String/stricmp.c (deleted)
• c/shared/String/stricmp.cpp (added)
• c/shared/io/Print/Print.h (modified) (1 diff)
• c/shared/io/Print/PrintfFunction.cpp (modified) (5 diffs)
• wrappers/matlab/io/WriteMatlabData.cpp (modified) (1 diff)
• wrappers/matlab/io/matlabio.h (modified) (2 diffs)
• wrappers/python/io/WritePythonData.cpp (modified) (1 diff)
• wrappers/python/io/pythonio.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -944 +944 @@
 libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
 libISSMCore_la_FFLAGS = $(AM_FFLAGS)
-
-libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
 endif
 
@@ -971 +969 @@
 #}}}
 #Overload library, to overload any non-standard symbols. {{{
-libISSMOverload_a_SOURCES = ./shared/String/stricmp.c
+libISSMOverload_a_SOURCES = ./shared/String/stricmp.cpp\
+                                                        ./shared/String/ApiPrintf.cpp
+
 libISSMOverload_a_CFLAGS  = -fPIC -D_C_ $(COPTFLAGS) $(CFLAGS)
 #}}}

issm/trunk-jpl/src/c/shared/String/sharedstring.h

@@ -12 +12 @@
 #endif
 
+void ApiPrintf(char* format,const char* string);
+
 #endif //ifndef _SHAREDSTRING_H_

issm/trunk-jpl/src/c/shared/io/Print/Print.h

@@ -52 +52 @@
 /*}}}*/
 
+/* _printLine_ {{{*/
+/* macro to print a line, adds std::endl, only on cpu 0 */
+#define _printLine_(StreamArgs)\
+  do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+          aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
+          PrintfFunction3(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
+/*}}}*/
+
 /*functions: */
 int PrintfFunction(const char* format,...);

issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp

@@ -17 +17 @@
 #include "./Print.h"
 #include "../Comm/Comm.h"
+#include "../../String/sharedstring.h"
 #include "../../MemOps/MemOps.h"
 
@@ -71 +72 @@
                 __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str());
                 #else
-                printf("%s\n",message.c_str());
+                ApiPrintf("%s\n",message.c_str());
                 #endif
         }
@@ -83 +84 @@
 
         if(my_rank==0){
-                printf("%s",message.c_str());
+                ApiPrintf("%s",message.c_str());
         }
         return 1;
@@ -92 +93 @@
         __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str());
         #else
-        printf("%s\n",message.c_str());
+        ApiPrintf("%s\n",message.c_str());
         #endif
 
@@ -99 +100 @@
 int PrintfFunction4(const string & message){
 
-        printf("%s",message.c_str());
+        ApiPrintf("%s",message.c_str());
 
         return 1;

issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp

@@ -488 +488 @@
 }
 /*}}}*/
+
+/*Matlab printf i/o: */
+/*FUNCTION ApiPrintf(char* format, const char* string){{{*/
+void ApiPrintf(char* format,const char* string){
+
+        /*use mexPrintf in matlab: */
+        mexPrintf(format,string);
+        
+        return;
+}
+/*}}}*/

issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h

@@ -16 +16 @@
 #include "../../c/classes/classes.h"
 #include "../../c/toolkits/toolkits.h"
+#include "../../c/shared/shared.h"
 
 void WriteData(mxArray** pdataref,IssmDenseMat<double>* matrix);
@@ -95 +96 @@
 #endif
 
+
 #endif  /* _IO_H_ */

issm/trunk-jpl/src/wrappers/python/io/WritePythonData.cpp

@@ -291 +291 @@
 }
 /*}}}*/
+
+/*Python printf i/o: */
+/*FUNCTION ApiPrintf(char* format, const char* string){{{*/
+void ApiPrintf(char* format,const char* string){
+
+        /*use printf: */
+        printf(format,string);
+        
+        return;
+}
+/*}}}*/

issm/trunk-jpl/src/wrappers/python/io/pythonio.h

@@ -15 +15 @@
 #include "../../c/bamg/bamgobjects.h"
 #include "../../c/classes/classes.h"
+#include "../../c/shared/shared.h"
 
 void WriteData(PyObject* py_tuple,int index, double* matrix, int M,int N);