Changeset 5682

Timestamp:

11/04/09 11:05:15 (3 weeks ago)

Author:

jayesh

Message:

1) Adding manually defined types and types defined from other types into the dictionary so that routines defining fortran types can use them. (2) Also added sanity checks when defining types from other types - Without the fix, types unavailable in the type dictionary where defined to be 0 in fortran/fortran90. This fixes ticket 922

Files:

• mpich2/trunk/winconfigure.wsf (modified) (14 diffs)

mpich2/trunk/winconfigure.wsf

@@ -662 +662 @@
         'missing_datatypes = missing_datatypes & "MPI_WCHAR_T" & vbCrLf
         'MPI_WCHAR_T           = "0x" + mpi_datatype_prefix + len_wchar_t     + "0e"
-        MPI_WCHAR_T = dtypes.Item("MPI_WCHAR")
+        if dtypes.Exists("MPI_WCHAR") then
+            MPI_WCHAR_T = dtypes.Item("MPI_WCHAR")
+            dtypes.Add "MPI_WCHAR_T", MPI_WCHAR_T
+        else
+            missing_datatypes = missing_datatypes & "MPI_WCHAR_T" & vbCrLf
+            MPI_WCHAR_T       = "0x" + mpi_datatype_prefix + len_wchar       + "0e"
+        end if
 end if
 if dtypes.Exists("MPI_SHORT") then
@@ -693 +699 @@
         'missing_datatypes = missing_datatypes & "MPI_UNSIGNED" & vbCrLf
         'MPI_UNSIGNED          = "0x" + mpi_datatype_prefix + len_int         + "06"
-        MPI_UNSIGNED = dtypes.Item("MPI_UNSIGNED_INT")
+        if dtypes.Exists("MPI_UNSIGNED_INT") then
+            MPI_UNSIGNED = dtypes.Item("MPI_UNSIGNED_INT")
+            dtypes.Add "MPI_UNSIGNED", MPI_UNSIGNED
+        else
+            missing_datatypes = missing_datatypes & "MPI_UNSIGNED" & vbCrLf
+            MPI_UNSIGNED      = "0x" + mpi_datatype_prefix + len_int         + "06"
+        end if
 end if
 if dtypes.Exists("MPI_LONG") then
@@ -718 +730 @@
         'missing_datatypes = missing_datatypes & "MPI_LONG_LONG_INT" & vbCrLf
         'MPI_LONG_LONG_INT     = "0x" + mpi_datatype_prefix + len_long_long   + "09"
-        MPI_LONG_LONG_INT = dtypes.Item("MPI_LONG_LONG")
+        if dtypes.Exists("MPI_LONG_LONG") then
+            MPI_LONG_LONG_INT = dtypes.Item("MPI_LONG_LONG")
+            dtypes.Add "MPI_LONG_LONG_INT", MPI_LONG_LONG_INT
+        else
+            missing_datatypes = missing_datatypes & "MPI_LONG_LONG_INT" & vbCrLf
+            MPI_LONG_LONG_INT = "0x" + mpi_datatype_prefix + len_long_long   + "09"
+        end if
 end if
 if dtypes.Exists("MPI_UNSIGNED_LONG_LONG") then
@@ -834 +852 @@
         'MPI_FLOAT_INT         = "0x" + mpi_datatype_prefix + len_float_int       + "12"
         MPI_FLOAT_INT         = "0x8c000000"
+        dtypes.Add "MPI_FLOAT_INT", MPI_FLOAT_INT
 end if
 if dtypes.Exists("MPI_DOUBLE_INT") then
@@ -841 +860 @@
         'MPI_DOUBLE_INT        = "0x" + mpi_datatype_prefix + len_double_int      + "13"
         MPI_DOUBLE_INT        = "0x8c000001"
+        dtypes.Add "MPI_DOUBLE_INT", MPI_DOUBLE_INT
 end if
 if dtypes.Exists("MPI_LONG_INT") then
@@ -848 +868 @@
         'MPI_LONG_INT          = "0x" + mpi_datatype_prefix + len_long_int        + "14"
         MPI_LONG_INT          = "0x8c000002"
+        dtypes.Add "MPI_LONG_INT", MPI_LONG_INT
 end if
 if dtypes.Exists("MPI_SHORT_INT") then
@@ -855 +876 @@
         'MPI_SHORT_INT         = "0x" + mpi_datatype_prefix + len_short_int       + "15"
         MPI_SHORT_INT         = "0x8c000003"
+        dtypes.Add "MPI_SHORT_INT", MPI_SHORT_INT
 end if
 if dtypes.Exists("MPI_2INT") then
@@ -868 +890 @@
         'MPI_LONG_DOUBLE_INT   = "0x" + mpi_datatype_prefix + len_long_double_int + "17"
         MPI_LONG_DOUBLE_INT   = "0x8c000004"
+        dtypes.Add "MPI_LONG_DOUBLE_INT", MPI_LONG_DOUBLE_INT
 end if
 if dtypes.Exists("MPI_CHARACTER") then
@@ -1031 +1054 @@
     MPI_C_FLOAT_COMPLEX = "0x" + mpi_datatype_prefix + len_float__Complex + "40"
 end if
+if dtypes.Exists("MPI_C_COMPLEX") then
+    MPI_C_COMPLEX = dtypes.Item("MPI_C_COMPLEX")
+else
+    if dtypes.Exists("MPI_C_FLOAT_COMPLEX") then
+        MPI_C_COMPLEX = dtypes.Item("MPI_C_FLOAT_COMPLEX")
+        dtypes.Add "MPI_C_COMPLEX", MPI_C_COMPLEX
+    else
+        missing_datatypes = missing_datatypes & "MPI_C_COMPLEX" & vbCrLf
+        MPI_C_COMPLEX = "0x" + mpi_datatype_prefix + len_float__Complex + "40"
+    end if
+end if
 if dtypes.Exists("MPI_C_DOUBLE_COMPLEX") then
     MPI_C_DOUBLE_COMPLEX = dtypes.Item("MPI_C_DOUBLE_COMPLEX")
@@ -1050 +1084 @@
     MPI_AINT_W32 = "0x" + mpi_datatype_prefix + len_mpi_aint32 + "43"
 end if
+dtypes.Add "MPI_AINT_W32", MPI_AINT_W32
+
 if dtypes64.Exists("MPI_AINT_DATATYPE") then
     MPI_AINT_W64 = dtypes64.Item("MPI_AINT_DATATYPE")
@@ -1056 +1092 @@
     MPI_AINT_W64 = "0x" + mpi_datatype_prefix + len_mpi_aint64 + "43"
 end if
+dtypes64.Add "MPI_AINT_W64", MPI_AINT_W64
+
 ' Note that in configure.in MPI_OFFSET is named as MPI_OFFSET_DATATYPE - due to name collision
 if dtypes.Exists("MPI_OFFSET_DATATYPE") then
@@ -1063 +1101 @@
     MPI_OFFSET_W64 = "0x" + mpi_datatype_prefix + len_mpi_offset + "44"
 end if
+dtypes.Add "MPI_OFFSET_W64", MPI_OFFSET_W64
+dtypes64.Add "MPI_OFFSET_W64", MPI_OFFSET_W64
 
 
@@ -1174 +1214 @@
 F77_C_DOUBLE_COMPLEX    = HexToInt(dtypes.Item("MPI_C_DOUBLE_COMPLEX"))
 F77_C_LONG_DOUBLE_COMPLEX      = HexToInt(dtypes.Item("MPI_C_LONG_DOUBLE_COMPLEX"))
-F77_AINT                = HexToInt(dtypes.Item("MPI_AINT"))
-F77_OFFSET              = HexToInt(dtypes.Item("MPI_OFFSET"))
+F77_AINT_W32                = HexToInt(dtypes.Item("MPI_AINT_W32"))
+F77_AINT_W64                = HexToInt(dtypes64.Item("MPI_AINT_W64"))
+F77_OFFSET_W64              = HexToInt(dtypes.Item("MPI_OFFSET_W64"))
 
 if false then
@@ -1901 +1942 @@
                                 str = Replace(str, "@MPI_F77_C_LONG_DOUBLE_COMPLEX@", F77_C_LONG_DOUBLE_COMPLEX)
                         Case "@MPI_F77_AINT@"
-                                str = Replace(str, "@MPI_F77_AINT@", F77_AINT)
+                                If b64 Then
+                                    str = Replace(str, "@MPI_F77_AINT@", F77_AINT_W64)
+                                Else
+                                    str = Replace(str, "@MPI_F77_AINT@", F77_AINT_W32)
+                                End If
                         Case "@MPI_F77_OFFSET@"
-                                str = Replace(str, "@MPI_F77_OFFSET@", F77_OFFSET)
+                                str = Replace(str, "@MPI_F77_OFFSET@", F77_OFFSET_W64)
                         Case "@MPI_STATUS_SIZE@"
                                 str = Replace(str, "@MPI_STATUS_SIZE@", "5")