Menu
▾
▴
[Chasm-interop-cvs] chasm/test/descriptors testdesc.c,1.34,1.35
|
From: <ras...@us...> - 2003-10-30 17:26:57
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv2741
Modified Files:
testdesc.c
Log Message:
Forced a minimum element size for Cray compiler, F90_MIN_ELEMENT_SIZE
Index: testdesc.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/testdesc.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** testdesc.c 30 Oct 2003 16:35:33 -0000 1.34
--- testdesc.c 30 Oct 2003 17:26:54 -0000 1.35
***************
*** 808,811 ****
--- 808,812 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 826,829 ****
--- 827,831 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned char);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 844,847 ****
--- 846,850 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned short);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 862,865 ****
--- 865,869 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 880,883 ****
--- 884,888 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned long long);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 898,901 ****
--- 903,907 ----
addr = cc.getArrayBaseAddress(dv_ia0d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank,
***************
*** 916,919 ****
--- 922,926 ----
addr = cc.getArrayBaseAddress(dv_ra0d, rank);
elem_size = sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank,
***************
*** 934,937 ****
--- 941,945 ----
addr = cc.getArrayBaseAddress(dv_da0d, rank);
elem_size = sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank,
***************
*** 952,955 ****
--- 960,964 ----
addr = cc.getArrayBaseAddress(dv_ca0d, rank);
elem_size = 2*sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 970,973 ****
--- 979,983 ----
addr = cc.getArrayBaseAddress(dv_dca0d, rank);
elem_size = 2*sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 992,995 ****
--- 1002,1006 ----
elem_size = sizeof(Particle);
#endif
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 1019,1022 ****
--- 1030,1034 ----
addr = cc.getArrayBaseAddress(dv_iia1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1047,1050 ****
--- 1059,1063 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1075,1078 ****
--- 1088,1092 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned char);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1103,1106 ****
--- 1117,1121 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned short);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1132,1135 ****
--- 1147,1151 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1160,1163 ****
--- 1176,1180 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned long long);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1195,1198 ****
--- 1212,1216 ----
}
elem_size = sizeof(char);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1230,1233 ****
--- 1248,1252 ----
}
elem_size = sizeof(short);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1265,1268 ****
--- 1284,1288 ----
}
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1300,1303 ****
--- 1320,1324 ----
}
elem_size = sizeof(long long);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1328,1331 ****
--- 1349,1353 ----
addr = cc.getArrayBaseAddress(dv_ra1d, rank);
elem_size = sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1356,1359 ****
--- 1378,1382 ----
addr = cc.getArrayBaseAddress(dv_da1d, rank);
elem_size = sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1384,1387 ****
--- 1407,1411 ----
addr = cc.getArrayBaseAddress(dv_ca1d, rank);
elem_size = 2*sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1412,1415 ****
--- 1436,1440 ----
addr = cc.getArrayBaseAddress(dv_dca1d, rank);
elem_size = 2*sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1444,1447 ****
--- 1469,1473 ----
elem_size = sizeof(Particle);
#endif
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1473,1476 ****
--- 1499,1503 ----
addr = cc.getArrayBaseAddress(dv_upa1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1507,1510 ****
--- 1534,1538 ----
addr = cc.getArrayBaseAddress(dv_iia1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1536,1539 ****
--- 1564,1568 ----
addr = cc.getArrayBaseAddress(dv_iia2d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1567,1570 ****
--- 1596,1600 ----
addr = cc.getArrayBaseAddress(dv_iia3d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1598,1601 ****
--- 1628,1632 ----
addr = cc.getArrayBaseAddress(dv_iia4d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1629,1632 ****
--- 1660,1664 ----
addr = cc.getArrayBaseAddress(dv_iia5d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1660,1663 ****
--- 1692,1696 ----
addr = cc.getArrayBaseAddress(dv_iia6d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1691,1694 ****
--- 1724,1728 ----
addr = cc.getArrayBaseAddress(dv_iia7d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1744,1747 ****
--- 1778,1782 ----
addr = cc.getArrayBaseAddress(dv_iia1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
for (i = 0; i < rank; i++) {
***************
*** 1771,1774 ****
--- 1806,1810 ----
addr = cc.getArrayBaseAddress(dv_iia2d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1802,1805 ****
--- 1838,1842 ----
addr = cc.getArrayBaseAddress(dv_iia3d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1833,1836 ****
--- 1870,1874 ----
addr = cc.getArrayBaseAddress(dv_iia4d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1864,1867 ****
--- 1902,1906 ----
addr = cc.getArrayBaseAddress(dv_iia5d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1895,1898 ****
--- 1934,1938 ----
addr = cc.getArrayBaseAddress(dv_iia6d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1926,1929 ****
--- 1966,1970 ----
addr = cc.getArrayBaseAddress(dv_iia7d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
|
