mld2p4:

mlprec/mld_dslu_interface.c mlprec/mld_dslud_interface.c mlprec/mld_dumf_interface.c mlprec/mld_zslu_interface.c mlprec/mld_zslud_interface.c mlprec/mld_zumf_interface.c test/fileread/enablecore.c Fixed CDEFINES names for handling Fortran mangling.
17 years ago · 399305ee41
parent f928f78683
commit 399305ee41
7 changed files with 120 additions and 21 deletions
--- a/mlprec/mld_dslu_interface.c
+++ b/mlprec/mld_dslu_interface.c
@ -116,21 +116,36 @@ typedef struct {
 #endif


-#ifdef Add_
+#ifdef  LowerUnderscore
 #define mld_dslu_fact_   mld_dslu_fact_
 #define mld_dslu_solve_  mld_dslu_solve_
 #define mld_dslu_free_   mld_dslu_free_
 #endif
-#ifdef AddDouble_
+#ifdef  LowerDoubleUnderscore
 #define mld_dslu_fact_   mld_dslu_fact__
 #define mld_dslu_solve_  mld_dslu_solve__
 #define mld_dslu_free_   mld_dslu_free__
 #endif
-#ifdef NoChange
+#ifdef  LowerCase
 #define mld_dslu_fact_   mld_dslu_fact
 #define mld_dslu_solve_  mld_dslu_solve
 #define mld_dslu_free_   mld_dslu_free
 #endif
+#ifdef  UpperUnderscore
+#define mld_dslu_fact_   MLD_DSLU_FACT_
+#define mld_dslu_solve_  MLD_DSLU_SOLVE_
+#define mld_dslu_free_   MLD_DSLU_FREE_
+#endif
+#ifdef  UpperDoubleUnderscore
+#define mld_dslu_fact_   MLD_DSLU_FACT__
+#define mld_dslu_solve_  MLD_DSLU_SOLVE__
+#define mld_dslu_free_   MLD_DSLU_FREE__
+#endif
+#ifdef  UpperCase
+#define mld_dslu_fact_   MLD_DSLU_FACT
+#define mld_dslu_solve_  MLD_DSLU_SOLVE
+#define mld_dslu_free_   MLD_DSLU_FREE
+#endif



--- a/mlprec/mld_dslud_interface.c
+++ b/mlprec/mld_dslud_interface.c
@ -115,21 +115,36 @@ typedef struct {
 #endif


-#ifdef Add_
+#ifdef LowerUnderscore
 #define mld_dsludist_fact_   mld_dsludist_fact_
 #define mld_dsludist_solve_  mld_dsludist_solve_
 #define mld_dsludist_free_   mld_dsludist_free_
 #endif
-#ifdef AddDouble_
+#ifdef LowerDoubleUnderscore
 #define mld_dsludist_fact_   mld_dsludist_fact__
 #define mld_dsludist_solve_  mld_dsludist_solve__
 #define mld_dsludist_free_   mld_dsludist_free__
 #endif
-#ifdef NoChange
+#ifdef LowerCase
 #define mld_dsludist_fact_   mld_dsludist_fact
 #define mld_dsludist_solve_  mld_dsludist_solve
 #define mld_dsludist_free_   mld_dsludist_free
 #endif
+#ifdef UpperUnderscore
+#define mld_dsludist_fact_   MLD_DSLUDIST_FACT_
+#define mld_dsludist_solve_  MLD_DSLUDIST_SOLVE_
+#define mld_dsludist_free_   MLD_DSLUDIST_FREE_
+#endif
+#ifdef UpperDoubleUnderscore
+#define mld_dsludist_fact_   MLD_DSLUDIST_FACT__
+#define mld_dsludist_solve_  MLD_DSLUDIST_SOLVE__
+#define mld_dsludist_free_   MLD_DSLUDIST_FREE__
+#endif
+#ifdef UpperCase
+#define mld_dsludist_fact_   MLD_DSLUDIST_FACT
+#define mld_dsludist_solve_  MLD_DSLUDIST_SOLVE
+#define mld_dsludist_free_   MLD_DSLUDIST_FREE
+#endif



--- a/mlprec/mld_dumf_interface.c
+++ b/mlprec/mld_dumf_interface.c
@ -77,21 +77,36 @@ Availability:



-#ifdef Add_
+#ifdef  LowerUndescore
 #define mld_dumf_fact_   mld_dumf_fact_
 #define mld_dumf_solve_  mld_dumf_solve_
 #define mld_dumf_free_   mld_dumf_free_
 #endif
-#ifdef AddDouble_
+#ifdef  LowerDoubleUndescore
 #define mld_dumf_fact_   mld_dumf_fact__
 #define mld_dumf_solve_  mld_dumf_solve__
 #define mld_dumf_free_   mld_dumf_free__
 #endif
-#ifdef NoChange
+#ifdef  LowerCase
 #define mld_dumf_fact_   mld_dumf_fact
 #define mld_dumf_solve_  mld_dumf_solve
 #define mld_dumf_free_   mld_dumf_free
 #endif
+#ifdef  UpperUndescore
+#define mld_dumf_fact_   MLD_DUMF_FACT_
+#define mld_dumf_solve_  MLD_DUMF_SOLVE_
+#define mld_dumf_free_   MLD_DUMF_FREE_
+#endif
+#ifdef  UpperDoubleUndescore
+#define mld_dumf_fact_   MLD_DUMF_FACT__
+#define mld_dumf_solve_  MLD_DUMF_SOLVE__
+#define mld_dumf_free_   MLD_DUMF_FREE__
+#endif
+#ifdef  UpperCase
+#define mld_dumf_fact_   MLD_DUMF_FACT
+#define mld_dumf_solve_  MLD_DUMF_SOLVE
+#define mld_dumf_free_   MLD_DUMF_FREE
+#endif


 #include <stdio.h>
--- a/mlprec/mld_zslu_interface.c
+++ b/mlprec/mld_zslu_interface.c
@ -115,21 +115,36 @@ typedef struct {
 #endif


-#ifdef Add_
+#ifdef  LowerUndescore
 #define mld_zslu_fact_   mld_zslu_fact_
 #define mld_zslu_solve_  mld_zslu_solve_
 #define mld_zslu_free_   mld_zslu_free_
 #endif
-#ifdef AddDouble_
+#ifdef  LowerDoubleUndescore
 #define mld_zslu_fact_   mld_zslu_fact__
 #define mld_zslu_solve_  mld_zslu_solve__
 #define mld_zslu_free_   mld_zslu_free__
 #endif
-#ifdef NoChange
+#ifdef  LowerCase
 #define mld_zslu_fact_   mld_zslu_fact
 #define mld_zslu_solve_  mld_zslu_solve
 #define mld_zslu_free_   mld_zslu_free
 #endif
+#ifdef  UpperUndescore
+#define mld_zslu_fact_   MLD_ZSLU_FACT_
+#define mld_zslu_solve_  MLD_ZSLU_SOLVE_
+#define mld_zslu_free_   MLD_ZSLU_FREE_
+#endif
+#ifdef  UpperDoubleUndescore
+#define mld_zslu_fact_   MLD_ZSLU_FACT__
+#define mld_zslu_solve_  MLD_ZSLU_SOLVE__
+#define mld_zslu_free_   MLD_ZSLU_FREE__
+#endif
+#ifdef  UpperCase
+#define mld_zslu_fact_   MLD_ZSLU_FACT
+#define mld_zslu_solve_  MLD_ZSLU_SOLVE
+#define mld_zslu_free_   MLD_ZSLU_FREE
+#endif



--- a/mlprec/mld_zslud_interface.c
+++ b/mlprec/mld_zslud_interface.c
@ -115,21 +115,36 @@ typedef struct {
 #endif


-#ifdef Add_
+#ifdef  LowerUnderscore
 #define mld_zsludist_fact_   mld_zsludist_fact_
 #define mld_zsludist_solve_  mld_zsludist_solve_
 #define mld_zsludist_free_   mld_zsludist_free_
 #endif
-#ifdef AddDouble_
+#ifdef  LowerDoubleUnderscore
 #define mld_zsludist_fact_   mld_zsludist_fact__
 #define mld_zsludist_solve_  mld_zsludist_solve__
 #define mld_zsludist_free_   mld_zsludist_free__
 #endif
-#ifdef NoChange
+#ifdef  LowerCase
 #define mld_zsludist_fact_   mld_zsludist_fact
 #define mld_zsludist_solve_  mld_zsludist_solve
 #define mld_zsludist_free_   mld_zsludist_free
 #endif
+#ifdef  UpperUnderscore
+#define mld_zsludist_fact_   MLD_ZSLUDIST_FACT_
+#define mld_zsludist_solve_  MLD_ZSLUDIST_SOLVE_
+#define mld_zsludist_free_   MLD_ZSLUDIST_FREE_
+#endif
+#ifdef  UpperDoubleUnderscore
+#define mld_zsludist_fact_   MLD_ZSLUDIST_FACT__
+#define mld_zsludist_solve_  MLD_ZSLUDIST_SOLVE__
+#define mld_zsludist_free_   MLD_ZSLUDIST_FREE__
+#endif
+#ifdef  UpperCase
+#define mld_zsludist_fact_   MLD_ZSLUDIST_FACT
+#define mld_zsludist_solve_  MLD_ZSLUDIST_SOLVE
+#define mld_zsludist_free_   MLD_ZSLUDIST_FREE
+#endif



--- a/mlprec/mld_zumf_interface.c
+++ b/mlprec/mld_zumf_interface.c
@ -77,21 +77,36 @@ Availability:



-#ifdef Add_
+#ifdef  LowerUnderscore
 #define mld_zumf_fact_   mld_zumf_fact_
 #define mld_zumf_solve_  mld_zumf_solve_
 #define mld_zumf_free_   mld_zumf_free_
 #endif
-#ifdef AddDouble_
+#ifdef  LowerDoubleUnderscore
 #define mld_zumf_fact_   mld_zumf_fact__
 #define mld_zumf_solve_  mld_zumf_solve__
 #define mld_zumf_free_   mld_zumf_free__
 #endif
-#ifdef NoChange
+#ifdef  LowerCase
 #define mld_zumf_fact_   mld_zumf_fact
 #define mld_zumf_solve_  mld_zumf_solve
 #define mld_zumf_free_   mld_zumf_free
 #endif
+#ifdef  UpperUnderscore
+#define mld_zumf_fact_   MLD_ZUMF_FACT_
+#define mld_zumf_solve_  MLD_ZUMF_SOLVE_
+#define mld_zumf_free_   MLD_ZUMF_FREE_
+#endif
+#ifdef  UpperDoubleUnderscore
+#define mld_zumf_fact_   MLD_ZUMF_FACT__
+#define mld_zumf_solve_  MLD_ZUMF_SOLVE__
+#define mld_zumf_free_   MLD_ZUMF_FREE__
+#endif
+#ifdef  UpperCase
+#define mld_zumf_fact_   MLD_ZUMF_FACT
+#define mld_zumf_solve_  MLD_ZUMF_SOLVE
+#define mld_zumf_free_   MLD_ZUMF_FREE
+#endif


 #include <stdio.h>
--- a/test/fileread/enablecore.c
+++ b/test/fileread/enablecore.c
@ -2,15 +2,24 @@
 #include <unistd.h>
 #include <signal.h> 

-#ifdef Add_
+#ifdef  LowerUnderscore
 #define enablecore  enablecore_
 #endif
-#ifdef AddDouble_
+#ifdef  LowerDoubleUnderscore
 #define enablecore  enablecore_
 #endif
-#ifdef UpCase
+#ifdef  LowerCase
+#define enablecore  enablecore
+#endif
+#ifdef  UpperUnderscore
+#define enablecore  ENABLECORE_
+#endif
+#ifdef  UpperDoubleUnderscore
 #define enablecore  ENABLECORE_
 #endif
+#ifdef  UpperCase
+#define enablecore  ENABLECORE
+#endif


 void enablecore()