diff --git a/3rd-party/romio341/.codingcheck b/3rd-party/romio341/.codingcheck index bc77906acb3..5eb006c2f5c 100644 --- a/3rd-party/romio341/.codingcheck +++ b/3rd-party/romio341/.codingcheck @@ -1,9 +1,9 @@ # Here are names that at least at one point were used within ROMIO. -# We should look at these and decide which we wish to allow and which +# We should look at these and decide which we wish to allow and which # should be replaced with something more ROMIO-specific. -%romioDefines = ( 'ROMIO_[A-Za-z0-9_]+' => romio, - 'PROFILE' => romio, - 'PRINT_ERR_MSG' => romio, +%romioDefines = ( 'ROMIO_[A-Za-z0-9_]+' => romio, + 'PROFILE' => romio, + 'PRINT_ERR_MSG' => romio, 'HPUX' => romio, 'SPPUX'=> romio, 'SX4'=> romio, @@ -50,5 +50,5 @@ if (defined(&PushDefinesNames)) { &PushDefinesNames( "romioDefines", "tree", "add" ); } - + 1; diff --git a/3rd-party/romio341/Makefile.am b/3rd-party/romio341/Makefile.am index 70e54c899b3..57acc637019 100644 --- a/3rd-party/romio341/Makefile.am +++ b/3rd-party/romio341/Makefile.am @@ -34,12 +34,12 @@ include $(top_srcdir)/Makefile.options ACLOCAL_AMFLAGS = -I confdb # empty variable initializations so that later code can append (+=) -include_HEADERS = +include_HEADERS = nodist_include_HEADERS = -noinst_HEADERS = +noinst_HEADERS = AM_CFLAGS = @VISIBILITY_CFLAGS@ EXTRA_DIST = -SUFFIXES = +SUFFIXES = doc1_src_txt = external_subdirs = @mpl_srcdir@ @@ -55,14 +55,14 @@ external_libs = @mpl_lib@ # In MPICH these will have an MPI_ and a PMPI_ version. Other implementations # (like OMPI) only want these to be MPI_ routines, possibly with some # name-shifting prefix. -romio_mpi_sources = +romio_mpi_sources = # regular old source files that implement ROMIO, such as ADIO code romio_other_sources = # code that may need to be "up" called from the MPI library and/or is # MPI-implementation-specific in some way -glue_sources = +glue_sources = # ------------------------------------------------------------------------ # when building under MPICH we must be able to find mpi.h @@ -110,7 +110,7 @@ if BUILD_PROFILING_LIB # won't work very well the other way around. noinst_LTLIBRARIES += libpromio.la libpromio_la_SOURCES = $(romio_mpi_sources) -libpromio_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPIO_BUILD_PROFILING +libpromio_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPIO_BUILD_PROFILING libpromio_la_LDFLAGS = $(external_ldflags) libpromio_la_LIBADD = $(external_libs) else !BUILD_PROFILING_LIB diff --git a/3rd-party/romio341/README b/3rd-party/romio341/README index a6fb25a09a5..bee37ec6c88 100644 --- a/3rd-party/romio341/README +++ b/3rd-party/romio341/README @@ -23,11 +23,11 @@ Major Changes in this version: PanFS allows users to specify the layout of a file at file-creation time. Layout information includes the number of StorageBlades (SB) - across which the data is stored, the number of SBs across which a - parity stripe is written, and the number of consecutive stripes that - are placed on the same set of SBs. The panfs_layout_* hints are only + across which the data is stored, the number of SBs across which a + parity stripe is written, and the number of consecutive stripes that + are placed on the same set of SBs. The panfs_layout_* hints are only used if supplied at file-creation time. - + panfs_layout_type - Specifies the layout of a file: 2 = RAID0 3 = RAID5 Parity Stripes @@ -35,37 +35,37 @@ Major Changes in this version: panfs_layout_total_num_comps - The total number of StorageBlades a file is striped across. panfs_layout_parity_stripe_width - If the layout type is RAID5 Parity - Stripes, this hint specifies the + Stripes, this hint specifies the number of StorageBlades in a parity stripe. panfs_layout_parity_stripe_depth - If the layout type is RAID5 Parity Stripes, this hint specifies the - number of contiguous parity stripes written + number of contiguous parity stripes written across the same set of SBs. - panfs_layout_visit_policy - If the layout type is RAID5 Parity Stripes, - the policy used to determine the parity + panfs_layout_visit_policy - If the layout type is RAID5 Parity Stripes, + the policy used to determine the parity stripe a given file offset is written to: 1 = Round Robin - PanFS supports the "concurrent write" (CW) mode, where groups of cooperating - clients can disable the PanFS consistency mechanisms and use their own - consistency protocol. Clients participating in concurrent write mode use - application specific information to improve performance while maintaining - file consistency. All clients accessing the file(s) must enable concurrent - write mode. If any client does not enable concurrent write mode, then the - PanFS consistency protocol will be invoked. Once a file is opened in CW mode - on a machine, attempts to open a file in non-CW mode will fail with - EACCES. If a file is already opened in non-CW mode, attempts to open - the file in CW mode will fail with EACCES. The following hint is + PanFS supports the "concurrent write" (CW) mode, where groups of cooperating + clients can disable the PanFS consistency mechanisms and use their own + consistency protocol. Clients participating in concurrent write mode use + application specific information to improve performance while maintaining + file consistency. All clients accessing the file(s) must enable concurrent + write mode. If any client does not enable concurrent write mode, then the + PanFS consistency protocol will be invoked. Once a file is opened in CW mode + on a machine, attempts to open a file in non-CW mode will fail with + EACCES. If a file is already opened in non-CW mode, attempts to open + the file in CW mode will fail with EACCES. The following hint is used to enable concurrent write mode. - panfs_concurrent_write - If set to 1 at file open time, the file - is opened using the PanFS concurrent write + panfs_concurrent_write - If set to 1 at file open time, the file + is opened using the PanFS concurrent write mode flag. Concurrent write mode is not a persistent attribute of the file. Below is an example PanFS layout using the following parameters: - + - panfs_layout_type = 3 - panfs_layout_total_num_comps = 100 - panfs_layout_parity_stripe_width = 10 @@ -89,7 +89,7 @@ Major Changes in this version: ... * Initial support for the Globus GridFTP filesystem. Work contributed by Troy - Baer (troy@osc.edu). + Baer (troy@osc.edu). Major Changes in Version 1.2.5: ------------------------------ @@ -108,7 +108,7 @@ Major Changes in Version 1.2.5: Major Changes in Version 1.2.4: ------------------------------ -* Added section describing ROMIO MPI_FILE_SYNC and MPI_FILE_CLOSE behavior to +* Added section describing ROMIO MPI_FILE_SYNC and MPI_FILE_CLOSE behavior to User's Guide * Bug removed from PVFS ADIO implementation regarding resize operations @@ -136,7 +136,7 @@ Major Changes in Version 1.2.3: Major Changes in Version 1.0.3: ------------------------------- -* When used with MPICH 1.2.1, the MPI-IO functions return proper error codes +* When used with MPICH 1.2.1, the MPI-IO functions return proper error codes and classes, and the status object is filled in. * On SGI's XFS file system, ROMIO can use direct I/O even if the @@ -144,12 +144,12 @@ Major Changes in Version 1.0.3: direct I/O. ROMIO does this by doing part of the request with buffered I/O (until all the restrictions are met) and doing the rest with direct I/O. (This feature hasn't been tested rigorously. Please - check for errors.) + check for errors.) By default, ROMIO will use only buffered I/O. Direct I/O can be enabled either by setting the environment variables MPIO_DIRECT_READ and/or MPIO_DIRECT_WRITE to TRUE, or on a per-file basis by using - the info keys "direct_read" and "direct_write". + the info keys "direct_read" and "direct_write". Direct I/O will result in higher performance only if you are accessing a high-bandwidth disk system. Otherwise, buffered I/O is @@ -166,51 +166,51 @@ Major Changes Version 1.0.2: components of the MPI I/O chapter not yet implemented are file interoperability and error handling. -* Added support for using "direct I/O" on SGI's XFS file system. +* Added support for using "direct I/O" on SGI's XFS file system. Direct I/O is an optional feature of XFS in which data is moved - directly between the user's buffer and the storage devices, bypassing - the file-system cache. This can improve performance significantly on + directly between the user's buffer and the storage devices, bypassing + the file-system cache. This can improve performance significantly on systems with high disk bandwidth. Without high disk bandwidth, regular I/O (that uses the file-system cache) perfoms better. ROMIO, therefore, does not use direct I/O by default. The user can turn on direct I/O (separately for reading and writing) either by - using environment variables or by using MPI's hints mechanism (info). + using environment variables or by using MPI's hints mechanism (info). To use the environment-variables method, do setenv MPIO_DIRECT_READ TRUE setenv MPIO_DIRECT_WRITE TRUE - To use the hints method, the two keys are "direct_read" and "direct_write". - By default their values are "false". To turn on direct I/O, set the values + To use the hints method, the two keys are "direct_read" and "direct_write". + By default their values are "false". To turn on direct I/O, set the values to "true". The environment variables have priority over the info keys. In other words, if the environment variables are set to TRUE, direct I/O - will be used even if the info keys say "false", and vice versa. - Note that direct I/O must be turned on separately for reading + will be used even if the info keys say "false", and vice versa. + Note that direct I/O must be turned on separately for reading and writing. The environment-variables method assumes that the environment variables can be read by each process in the MPI job. This is not guaranteed by the MPI Standard, but it works with SGI's MPI and the ch_shmem device of MPICH. -* Added support (new ADIO device, ad_pvfs) for the PVFS parallel +* Added support (new ADIO device, ad_pvfs) for the PVFS parallel file system for Linux clusters, developed at Clemson University (see http://www.parl.clemson.edu/pvfs ). To use it, you must first install - PVFS and then when configuring ROMIO, specify "-file_system=pvfs" in + PVFS and then when configuring ROMIO, specify "-file_system=pvfs" in addition to any other options to "configure". (As usual, you can configure - for multiple file systems by using "+"; for example, - "-file_system=pvfs+ufs+nfs".) You will need to specify the path - to the PVFS include files via the "-cflags" option to configure, + for multiple file systems by using "+"; for example, + "-file_system=pvfs+ufs+nfs".) You will need to specify the path + to the PVFS include files via the "-cflags" option to configure, for example, "configure -cflags=-I/usr/pvfs/include". You will also need to specify the full path name of the PVFS library. - The best way to do this is via the "-lib" option to MPICH's - configure script (assuming you are using ROMIO from within MPICH). + The best way to do this is via the "-lib" option to MPICH's + configure script (assuming you are using ROMIO from within MPICH). * Uses weak symbols (where available) for building the profiling version, i.e., the PMPI routines. As a result, the size of the library is reduced - considerably. + considerably. * The Makefiles use "virtual paths" if supported by the make utility. GNU make supports it, for example. This feature allows you to untar the distribution in some directory, say a slow NFS directory, - and compile the library (the .o files) in another + and compile the library (the .o files) in another directory, say on a faster local disk. For example, if the tar file has been untarred in an NFS directory called /home/thakur/romio, one can compile it in a different directory, say /tmp/thakur, as follows: @@ -228,8 +228,8 @@ Major Changes Version 1.0.2: * This version is included in MPICH 1.2.0. If you are using MPICH, you need not download ROMIO separately; it gets built as part of MPICH. - The previous version of ROMIO is included in LAM, HP MPI, SGI MPI, and - NEC MPI. NEC has also implemented the MPI-IO functions missing + The previous version of ROMIO is included in LAM, HP MPI, SGI MPI, and + NEC MPI. NEC has also implemented the MPI-IO functions missing in ROMIO, and therefore NEC MPI has a complete implementation of MPI-IO. @@ -242,10 +242,10 @@ Major Changes in Version 1.0.1: * Added support for NEC SX-4 and created a new device ad_sfs for NEC SFS file system. -* New devices ad_hfs for HP/Convex HFS file system and ad_xfs for +* New devices ad_hfs for HP/Convex HFS file system and ad_xfs for SGI XFS file system. -* Users no longer need to prefix the filename with the type of +* Users no longer need to prefix the filename with the type of file system; ROMIO determines the file-system type on its own. * Added support for 64-bit file sizes on IBM PIOFS, SGI XFS, @@ -254,27 +254,27 @@ Major Changes in Version 1.0.1: * MPI_Offset is an 8-byte integer on machines that support 8-byte integers. It is of type "long long" in C and "integer*8" in Fortran. With a Fortran 90 compiler, you can use either integer*8 or - integer(kind=MPI_OFFSET_KIND). - If you printf an MPI_Offset in C, remember to use %lld - or %ld as required by your compiler. (See what is used in the test + integer(kind=MPI_OFFSET_KIND). + If you printf an MPI_Offset in C, remember to use %lld + or %ld as required by your compiler. (See what is used in the test program romio/test/misc.c.) -* On some machines, ROMIO detects at configure time that "long long" is +* On some machines, ROMIO detects at configure time that "long long" is either not supported by the C compiler or it doesn't work properly. In such cases, configure sets MPI_Offset to long in C and integer in Fortran. This happens on Intel Paragon, Sun4, and FreeBSD. -* Added support for passing hints to the implementation via the MPI_Info +* Added support for passing hints to the implementation via the MPI_Info parameter. ROMIO understands the following hints (keys in MPI_Info object): - /* on all file systems */ + /* on all file systems */ cb_buffer_size - buffer size for collective I/O cb_nodes - no. of processes that actually perform I/O in collective I/O ind_rd_buffer_size - buffer size for data sieving in independent reads /* on all file systems except IBM PIOFS */ ind_wr_buffer_size - buffer size for data sieving in independent writes - /* ind_wr_buffer_size is ignored on PIOFS because data sieving + /* ind_wr_buffer_size is ignored on PIOFS because data sieving cannot be done for writes since PIOFS doesn't support file locking */ /* on Intel PFS and IBM PIOFS only. These hints are understood only if @@ -285,16 +285,16 @@ Major Changes in Version 1.0.1: striping (between 0 and (striping_factor-1)) /* on Intel PFS only. */ - pfs_svr_buf - turn on or off PFS server buffering by setting the value + pfs_svr_buf - turn on or off PFS server buffering by setting the value to "true" or "false", case-sensitive. - + If ROMIO doesn't understand a hint, or if the value is invalid, the hint - will be ignored. The values of hints being used by ROMIO at any time + will be ignored. The values of hints being used by ROMIO at any time can be obtained via MPI_File_get_info. -General Information +General Information ------------------- ROMIO is a high-performance, portable implementation of MPI-IO (the @@ -311,7 +311,7 @@ accessing arrays stored in files. The functions MPI_File_f2c and MPI_File_c2f (Sec. 4.12.4) are also implemented. C, Fortran, and profiling interfaces are provided for all functions -that have been implemented. +that have been implemented. Please read the limitations of this version of ROMIO that are listed below (e.g., MPIO_Request object, restriction to homogeneous @@ -326,7 +326,7 @@ SFS, PVFS, NFS, and any Unix file system (UFS). This version of ROMIO is included in MPICH 1.2.3; an earlier version is included in at least the following MPI implementations: LAM, HP -MPI, SGI MPI, and NEC MPI. +MPI, SGI MPI, and NEC MPI. Note that proper I/O error codes and classes are returned and the status variable is filled only when used with MPICH 1.2.1 or later. @@ -358,16 +358,16 @@ performance, but it is necessary for correct behavior. The following are some instructions we received from Ian Wells of HP for setting the noac option on NFS. We have not tried them -ourselves. We are including them here because you may find +ourselves. We are including them here because you may find them useful. Note that some of the steps may be specific to HP systems, and you may need root permission to execute some of the -commands. - +commands. + >1. first confirm you are running nfs version 3 > >rpcnfo -p `hostname` | grep nfs > - >ie + >ie > goedel >rpcinfo -p goedel | grep nfs > 100003 2 udp 2049 nfs > 100003 3 udp 2049 nfs @@ -379,11 +379,11 @@ commands. > Here is an example of a correct fstab entry for /epm1: > > ie grep epm1 /etc/fstab - > + > > ROOOOT 11>grep epm1 /etc/fstab > gershwin:/epm1 /rmt/gershwin/epm1 nfs bg,intr,noac 0 0 > - > if the noac option is not present, add it + > if the noac option is not present, add it > and then remount this directory > on each of the machines that will be used to share MPIO files > @@ -394,7 +394,7 @@ commands. > >3. Confirm that the directory is mounted noac: > - >ROOOOT >grep gershwin /etc/mnttab + >ROOOOT >grep gershwin /etc/mnttab >gershwin:/epm1 /rmt/gershwin/epm1 nfs >noac,acregmin=0,acregmax=0,acdirmin=0,acdirmax=0 0 0 899911504 @@ -424,8 +424,8 @@ THEN make Some example programs and a Makefile are provided in the romio/test directory. -Run the examples the way you would run any MPI program. Each program takes -the filename as a command-line argument "-fname filename". +Run the examples the way you would run any MPI program. Each program takes +the filename as a command-line argument "-fname filename". The configure script by default configures ROMIO for the file systems most likely to be used on the given machine. If you wish, you can @@ -440,7 +440,7 @@ For the entire list of options to configure do ./configure -h | more After building a specific version as above, you can install it in a -particular directory with +particular directory with make install PREFIX=/usr/local/romio (or whatever directory you like) @@ -448,14 +448,14 @@ or just make install (if you used -prefix at configure time) -If you intend to leave ROMIO where you built it, you should NOT install it -(install is used only to move the necessary parts of a built ROMIO to +If you intend to leave ROMIO where you built it, you should NOT install it +(install is used only to move the necessary parts of a built ROMIO to another location). The installed copy will have the include files, libraries, man pages, and a few other odds and ends, but not the whole source tree. It will have a test directory for testing the installation and a location-independent Makefile built during installation, which users can copy and modify to compile and link -against the installed copy. +against the installed copy. To rebuild ROMIO with a different set of configure options, do @@ -471,7 +471,7 @@ Testing ROMIO To test if the installation works, do - make testing + make testing in the romio/test directory. This calls a script that runs the test programs and compares the results with what they should be. By @@ -489,15 +489,15 @@ Compiling and Running MPI-IO Programs If ROMIO is not already included in the MPI implementation, you need to include the file mpio.h for C or mpiof.h for Fortran in your MPI-IO -program. +program. Note that on HP machines running HPUX and on NEC SX-4, you need to compile Fortran programs with mpifort, because the f77 compilers on -these machines don't support 8-byte integers. +these machines don't support 8-byte integers. -With MPICH, HP MPI, or NEC MPI, you can compile MPI-IO programs as +With MPICH, HP MPI, or NEC MPI, you can compile MPI-IO programs as mpicc foo.c -or +or mpif77 foo.f or mpifort foo.f @@ -505,14 +505,14 @@ or As mentioned above, mpifort is preferred over mpif77 on HPUX and NEC because the f77 compilers on those machines do not support 8-byte integers. -With SGI MPI, you can compile MPI-IO programs as +With SGI MPI, you can compile MPI-IO programs as cc foo.c -lmpi or f77 foo.f -lmpi or f90 foo.f -lmpi -With LAM, you can compile MPI-IO programs as +With LAM, you can compile MPI-IO programs as hcc foo.c -lmpi or hf77 foo.f -lmpi @@ -530,7 +530,7 @@ an SGI machine, make sure that you use MPICH's mpirun and not SGI's mpirun. The Makefile in the romio/test directory illustrates how to compile -and link MPI-IO programs. +and link MPI-IO programs. @@ -552,7 +552,7 @@ int MPIO_Test(MPIO_Request *request, int *flag, MPI_Status *status); int MPIO_Wait(MPIO_Request *request, MPI_Status *status); The usual functions MPI_Test, MPI_Wait, MPI_Testany, etc., will not -work for nonblocking I/O. +work for nonblocking I/O. * This version works only on a homogeneous cluster of machines, and only the "native" file data representation is supported. @@ -582,11 +582,11 @@ message from SGI MPI: ``MPI has run out of internal datatype entries. Please set the environment variable MPI_TYPE_MAX for additional space.'' If you get this error message, add this line to your .cshrc file: - setenv MPI_TYPE_MAX 65536 + setenv MPI_TYPE_MAX 65536 Use a larger number if you still get the error message. * If a Fortran program uses a file handle created using ROMIO's C -interface, or vice-versa, you must use the functions MPI_File_c2f +interface, or vice-versa, you must use the functions MPI_File_c2f or MPI_File_f2c. Such a situation occurs, for example, if a Fortran program uses an I/O library written in C with MPI-IO calls. Similar functions MPIO_Request_f2c and @@ -595,12 +595,12 @@ MPIO_Request_c2f are also provided. * For Fortran programs on the Intel Paragon, you may need to provide the complete path to mpif.h in the include statement, e.g., include '/usr/local/mpich/include/mpif.h' -instead of +instead of include 'mpif.h' This is because the -I option to the Paragon Fortran compiler if77 -doesn't work correctly. It always looks in the default directories first +doesn't work correctly. It always looks in the default directories first and, therefore, picks up Intel's mpif.h, which is actually the -mpif.h of an older version of MPICH. +mpif.h of an older version of MPICH. diff --git a/3rd-party/romio341/adio/ad_gpfs/bg/Makefile.mk b/3rd-party/romio341/adio/ad_gpfs/bg/Makefile.mk index 682a85c98eb..f7414b61cc6 100644 --- a/3rd-party/romio341/adio/ad_gpfs/bg/Makefile.mk +++ b/3rd-party/romio341/adio/ad_gpfs/bg/Makefile.mk @@ -11,6 +11,6 @@ noinst_HEADERS += \ romio_other_sources += \ adio/ad_gpfs/bg/ad_bg_aggrs.c \ - adio/ad_gpfs/bg/ad_bg_pset.c + adio/ad_gpfs/bg/ad_bg_pset.c endif BUILD_AD_BG diff --git a/3rd-party/romio341/adio/ad_lustre/README b/3rd-party/romio341/adio/ad_lustre/README index a217c0f8fe5..d27110f42f0 100644 --- a/3rd-party/romio341/adio/ad_lustre/README +++ b/3rd-party/romio341/adio/ad_lustre/README @@ -1,11 +1,11 @@ -Upcoming soon: +Upcoming soon: o Hierarchical striping as described in the paper from CCGrid2007 http://ft.ornl.gov/projects/io/pubs/CCGrid-2007-file-joining.pdf Further out: o To post the code for ParColl (Partitioned collective IO) - + ----------------------------------------------------- -V05: +V05: ----------------------------------------------------- Improved data redistribution o Improve I/O pattern identification. Besides checking interleaving, @@ -20,12 +20,12 @@ Improved data redistribution more constant clients. ----------------------------------------------------- -V04: +V04: ----------------------------------------------------- o Direct IO and Lockless IO support ----------------------------------------------------- -V03: +V03: ----------------------------------------------------- o Correct detection of fs_type when lustre: prefix is not given o Further fix on stripe alignment @@ -34,21 +34,21 @@ V03: ----------------------------------------------------- V02: ----------------------------------------------------- -The Lustre ADIO driver has been cleaned up quite a lot. Compared +The Lustre ADIO driver has been cleaned up quite a lot. Compared to the intital posting, here are the changes: o Removal of dead/redundant code o Removal of asynchronous IO piece as it appears outdated o Bug fixes for setting Lustre Hints - o Bug fixes for data sieving - o Improved Setsize operation with one process calling ftruncate - o Improved collective IO with domain partitioning on + o Bug fixes for data sieving + o Improved Setsize operation with one process calling ftruncate + o Improved collective IO with domain partitioning on Lustre stripe boundary Contributing: - o You may contribute via many different ways, such as + o You may contribute via many different ways, such as testing results, bug reports, and new feature patches. o We appreciate any courtesy reference of this work. - o Disclaimer: you are welcome to try the code, but at your own risk. + o Disclaimer: you are welcome to try the code, but at your own risk. Contact info: For more info, visit http://ft.ornl.gov/projects/io/ diff --git a/3rd-party/romio341/confdb/aclocal_am.m4 b/3rd-party/romio341/confdb/aclocal_am.m4 index 4d3b0de2257..8e425df1902 100644 --- a/3rd-party/romio341/confdb/aclocal_am.m4 +++ b/3rd-party/romio341/confdb/aclocal_am.m4 @@ -1,6 +1,6 @@ dnl AM_IGNORE is an extension that tells (a patched) automake not to dnl include the specified AC_SUBST variable in the Makefile.in that -dnl automake generates. We don't use AC_DEFUN, since aclocal will +dnl automake generates. We don't use AC_DEFUN, since aclocal will dnl then complain that AM_IGNORE is a duplicate (if you are using the dnl patched automake/aclocal). m4_ifdef([AM_IGNORE],[],[m4_define([AM_IGNORE],[])]) diff --git a/3rd-party/romio341/confdb/aclocal_attr_alias.m4 b/3rd-party/romio341/confdb/aclocal_attr_alias.m4 index 32f016546dc..128a08844a4 100644 --- a/3rd-party/romio341/confdb/aclocal_attr_alias.m4 +++ b/3rd-party/romio341/confdb/aclocal_attr_alias.m4 @@ -17,7 +17,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [ # Tru64's nm complains that /dev/null is an invalid object file # # AIX's sed does not accept \+, 1) instead of doing 's|a\+||', do 's|aa*||' - # or 2) instead of 's|A \+B|AB|g', do 's|A *B|AB|g' + # or 2) instead of 's|A \+B|AB|g', do 's|A *B|AB|g' # Check if nm accepts -g case `${ac_path_NM_G} -g /dev/null 2>&1 | sed '1q'` in @@ -108,7 +108,7 @@ mpif_cmblk_t MPIFCMB; /* Do the test in this file instead in the file - where __attribute__((alias)) is used. + where __attribute__((alias)) is used. This is needed for pgcc since pgcc seems to define aliased symbols if they are in the same file. */ @@ -171,7 +171,7 @@ if test "$pac_c_attr_alias_other" = "yes" ; then #if defined(HAVE_STDIO_H) || defined(STDC_HEADERS) #include #endif - + struct mpif_cmblk_t_ { int imember; }; typedef struct mpif_cmblk_t_ mpif_cmblk_t; @@ -239,7 +239,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then cmp_addr=${addr} fi done - + if test "$diff_addrs" != "yes" ; then dnl echo "Same addresses. Multiple aliases support" AC_MSG_RESULT([${NM_G} says yes]) @@ -348,7 +348,7 @@ dnl the following weird behavour dnl pgf77 -o ftest ftest.f => when $?=0 with zero stderr output dnl pgf77 -o ftest ftest.f dummy.o => when $?=0 with non-zero stderr output. dnl stderr has "ftest.f:". -dnl +dnl # First create a fortran CONFTEST which will be used repeatedly. AC_LANG_PUSH([Fortran]) dnl AC_LANG_PUSH([Fortran 77]) AC_LANG_CONFTEST([ @@ -385,7 +385,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[ pac_f2c_alignedn_diffbase=no ]) # Be sure NOT to remove the conftest.f which is still needed for later use. - # rm -f conftest.$ac_ext + # rm -f conftest.$ac_ext # Restore everything in autoconf that has been overwritten PAC_POP_FLAG([ac_link]) # restore previously pushed LIBS diff --git a/3rd-party/romio341/confdb/aclocal_bugfix.m4 b/3rd-party/romio341/confdb/aclocal_bugfix.m4 index ef320dec578..35bb45b529f 100644 --- a/3rd-party/romio341/confdb/aclocal_bugfix.m4 +++ b/3rd-party/romio341/confdb/aclocal_bugfix.m4 @@ -17,26 +17,26 @@ dnl Synopsis: dnl PAC_PROG_CHECK_INSTALL_WORKS dnl dnl Output Effect: -dnl Sets the variable 'INSTALL' to the value of 'ac_sh_install' if +dnl Sets the variable 'INSTALL' to the value of 'ac_sh_install' if dnl a file cannot be installed into a local directory with the 'INSTALL' dnl program dnl dnl Notes: -dnl The 'AC_PROG_INSTALL' scripts tries to avoid broken versions of -dnl install by avoiding directories such as '/usr/sbin' where some -dnl systems are known to have bad versions of 'install'. Unfortunately, +dnl The 'AC_PROG_INSTALL' scripts tries to avoid broken versions of +dnl install by avoiding directories such as '/usr/sbin' where some +dnl systems are known to have bad versions of 'install'. Unfortunately, dnl this is exactly the sort of test-on-name instead of test-on-capability dnl that 'autoconf' is meant to eliminate. The test in this script -dnl is very simple but has been adequate for working around problems -dnl on Solaris, where the '/usr/sbin/install' program (known by -dnl autoconf to be bad because it is in /usr/sbin) is also reached by a +dnl is very simple but has been adequate for working around problems +dnl on Solaris, where the '/usr/sbin/install' program (known by +dnl autoconf to be bad because it is in /usr/sbin) is also reached by a dnl soft link through /bin, which autoconf believes is good. dnl -dnl No variables are cached to ensure that we do not make a mistake in +dnl No variables are cached to ensure that we do not make a mistake in dnl our choice of install program. dnl dnl The Solaris configure requires the directory name to immediately -dnl follow the '-c' argument, rather than the more common +dnl follow the '-c' argument, rather than the more common dnl.vb dnl args sourcefiles destination-dir dnl.ve diff --git a/3rd-party/romio341/confdb/aclocal_cache.m4 b/3rd-party/romio341/confdb/aclocal_cache.m4 index 9d02c416387..d0a79822470 100644 --- a/3rd-party/romio341/confdb/aclocal_cache.m4 +++ b/3rd-party/romio341/confdb/aclocal_cache.m4 @@ -1,20 +1,20 @@ dnl dnl/*D -dnl AC_CACHE_LOAD - Replacement for autoconf cache load +dnl AC_CACHE_LOAD - Replacement for autoconf cache load dnl dnl Notes: -dnl Caching in autoconf is broken (at least through version 2.13). +dnl Caching in autoconf is broken (at least through version 2.13). dnl The problem is that the cache is read dnl without any check for whether it makes any sense to read it. -dnl A common problem is a build on a shared file system; connecting to +dnl A common problem is a build on a shared file system; connecting to dnl a different computer and then building within the same directory will dnl lead to at best error messages from configure and at worse a build that dnl is wrong but fails only at run time (e.g., wrong datatype sizes used). dnl Later versions of autoconf do include some checks for changes in the dnl environment that impact the choices, but still misses problems with dnl multiple different systems. -dnl -dnl This fixes that by requiring the user to explicitly enable caching +dnl +dnl This fixes that by requiring the user to explicitly enable caching dnl before the cache file will be loaded. dnl dnl To use this version of 'AC_CACHE_LOAD', you need to include @@ -26,7 +26,7 @@ dnl command causes configure to keep track of the system being configured dnl in a config.system file; if the current system matches the value stored dnl in that file (or there is neither a config.cache nor config.system file), dnl configure will enable caching. In order to ensure that the configure -dnl tests make sense, the values of CC, F77, F90, and CXX are also included +dnl tests make sense, the values of CC, F77, F90, and CXX are also included dnl in the config.system file. In addition, the value of PATH is included dnl to ensure that changes in the PATH that might select a different version dnl of a program with the same name (such as a native make versus gnumake) @@ -34,7 +34,7 @@ dnl are detected. dnl dnl Bugs: dnl This does not work with the Cygnus configure because the enable arguments -dnl are processed *after* AC_CACHE_LOAD (!). To address this, we avoid +dnl are processed *after* AC_CACHE_LOAD (!). To address this, we avoid dnl changing the value of enable_cache, and use real_enable_cache, duplicating dnl the "notgiven" value. dnl @@ -46,14 +46,14 @@ dnl See Also: dnl PAC_ARG_CACHING dnl D*/ define([AC_CACHE_LOAD], -[if test "$CONFIGURE_DEBUG_CACHE" = yes ; then +[if test "$CONFIGURE_DEBUG_CACHE" = yes ; then oldopts="$-" clearMinusX=no - set -x - if test "$oldopts" != "$-" ; then + set -x + if test "$oldopts" != "$-" ; then clearMinusX=yes fi -fi +fi if test "X$cache_system" = "X" ; then # A default file name, just in case cache_system="config.system" @@ -66,13 +66,13 @@ if test "X$cache_system" = "X" ; then test "x$cache_system" = "x$cache_file" && cache_system="config.system" # else # We must *not* set enable_cache to no because we need to know if -# enable_cache was not set. +# enable_cache was not set. # enable_cache=no fi fi dnl dnl The "action-if-not-given" part of AC_ARG_ENABLE is not executed until -dnl after the AC_CACHE_LOAD is executed (!). Thus, the value of +dnl after the AC_CACHE_LOAD is executed (!). Thus, the value of dnl enable_cache if neither --enable-cache or --disable-cache is selected dnl is null. Just in case autoconf ever fixes this, we test both cases. dnl @@ -81,12 +81,12 @@ dnl change which versions of programs are found (such as vendor make dnl or GNU make). dnl # -# Get a test value and flag whether we should remove/replace the +# Get a test value and flag whether we should remove/replace the # cache_system file (do so unless cache_system_ok is yes) # FC and F77 should be synonyms. Save both in case # We include the xxxFLAGS in case the user is using the flags to change -# the language (either input or output) of the compiler. E.g., -# using -xarch=v9 on Solaris to select 64 bit output or using -D_BSD_SOURCE +# the language (either input or output) of the compiler. E.g., +# using -xarch=v9 on Solaris to select 64 bit output or using -D_BSD_SOURCE # with gcc to get different header files on input. cleanargs=`echo "$CC $F77 $FC $CXX $F90 $CFLAGS $FFLAGS $CXXFLAGS $F90FLAGS $PATH" | tr '"' ' '` if uname -srm >/dev/null 2>&1 ; then @@ -112,7 +112,7 @@ if test "X$real_enable_cache" = "Xnotgiven" ; then elif test ! -f "$cache_system" -a -n "$cache_system_text" ; then # remove the cache file because it may not correspond to our # system - if test "$cache_file" != "/dev/null" ; then + if test "$cache_file" != "/dev/null" ; then rm -f $cache_file fi real_enable_cache="yes" @@ -157,7 +157,7 @@ if test "$clearMinusX" = yes ; then fi ]) dnl -dnl/*D +dnl/*D dnl PAC_ARG_CACHING - Enable caching of results from a configure execution dnl dnl Synopsis: @@ -165,7 +165,7 @@ dnl PAC_ARG_CACHING dnl dnl Output Effects: dnl Adds '--enable-cache' and '--disable-cache' to the command line arguments -dnl accepted by 'configure'. +dnl accepted by 'configure'. dnl dnl See Also: dnl AC_CACHE_LOAD @@ -194,7 +194,7 @@ AC_DEFUN([PAC_CACHE_CLEAN],[ else echo "not updating unwritable cache $cache_file" fi - fi + fi rm -f confcache if test "$DEBUG_AUTOCONF_CACHE" = "yes" ; then echo "Results of cleaned cache file:" @@ -207,20 +207,20 @@ AC_DEFUN([PAC_CACHE_CLEAN],[ dnl/*D dnl PAC_SUBDIR_CACHE - Create a cache file before ac_output for subdirectory dnl configures. -dnl +dnl dnl Synopsis: dnl PAC_SUBDIR_CACHE(when) dnl dnl Input Parameter: dnl . when - Indicates when the cache should be created (optional) dnl If 'always', create a new cache file. This option -dnl should be used if any of the cache parameters (such as +dnl should be used if any of the cache parameters (such as dnl CFLAGS or LDFLAGS) may have changed. dnl dnl Output Effects: -dnl +dnl dnl Create a cache file before ac_output so that subdir configures don't -dnl make mistakes. +dnl make mistakes. dnl We can't use OUTPUT_COMMANDS to remove the cache file, because those dnl commands are executed *before* the subdir configures. dnl @@ -232,9 +232,9 @@ if test "x$1" = "xalways" -o \( "$cache_file" = "/dev/null" -a "X$real_enable_ca # lost cache_file=`pwd`/$$conf.cache touch $cache_file - dnl + dnl dnl For Autoconf 2.52+, we should ensure that the environment is set - dnl for the cache. Make sure that we get the values and set the + dnl for the cache. Make sure that we get the values and set the dnl xxx_set variables properly ac_cv_env_CC_set=set ac_cv_env_CC_value=$CC @@ -320,7 +320,7 @@ fi ]) dnl dnl The following three macros support the sharing of configure results -dnl by configure scripts, including ones that are not run with +dnl by configure scripts, including ones that are not run with dnl AC_CONFIG_SUBDIRS (the cachefiles managed by --enable-cache can dnl only be used with AC_CONFIG_SUBDIRS; creating a autoconf-style dnl cachefile before the the end of the autoconf process will often @@ -335,7 +335,7 @@ AC_ARG_ENABLE(base-cache, if test "$enable_base_cache" = "default" ; then if test "$CONF_USE_CACHEFILE" = yes ; then enable_base_cache=yes - else + else enable_base_cache=no fi fi diff --git a/3rd-party/romio341/confdb/aclocal_cc.m4 b/3rd-party/romio341/confdb/aclocal_cc.m4 index 207f7ca4040..26ac2253fde 100644 --- a/3rd-party/romio341/confdb/aclocal_cc.m4 +++ b/3rd-party/romio341/confdb/aclocal_cc.m4 @@ -14,13 +14,13 @@ dnl dnl If no actions are specified, a working value is added to 'COPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl dnl D*/ @@ -112,13 +112,13 @@ dnl PAC_C_OPTIMIZATION([action if found]) dnl dnl Output Effect: dnl Adds options to 'COPTIONS' if no other action is specified -dnl +dnl dnl Notes: dnl This is a temporary standin for compiler optimization. dnl It should try to match known systems to known compilers (checking, of dnl course), and then falling back to some common defaults. dnl Note that many compilers will complain about -g and aggressive -dnl optimization. +dnl optimization. dnl D*/ AC_DEFUN([PAC_C_OPTIMIZATION],[ for copt in "-O4 -Ofast" "-Ofast" "-fast" "-O3" "-xO3" "-O" ; do @@ -178,18 +178,18 @@ return 0; } ],pac_cv_prog_c_unaligned_doubles="yes",pac_cv_prog_c_unaligned_doubles="no", pac_cv_prog_c_unaligned_doubles="unknown")]) -ifelse($1,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "yes" ; then +ifelse($1,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "yes" ; then $1 fi) -ifelse($2,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "no" ; then +ifelse($2,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "no" ; then $2 fi) -ifelse($3,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "unknown" ; then +ifelse($3,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "unknown" ; then $3 fi) ]) -dnl/*D +dnl/*D dnl PAC_PROG_C_WEAK_SYMBOLS - Test whether C supports weak alias symbols. dnl dnl Synopsis @@ -211,7 +211,7 @@ dnl sets the shell variable pac_cv_attr_weak to yes. dnl Also checks for __attribute__((weak_import)) which is supported by dnl Apple in Mac OSX (at least in Darwin). Note that this provides only dnl weak symbols, not weak aliases -dnl +dnl dnl D*/ AC_DEFUN([PAC_PROG_C_WEAK_SYMBOLS],[ pragma_extra_message="" @@ -230,7 +230,7 @@ int Foo(int a) { return a; } # only within a single object file! This tests that case. # Note that there is an extern int PFoo declaration before the # pragma. Some compilers require this in order to make the weak symbol -# externally visible. +# externally visible. if test "$has_pragma_weak" = yes ; then PAC_COMPLINK_IFELSE([ AC_LANG_SOURCE([ @@ -272,7 +272,7 @@ return Foo(0);} ]) fi dnl -if test -z "$pac_cv_prog_c_weak_symbols" ; then +if test -z "$pac_cv_prog_c_weak_symbols" ; then AC_TRY_LINK([ extern int PFoo(int); #pragma _HP_SECONDARY_DEF Foo PFoo @@ -361,14 +361,14 @@ correctly set error code when a fatal error occurs]) fi ]) -dnl/*D +dnl/*D dnl PAC_PROG_C_MULTIPLE_WEAK_SYMBOLS - Test whether C and the dnl linker allow multiple weak symbols. dnl dnl Synopsis dnl PAC_PROG_C_MULTIPLE_WEAK_SYMBOLS(action-if-true,action-if-false) dnl -dnl +dnl dnl D*/ AC_DEFUN([PAC_PROG_C_MULTIPLE_WEAK_SYMBOLS],[ AC_CACHE_CHECK([for multiple weak symbol support], @@ -408,10 +408,10 @@ dnl pac_cc_strict_flags contains the strict flags. dnl dnl -std=c89 is used to select the C89 version of the ANSI/ISO C standard. dnl As of this writing, many C compilers still accepted only this version, -dnl not the later C99 version. When all compilers accept C99, this +dnl not the later C99 version. When all compilers accept C99, this dnl should be changed to the appropriate standard level. Note that we've -dnl had trouble with gcc 2.95.3 accepting -std=c89 but then trying to -dnl compile program with a invalid set of options +dnl had trouble with gcc 2.95.3 accepting -std=c89 but then trying to +dnl compile program with a invalid set of options dnl (-D __STRICT_ANSI__-trigraphs) AC_DEFUN([PAC_CC_STRICT],[ export enable_strict_done @@ -428,23 +428,23 @@ if test "$enable_strict_done" != "yes" ; then # warning at 256k. # # These were added to reduce warnings: - # -Wno-missing-field-initializers -- We want to allow a struct to be - # initialized to zero using "struct x y = {0};" and not require + # -Wno-missing-field-initializers -- We want to allow a struct to be + # initialized to zero using "struct x y = {0};" and not require # each field to be initialized individually. # -Wno-unused-parameter -- For portability, some parameters go unused - # when we have different implementations of functions for + # when we have different implementations of functions for # different platforms - # -Wno-unused-label -- We add fn_exit: and fn_fail: on all functions, - # but fn_fail may not be used if the function doesn't return an + # -Wno-unused-label -- We add fn_exit: and fn_fail: on all functions, + # but fn_fail may not be used if the function doesn't return an # error. # -Wno-sign-compare -- read() and write() return bytes read/written # as a signed value, but we often compare this to size_t (or # msg_sz_t) variables. # These were removed to reduce warnings: - # -Wcast-qual -- Sometimes we need to cast "volatile char*" to + # -Wcast-qual -- Sometimes we need to cast "volatile char*" to # "char*", e.g., for memcpy. # -Wpadded -- We catch struct padding with asserts when we need to - # -Wredundant-decls -- Having redundant declarations is benign and the + # -Wredundant-decls -- Having redundant declarations is benign and the # code already has some. # -Waggregate-return -- This seems to be a performance-related warning # aggregate return values are legal in ANSI C, but they may be returned @@ -455,7 +455,7 @@ if test "$enable_strict_done" != "yes" ; then # -Wdeclaration-after-statement -- This is a C89 # requirement. When compiling with C99, this should be # disabled. - # -Wfloat-equal -- There are places in hwloc that set a float var to 0, then + # -Wfloat-equal -- There are places in hwloc that set a float var to 0, then # compare it to 0 later to see if it was updated. Also when using strtod() # one needs to compare the return value with 0 to see whether a conversion # was performed. @@ -476,11 +476,11 @@ if test "$enable_strict_done" != "yes" ; then # However, since Intel compiler currently does not include -Wtype-limits # in -Wextra, -Wtype-limits was added to handle warnings with the Intel # compiler. - # -Wno-type-limits -- There are places where we compare an unsigned to - # a constant that happens to be zero e.g., if x is unsigned and + # -Wno-type-limits -- There are places where we compare an unsigned to + # a constant that happens to be zero e.g., if x is unsigned and # MIN_VAL is zero, we'd like to do "MPIR_Assert(x >= MIN_VAL);". - # Note this option is not supported by gcc 4.2. This needs to be added - # after most other warning flags, so that we catch a gcc bug on 32-bit + # Note this option is not supported by gcc 4.2. This needs to be added + # after most other warning flags, so that we catch a gcc bug on 32-bit # that doesn't give a warning that this is unsupported, unless another # warning is triggered, and then if gives an error. # the embedded newlines in this string are safe because we evaluate each @@ -638,11 +638,11 @@ fi ]) dnl/*D -dnl PAC_ARG_STRICT - Add --enable-strict to configure. +dnl PAC_ARG_STRICT - Add --enable-strict to configure. dnl dnl Synopsis: dnl PAC_ARG_STRICT -dnl +dnl dnl Output effects: dnl Adds '--enable-strict' to the command line. dnl @@ -663,7 +663,7 @@ dnl four dnl eight dnl dnl In addition, a "Could not determine alignment" and a "error!" -dnl return is possible. +dnl return is possible. AC_DEFUN([PAC_C_MAX_INTEGER_ALIGN],[ AC_CACHE_CHECK([for max C struct integer alignment], pac_cv_c_max_integer_align,[ @@ -794,7 +794,7 @@ dnl eight dnl sixteen dnl dnl In addition, a "Could not determine alignment" and a "error!" -dnl return is possible. +dnl return is possible. AC_DEFUN([PAC_C_MAX_FP_ALIGN],[ AC_CACHE_CHECK([for max C struct floating point alignment], pac_cv_c_max_fp_align,[ @@ -908,7 +908,7 @@ dnl four dnl eight dnl dnl In addition, a "Could not determine alignment" and a "error!" -dnl return is possible. +dnl return is possible. AC_DEFUN([PAC_C_MAX_DOUBLE_FP_ALIGN],[ AC_CACHE_CHECK([for max C struct alignment of structs with doubles], pac_cv_c_max_double_fp_align,[ @@ -1206,7 +1206,7 @@ dnl Synopsis: dnl PAC_FUNC_NEEDS_DECL(headerfiles,funcname) dnl dnl Output Effect: -dnl Sets 'NEEDS__DECL' if 'funcname' is not declared by the +dnl Sets 'NEEDS__DECL' if 'funcname' is not declared by the dnl headerfiles. dnl dnl Approach: @@ -1243,8 +1243,8 @@ dnl #endif dnl If *not*, define __attribute__(a) as null dnl dnl We start by requiring Gcc. Some other compilers accept __attribute__ -dnl but generate warning messages, or have different interpretations -dnl (which seems to make __attribute__ just as bad as #pragma) +dnl but generate warning messages, or have different interpretations +dnl (which seems to make __attribute__ just as bad as #pragma) dnl For example, the Intel icc compiler accepts __attribute__ and dnl __attribute__((pure)) but generates warnings for __attribute__((format...)) dnl @@ -1271,7 +1271,7 @@ fi # These tests check not only that the compiler defines some symbol, such # as __FUNCTION__, but that the symbol correctly names the function. # -# Defines +# Defines # HAVE__FUNC__ (if __func__ defined) # HAVE_CAP__FUNC__ (if __FUNC__ defined) # HAVE__FUNCTION__ (if __FUNCTION__ defined) diff --git a/3rd-party/romio341/confdb/aclocal_coverage.m4 b/3rd-party/romio341/confdb/aclocal_coverage.m4 index 844beb5098f..55cb8eb6e4b 100644 --- a/3rd-party/romio341/confdb/aclocal_coverage.m4 +++ b/3rd-party/romio341/confdb/aclocal_coverage.m4 @@ -44,7 +44,7 @@ if test "$enable_coverage" = "yes" ; then fi fi # Add similar options for g77 so that the Fortran tests will also - # + # if test "$enable_f77" = yes ; then if test "$ac_cv_f77_compiler_gnu" = "yes" ; then FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage" @@ -67,14 +67,14 @@ if test "$enable_coverage" = "yes" ; then AC_MSG_WARN([--enable-coverage only supported for GFORTRAN]) fi fi - # On some platforms (e.g., Mac Darwin), we must also *link* + # On some platforms (e.g., Mac Darwin), we must also *link* # with the -fprofile-args -ftest-coverage option. AC_MSG_CHECKING([whether compilation with coverage analysis enabled works]) AC_LINK_IFELSE([AC_LANG_SOURCE([int main(int argc, char **argv){return 1;}])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([Unable to link programs when coverage analysis enabled])]) - + # Test for the routines that we need to use to ensure that the # data files are (usually) written out # FIXME: Some versions of Linux provide usleep, but it rounds times diff --git a/3rd-party/romio341/confdb/aclocal_cxx.m4 b/3rd-party/romio341/confdb/aclocal_cxx.m4 index 6c902af2c53..c4f6e047b14 100644 --- a/3rd-party/romio341/confdb/aclocal_cxx.m4 +++ b/3rd-party/romio341/confdb/aclocal_cxx.m4 @@ -59,7 +59,7 @@ AC_DEFUN([AX_CXX_NAMESPACE_STD], AC_CACHE_CHECK(whether the compiler implements the namespace std, ac_cv_cxx_namespace_std, [ac_cv_cxx_namespace_std=no -if test "$ac_cv_cxx_namespaces" = yes ; then +if test "$ac_cv_cxx_namespaces" = yes ; then AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_TRY_COMPILE([ @@ -87,13 +87,13 @@ dnl dnl If no actions are specified, a working value is added to 'CXXOPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl D*/ AC_DEFUN([PAC_CXX_CHECK_COMPILER_OPTION],[ diff --git a/3rd-party/romio341/confdb/aclocal_f77.m4 b/3rd-party/romio341/confdb/aclocal_f77.m4 index f4415107460..0b6bf912a91 100644 --- a/3rd-party/romio341/confdb/aclocal_f77.m4 +++ b/3rd-party/romio341/confdb/aclocal_f77.m4 @@ -1,7 +1,7 @@ dnl dnl/*D dnl PAC_PROG_F77_NAME_MANGLE - Determine how the Fortran compiler mangles -dnl names +dnl names dnl dnl Synopsis: dnl PAC_PROG_F77_NAME_MANGLE([action]) @@ -19,20 +19,20 @@ dnl mixed -> mixed_ F77_NAME_MIXED_USCORE dnl mixed -> UPPER@STACK_SIZE F77_NAME_UPPER_STDCALL dnl.ve dnl If an action is specified, it is executed instead. -dnl +dnl dnl Notes: dnl We assume that if lower -> lower (any underscore), upper -> upper with the -dnl same underscore behavior. Previous versions did this by -dnl compiling a Fortran program and running strings -a over it. Depending on -dnl strings is a bad idea, so instead we try compiling and linking with a +dnl same underscore behavior. Previous versions did this by +dnl compiling a Fortran program and running strings -a over it. Depending on +dnl strings is a bad idea, so instead we try compiling and linking with a dnl C program, since that is why we are doing this anyway. A similar approach -dnl is used by FFTW, though without some of the cases we check (specifically, +dnl is used by FFTW, though without some of the cases we check (specifically, dnl mixed name mangling). STD_CALL not only specifies a particular name dnl mangling convention (adding the size of the calling stack into the function dnl name, but also the stack management convention (callee cleans the stack, dnl and arguments are pushed onto the stack from right to left) dnl -dnl One additional problem is that some Fortran implementations include +dnl One additional problem is that some Fortran implementations include dnl references to the runtime (like pgf90_compiled for the pgf90 compiler dnl used as the "Fortran 77" compiler). This is not yet solved. dnl @@ -92,7 +92,7 @@ if test "$pac_found" != "yes" ; then AC_LANG_PROGRAM([],[ call my_name(0)]) ],[ pac_found=yes - ]) + ]) AC_LANG_POP([Fortran 77]) LIBS="$saved_LIBS" rm -f cconftest.$OBJEXT @@ -151,7 +151,7 @@ name_scheme="`echo $pac_cv_prog_f77_name_mangle | sed 's% %_%g'`" # Turn lowercase into uppercase. name_scheme="`echo $name_scheme | sed -e 'y%abcdefghijklmnopqrstuvwxyz%ABCDEFGHIJKLMNOPQRSTUVWXYZ%'`" F77_NAME_MANGLE="F77_NAME_${name_scheme}" -AC_DEFINE_UNQUOTED([$F77_NAME_MANGLE]) +AC_DEFINE_UNQUOTED([$F77_NAME_MANGLE]) AC_SUBST(F77_NAME_MANGLE) if test "X$pac_cv_prog_f77_name_mangle" = "X" ; then AC_MSG_WARN([Unknown Fortran naming scheme]) @@ -196,11 +196,11 @@ dnl Sets SIZEOF_F77_uctype to the size if bytes of type. dnl If type is unknown, the size is set to 0. dnl If cross-compiling, the value cross-size is used (it may be a variable) dnl For example 'PAC_PROG_F77_CHECK_SIZEOF(real)' defines -dnl 'SIZEOF_F77_REAL' to 4 on most systems. The variable +dnl 'SIZEOF_F77_REAL' to 4 on most systems. The variable dnl 'pac_cv_sizeof_f77_' (e.g., 'pac_cv_sizeof_f77_real') is also set to -dnl the size of the type. +dnl the size of the type. dnl If the corresponding variable is already set, that value is used. -dnl If the name has an '*' in it (e.g., 'integer*4'), the defined name +dnl If the name has an '*' in it (e.g., 'integer*4'), the defined name dnl replaces that with an underscore (e.g., 'SIZEOF_F77_INTEGER_4'). dnl dnl Notes: @@ -251,7 +251,7 @@ static int isize_val=0; void cisize_(char *,char*); void isize_(void); void cisize_(char *i1p, char *i2p) -{ +{ isize_val = (int)(i2p - i1p); } ],[ @@ -386,7 +386,7 @@ dnl Notes: dnl Check whether '!' may be used to begin comments in Fortran. dnl dnl This macro requires a version of autoconf `after` 2.13; the 'acgeneral.m4' -dnl file contains an error in the handling of Fortran programs in +dnl file contains an error in the handling of Fortran programs in dnl 'AC_TRY_COMPILE' (fixed in our local version). dnl dnl D*/ @@ -422,13 +422,13 @@ dnl dnl If no actions are specified, a working value is added to 'FOPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl D*/ AC_DEFUN([PAC_F77_CHECK_COMPILER_OPTION],[ @@ -507,10 +507,10 @@ dnl PAC_PROG_F77_LIBRARY_DIR_FLAG - Determine the flag used to indicate dnl the directories to find libraries in dnl dnl Notes: -dnl Many compilers accept '-Ldir' just like most C compilers. -dnl Unfortunately, some (such as some HPUX Fortran compilers) do not, +dnl Many compilers accept '-Ldir' just like most C compilers. +dnl Unfortunately, some (such as some HPUX Fortran compilers) do not, dnl and require instead either '-Wl,-L,dir' or something else. This -dnl command attempts to determine what is accepted. The flag is +dnl command attempts to determine what is accepted. The flag is dnl placed into 'F77_LIBDIR_LEADER'. dnl dnl D*/ @@ -562,19 +562,19 @@ if test "X$pac_cv_prog_f77_library_dir_flag" != "Xnone" ; then fi ]) dnl -dnl/*D +dnl/*D dnl PAC_PROG_F77_HAS_INCDIR - Check whether Fortran accepts -Idir flag dnl dnl Syntax: dnl PAC_PROG_F77_HAS_INCDIR(directory,action-if-true,action-if-false) dnl dnl Output Effect: -dnl Sets 'F77_INCDIR' to the flag used to choose the directory. +dnl Sets 'F77_INCDIR' to the flag used to choose the directory. dnl dnl Notes: dnl This refers to the handling of the common Fortran include extension, dnl not to the use of '#include' with the C preprocessor. -dnl If directory does not exist, it will be created. In that case, the +dnl If directory does not exist, it will be created. In that case, the dnl directory should be a direct descendant of the current directory. dnl dnl D*/ @@ -616,7 +616,7 @@ fi dnl dnl/*D dnl PAC_PROG_F77_ALLOWS_UNUSED_EXTERNALS - Check whether the Fortran compiler -dnl allows unused and undefined functions to be listed in an external +dnl allows unused and undefined functions to be listed in an external dnl statement dnl dnl Syntax: @@ -647,12 +647,12 @@ else ifelse([$2],[],[:],[$2]) fi ]) -dnl PAC_PROG_F77_RUN_PROC_FROM_C( c main program, fortran routine, -dnl [action-if-works], [action-if-fails], +dnl PAC_PROG_F77_RUN_PROC_FROM_C( c main program, fortran routine, +dnl [action-if-works], [action-if-fails], dnl [cross-action] ) dnl Fortran routine MUST be named ftest unless you include code dnl to select the appropriate Fortran name. -dnl +dnl AC_DEFUN([PAC_PROG_F77_RUN_PROC_FROM_C],[ AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS]) @@ -694,18 +694,18 @@ AC_LANG_POP([Fortran 77]) ]) dnl PAC_PROG_F77_IN_C_LIBS dnl -dnl Find the essential libraries that are needed to use the C linker to -dnl create a program that includes a trival Fortran code. +dnl Find the essential libraries that are needed to use the C linker to +dnl create a program that includes a trival Fortran code. dnl dnl For example, all pgf90 compiled objects include a reference to the dnl symbol pgf90_compiled, found in libpgf90 . dnl -dnl There is an additional problem. To *run* programs, we may need +dnl There is an additional problem. To *run* programs, we may need dnl additional arguments; e.g., if shared libraries are used. Even dnl with autoconf 2.52, the autoconf macro to find the library arguments dnl doesn't handle this, either by detecting the use of -rpath or dnl by trying to *run* a trivial program. It only checks for *linking*. -dnl +dnl dnl AC_DEFUN([PAC_PROG_F77_IN_C_LIBS],[ AC_REQUIRE([AC_HEADER_STDC]) @@ -776,7 +776,7 @@ fi ]) dnl dnl Test to see if we should use C or Fortran to link programs whose -dnl main program is in Fortran. We may find that neither work because +dnl main program is in Fortran. We may find that neither work because dnl we need special libraries in each case. dnl AC_DEFUN([PAC_PROG_F77_LINKER_WITH_C],[ @@ -893,7 +893,7 @@ AC_LINK_IFELSE([],[ pac_libs="" pac_other="" for name in $FLIBS ; do - case $name in + case $name in -l*) pac_libs="$pac_libs $name" ;; -L*) pac_ldirs="$pac_ldirs $name" ;; *) pac_other="$pac_other $name" ;; @@ -915,7 +915,7 @@ AC_LANG_PUSH([C]) ]) dnl dnl Test for extra libraries needed when linking C routines that use -dnl stdio with Fortran. This test was created for OSX, which +dnl stdio with Fortran. This test was created for OSX, which dnl sometimes requires -lSystemStubs. If another library is needed, dnl add it to F77_OTHER_LIBS dnl @@ -979,7 +979,7 @@ dnl Endof ac_cache_check if test "$pac_cv_prog_f77_and_c_stdio_libs" != "none" \ -a "$pac_cv_prog_f77_and_c_stdio_libs" != "unknown" ; then F77_OTHER_LIBS="$F77_OTHER_LIBS $pac_cv_prog_f77_and_c_stdio_libs" -fi +fi ]) dnl dnl Check that the FLIBS determined by AC_F77_LIBRARY_LDFLAGS is valid. @@ -1193,7 +1193,7 @@ AC_LANG_POP([Fortran 77]) AC_MSG_RESULT([$pac_cv_f77_accepts_F]) ]) dnl -dnl /*D +dnl /*D dnl PAC_PROG_F77_CRAY_POINTER - Check if Fortran 77 supports Cray-style pointer. dnl If so, set pac_cv_prog_f77_has_pointer to yes dnl and find out if any extra compiler flag is @@ -1313,16 +1313,16 @@ dnl PAC_F77_LOGICALS_IN_C(MPI_FINT) dnl dnl where MPI_FINT is the C type for Fortran integer. dnl -dnl Use a Fortran main program. This simplifies some steps, -dnl since getting all of the Fortran libraries (including shared -dnl libraries that are not in the default library search path) can -dnl be tricky. Specifically, The PROG_F77_RUN_PROC_FROM_C failed with +dnl Use a Fortran main program. This simplifies some steps, +dnl since getting all of the Fortran libraries (including shared +dnl libraries that are not in the default library search path) can +dnl be tricky. Specifically, The PROG_F77_RUN_PROC_FROM_C failed with dnl some installations of the Portland group compiler. dnl dnl We'd also like to check other values for .TRUE. and .FALSE. to see dnl if the compiler allows (or uses) more than one value (some DEC compilers, -dnl for example, used the high (sign) bit to indicate true and false; the -dnl rest of the bits were ignored. For now, we'll assume that there are +dnl for example, used the high (sign) bit to indicate true and false; the +dnl rest of the bits were ignored. For now, we'll assume that there are dnl unique true and false values. dnl AC_DEFUN([PAC_F77_LOGICALS_IN_C],[ @@ -1404,14 +1404,14 @@ if test -n "$true_val" -a -n "$false_val" ; then fi ]) dnl/*D -dnl PAC_PROG_F77_MISMATCHED_ARGS([option],[AllOnly]) - Determine whether the -dnl Fortran compiler allows routines to be called with different -dnl argument types. If not, attempts to determine a command-line argument -dnl that permits such use +dnl PAC_PROG_F77_MISMATCHED_ARGS([option],[AllOnly]) - Determine whether the +dnl Fortran compiler allows routines to be called with different +dnl argument types. If not, attempts to determine a command-line argument +dnl that permits such use dnl (The Fortran standard prohibits this usage) dnl dnl option is set to the compiler option to use. -dnl if AllOnly is yes (literal, not variable with value), then only consider +dnl if AllOnly is yes (literal, not variable with value), then only consider dnl options that turn off checking dnl for all routines dnl @@ -1458,7 +1458,7 @@ if test "X$pac_cv_prog_f77_mismatched_args" = X ; then FFLAGS="$save_FFLAGS" if test "$testok" = yes ; then break ; fi done - if test "$testok" = yes ; then + if test "$testok" = yes ; then pac_cv_prog_f77_mismatched_args_parm="$flags" pac_cv_prog_f77_mismatched_args="yes, with $pac_cv_prog_f77_mismatched_args_parm" fi @@ -1467,7 +1467,7 @@ if test "X$pac_cv_prog_f77_mismatched_args" = X ; then fi AC_MSG_RESULT($pac_cv_prog_f77_mismatched_args) if test "$pac_cv_prog_f77_mismatched_args" = no ; then - AC_MSG_ERROR([The Fortran compiler $F77 will not compile files that call + AC_MSG_ERROR([The Fortran compiler $F77 will not compile files that call the same routine with arguments of different types.]) fi diff --git a/3rd-party/romio341/confdb/aclocal_f77old.m4 b/3rd-party/romio341/confdb/aclocal_f77old.m4 index 5d6e2d9e70a..71d1ae4023e 100644 --- a/3rd-party/romio341/confdb/aclocal_f77old.m4 +++ b/3rd-party/romio341/confdb/aclocal_f77old.m4 @@ -15,7 +15,7 @@ dnl.ve dnl If 'F77_GETARG' has a value, then that value and the values for these dnl other symbols will be used instead. If no approach is found, all of these dnl variables will have empty values. -dnl If no other approach works and a file 'f77argdef' is in the directory, +dnl If no other approach works and a file 'f77argdef' is in the directory, dnl that file will be sourced for the values of the above four variables. dnl dnl In most cases, you should add F77_GETARG_FFLAGS to the FFLAGS variable @@ -24,13 +24,13 @@ dnl performed on the compiler version that will be used. dnl dnl 'AC_SUBST' is called for all six variables. dnl -dnl One complication is that on systems with multiple Fortran compilers, +dnl One complication is that on systems with multiple Fortran compilers, dnl some libraries used by one Fortran compiler may have been (mis)placed dnl in a common location. We have had trouble with libg2c in particular. dnl To work around this, we test whether iargc etc. work first. This dnl will catch most systems and will speed up the tests. dnl -dnl Next, the libraries are only added if they are needed to complete a +dnl Next, the libraries are only added if they are needed to complete a dnl link; they aren''t added just because they exist. dnl dnl f77argdef @@ -55,11 +55,11 @@ AC_CACHE_VAL(pac_cv_prog_f77_cmdarg, f77_getargdecl="${F77_GETARGDECL:-external getarg}" f77_getarg="${F77_GETARG:-call GETARG(i,s)}" f77_iargc="${F77_IARGC:-IARGC()}" - # + # # Grumble. The Absoft Fortran compiler computes i - i as 0 and then # 1.0 / 0 at compile time, even though the code may never be executed. # What we need is a way to generate an error, so the second usage of i - # was replaced with f77_iargc. + # was replaced with f77_iargc. cat > conftest.f <, but this caused other + # (we experimented with using a , but this caused other # problems because we need in the IFS) trial_LIBS="0 -lU77 -lPEPCF90" if test "$NOG2C" != "1" ; then @@ -149,7 +149,7 @@ $libs" # The -N109 was used for getarg before we realized that GETARG # was necessary with the (non standard conforming) Absoft compiler # (Fortran is monocase; Absoft uses mixedcase by default) - # The -f is used by Absoft and is the compiler switch that folds + # The -f is used by Absoft and is the compiler switch that folds # symbolic names to lower case. Without this option, the compiler # considers upper- and lower-case letters to be unique. # The -YEXT_NAMES=LCS will cause external names to be output as lower @@ -157,14 +157,14 @@ $libs" # The first line is ", the space is important # To make the Absoft f77 and f90 work together, we need to prefer the # upper case versions of the arguments. They also require libU77. - # -YCFRL=1 causes Absoft f90 to work with g77 and similar (f2c-based) + # -YCFRL=1 causes Absoft f90 to work with g77 and similar (f2c-based) # Fortran compilers # # Problem: The Intel efc compiler hangs when presented with -N109 . # The only real fix for this is to detect this compiler and exclude # the test. We may want to reorganize these tests so that if we # can compile code without special options, we never look for them. - # + # using_intel_efc="no" pac_test_msg=`$F77 -V 2>&1 | grep 'Intel(R) Fortran Itanium'` if test "$pac_test_msg" != "" ; then @@ -194,10 +194,10 @@ $libs" PAC_F77_CHECK_COMPILER_OPTION($flag,opt_ok=yes,opt_ok=no) fi if test "$opt_ok" = "yes" ; then - if test "$flag" = " " -o "$flag" = "000" ; then - fflag="" - else - fflag="$flag" + if test "$flag" = " " -o "$flag" = "000" ; then + fflag="" + else + fflag="$flag" fi # discard options that don't allow mixed-case name matching cat > conftest.f </dev/null 2>&1 ; then found_answer="yes" fi - else + else found_answer="yes" fi fi @@ -358,9 +358,9 @@ EOF fi done done - IFS="$save_IFS" + IFS="$save_IFS" rm -f conftest.* - trial=`expr $trial + 1` + trial=`expr $trial + 1` done fi pac_cv_F77_GETARGDECL="$F77_GETARGDECL" @@ -368,7 +368,7 @@ pac_cv_F77_IARGC="$F77_IARGC" pac_cv_F77_GETARG="$F77_GETARG" pac_cv_FXX_MODULE="$FXX_MODULE" ]) -if test "$found_cached" = "yes" ; then +if test "$found_cached" = "yes" ; then AC_MSG_RESULT([$pac_cv_prog_f77_cmdarg]) elif test -z "$pac_cv_F77_IARGC" ; then AC_MSG_WARN([Could not find a way to access the command line from Fortran 77]) diff --git a/3rd-party/romio341/confdb/aclocal_fc.m4 b/3rd-party/romio341/confdb/aclocal_fc.m4 index 93465edaa6b..ea30ab1ede9 100644 --- a/3rd-party/romio341/confdb/aclocal_fc.m4 +++ b/3rd-party/romio341/confdb/aclocal_fc.m4 @@ -13,7 +13,7 @@ AC_COMPILE_IFELSE([ ],[ AC_MSG_RESULT([f90]) ],[ - ac_fc_srcext="f" + ac_fc_srcext="f" AC_COMPILE_IFELSE([ AC_LANG_PROGRAM() ],[ @@ -56,12 +56,12 @@ AC_LINK_IFELSE([ rm -f work.pc work.pcl AC_LANG_POP(Fortran) dnl cross_compiling no longer maintained by autoconf as part of the -dnl AC_LANG changes. If we set it here, a later AC_LANG may not +dnl AC_LANG changes. If we set it here, a later AC_LANG may not dnl restore it (in the case where one compiler claims to be a cross compiler dnl and another does not) dnl cross_compiling=$pac_cv_prog_f90_cross ]) -dnl/*D +dnl/*D dnl PAC_PROG_FC_INT_KIND - Determine kind parameter for an integer with dnl the specified number of bytes. dnl @@ -79,7 +79,7 @@ else AC_LANG_PUSH(Fortran) AC_MSG_CHECKING([for Fortran 90 integer kind for $2-byte integers]) # Convert bytes to digits - case $2 in + case $2 in 1) sellen=2 ;; 2) sellen=4 ;; 4) sellen=8 ;; @@ -89,7 +89,7 @@ else esac # Check for cached value eval testval=\$"pac_cv_prog_fc_int_kind_$sellen" - if test -n "$testval" ; then + if test -n "$testval" ; then AC_MSG_RESULT([$testval (cached)]) $1=$testval else @@ -125,7 +125,7 @@ dnl ------------------------------------------------------------------------ dnl Special characteristics that have no autoconf counterpart but that dnl we need as part of the Fortran 90 support. To distinquish these, they dnl have a [PAC] prefix. -dnl +dnl dnl At least one version of the Cray compiler needs the option -em to dnl generate a separate module file, rather than including the module dnl information in the object (.o) file. @@ -181,7 +181,7 @@ AC_COMPILE_IFELSE([ pac_MOD="" fi fi - if test -z "$pac_MOD" ; then + if test -z "$pac_MOD" ; then pac_cv_fc_module_ext="unknown" else pac_cv_fc_module_ext=$pac_MOD @@ -259,7 +259,7 @@ AC_COMPILE_IFELSE([],[ mv $pac_module conftestdir # Remove any temporary files, and hide the work.pc file # (if the compiler generates them) - if test -f work.pc ; then + if test -f work.pc ; then mv -f work.pc conftest.pc fi rm -f work.pcl @@ -298,7 +298,7 @@ if test "X$pac_cv_fc_module_incflag" = "X" ; then AC_MSG_RESULT([-cl,filename where filename contains a list of files and directories]) FC_WORK_FILES_ARG="-cl,mpimod.pcl" FCMODINCSPEC="-cl,/mod.pcl" - else + else # The version of the Intel compiler that I have refuses to let # you put the "work catalog" list anywhere but the current directory. pac_cv_fc_module_incflag="Unavailable!" @@ -306,12 +306,12 @@ if test "X$pac_cv_fc_module_incflag" = "X" ; then else # Early versions of the Intel ifc compiler required a *file* # containing the names of files that contained the names of the - # + # # -cl,filename.pcl # filename.pcl contains # fullpathname.pc - # The "fullpathname.pc" is generated, I believe, when a module is - # compiled. + # The "fullpathname.pc" is generated, I believe, when a module is + # compiled. # Intel compilers use a wierd system: -cl,filename.pcl . If no file is # specified, work.pcl and work.pc are created. However, if you specify # a file, it must contain the name of a file ending in .pc . Ugh! @@ -370,7 +370,7 @@ AC_COMPILE_IFELSE([],[ rm -f "$pac_module" # Remove any temporary files, and hide the work.pc file # (if the compiler generates them) - if test -f work.pc ; then + if test -f work.pc ; then mv -f work.pc conftest.pc fi rm -f work.pcl @@ -433,7 +433,7 @@ AC_SUBST([FCMODOUTFLAG],[$pac_cv_fc_module_outflag]) dnl dnl PAC_FC_AND_F77_COMPATIBLE([action-if-true],[action-if-false]) dnl -dnl Determine whether object files compiled with Fortran 77 can be +dnl Determine whether object files compiled with Fortran 77 can be dnl linked to Fortran 90 main programs. dnl dnl The test uses a name that includes an underscore unless the 3rd @@ -498,7 +498,7 @@ dnl ]) dnl dnl -dnl /*D +dnl /*D dnl PAC_PROG_FC_CRAY_POINTER - Check if Fortran supports Cray-style pointer. dnl If so, set pac_cv_prog_fc_has_pointer to yes dnl and find out if any extra compiler flag is @@ -605,7 +605,7 @@ AC_LANG_POP(C) dnl if test "$pac_cv_prog_fc_and_c_stdio_libs" != none -a \ "$pac_cv_prog_fc_and_c_stdio_libs" != unknown ; then - FC_OTHER_LIBS="$FC_OTHER_LIBS $pac_cv_prog_fc_and_c_stdio_libs" + FC_OTHER_LIBS="$FC_OTHER_LIBS $pac_cv_prog_fc_and_c_stdio_libs" fi ]) dnl @@ -623,13 +623,13 @@ dnl dnl If no actions are specified, a working value is added to 'FCOPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl D*/ AC_DEFUN([PAC_FC_CHECK_COMPILER_OPTION],[ @@ -772,14 +772,14 @@ for arg in --version -V -v ; do rm -f conftest.txt PAC_RUNLOG([$FC $arg conftest.txt 2>&1]) # Ignore the return code, because some compilers set the - # return code to zero on invalid arguments and some to + # return code to zero on invalid arguments and some to # non-zero on success (with no files to compile) if test -f conftest.txt ; then if grep 'Portland Group' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=pgi elif grep 'Sun Workshop' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=sun - elif grep 'Sun Fortran 9' conftest.txt >/dev/null 2>&1 ; then + elif grep 'Sun Fortran 9' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=sun elif grep 'Absoft' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=absoft diff --git a/3rd-party/romio341/confdb/aclocal_make.m4 b/3rd-party/romio341/confdb/aclocal_make.m4 index 147e92e9c2e..2c900e810b6 100644 --- a/3rd-party/romio341/confdb/aclocal_make.m4 +++ b/3rd-party/romio341/confdb/aclocal_make.m4 @@ -72,7 +72,7 @@ fi ])dnl dnl/*D -dnl PAC_PROG_MAKE_ALLOWS_COMMENTS - Check whether comments are allowed in +dnl PAC_PROG_MAKE_ALLOWS_COMMENTS - Check whether comments are allowed in dnl shell commands in a makefile dnl dnl Synopsis: @@ -105,7 +105,7 @@ ALL: pac_str=`$MAKE -f conftest 2>&1` # This is needed for Mac OSX 10.5 rm -rf conftest.dSYM -rm -f conftest +rm -f conftest if test "$pac_str" != "success" ; then pac_cv_prog_make_allows_comments="no" else @@ -135,7 +135,7 @@ dnl or dnl.vb dnl .PATH: . ${srcdir} dnl.ve -dnl +dnl dnl Notes: dnl The test checks that the path works with implicit targets (some makes dnl support only explicit targets with 'VPATH' or 'PATH'). @@ -166,7 +166,7 @@ VPATH=.:conftestdir @echo \$< EOF ac_out=`$MAKE -f conftest 2>&1 | grep 'conftestdir/a.c'` -if test -n "$ac_out" ; then +if test -n "$ac_out" ; then pac_cv_prog_make_vpath="VPATH" else rm -f conftest @@ -177,7 +177,7 @@ all: a.o @echo \$< EOF ac_out=`$MAKE -f conftest 2>&1 | grep 'conftestdir/a.c'` - if test -n "$ac_out" ; then + if test -n "$ac_out" ; then pac_cv_prog_make_vpath=".PATH" else pac_cv_prog_make_vpath="neither VPATH nor .PATH works" @@ -226,7 +226,7 @@ EOF pac_str=`$MAKE -f conftest 2>&1` # This is needed for Mac OSX 10.5 rm -rf conftest.dSYM -rm -f conftest +rm -f conftest if test "$pac_str" = "XX" ; then pac_cv_prog_make_set_cflags="no" else @@ -241,7 +241,7 @@ fi ])dnl dnl/*D -dnl PAC_PROG_MAKE_CLOCK_SKEW - Check whether there is a problem with +dnl PAC_PROG_MAKE_CLOCK_SKEW - Check whether there is a problem with dnl clock skew in suing make. dnl dnl Effect: @@ -277,7 +277,7 @@ fi ]) dnl/*D -dnl PAC_PROG_MAKE - Checks for the varieties of MAKE, including support for +dnl PAC_PROG_MAKE - Checks for the varieties of MAKE, including support for dnl VPATH dnl dnl Synopsis: @@ -292,10 +292,10 @@ dnl This macro uses 'PAC_PROG_MAKE_INCLUDE', dnl 'PAC_PROG_MAKE_ALLOWS_COMMENTS', 'PAC_PROG_MAKE_VPATH', and dnl 'PAC_PROG_MAKE_SET_CFLAGS'. See those commands for details about their dnl actions. -dnl +dnl dnl It may call 'AC_PROG_MAKE_SET', which sets 'SET_MAKE' to 'MAKE = @MAKE@' dnl if the make program does not set the value of make, otherwise 'SET_MAKE' -dnl is set to empty; if the make program echos the directory name, then +dnl is set to empty; if the make program echos the directory name, then dnl 'SET_MAKE' is set to 'MAKE = $MAKE'. dnl D*/ AC_DEFUN([PAC_PROG_MAKE],[ diff --git a/3rd-party/romio341/confdb/aclocal_romio.m4 b/3rd-party/romio341/confdb/aclocal_romio.m4 index 802e2855eea..ace4c7460fd 100644 --- a/3rd-party/romio341/confdb/aclocal_romio.m4 +++ b/3rd-party/romio341/confdb/aclocal_romio.m4 @@ -1,5 +1,5 @@ dnl -dnl This files contains additional macros for using autoconf to +dnl This files contains additional macros for using autoconf to dnl build configure scripts. dnl dnl Almost all of this file is taken from the aclocal.m4 of MPICH @@ -19,21 +19,21 @@ AC_DEFUN([PAC_GET_FORTNAMES],[ EOF $F77 $FFLAGS -c confftest.f > /dev/null 2>&1 if test ! -s confftest.$OBJEXT ; then - AC_MSG_WARN([Unable to test Fortran compiler. Compiling a test + AC_MSG_WARN([Unable to test Fortran compiler. Compiling a test program failed to produce an object file]) NOF77=1 elif test -z "$FORTRANNAMES" ; then # MAC OS X (and probably FreeBSD need strings - (not strings -a) # Cray doesn't accept -a ... allstrings="-a" - if test $arch_CRAY ; then - allstrings="" + if test $arch_CRAY ; then + allstrings="" elif strings - confftest.$OBJEXT < /dev/null >/dev/null 2>&1 ; then allstrings="-" elif strings -a confftest.$OBJEXT < /dev/null >/dev/null 2>&1 ; then allstrings="-a" fi - + nameform1=`strings $allstrings confftest.$OBJEXT | grep mpir_init_fop_ | head -1` nameform2=`strings $allstrings confftest.$OBJEXT | grep MPIR_INIT_FOP | head -1` nameform3=`strings $allstrings confftest.$OBJEXT | grep mpir_init_fop | head -1` @@ -47,8 +47,8 @@ program failed to produce an object file]) echo "Fortran externals have a trailing underscore and are lowercase" FORTRANNAMES="FORTRANUNDERSCORE" elif test -n "$nameform2" ; then - echo "Fortran externals are uppercase" - FORTRANNAMES="FORTRANCAPS" + echo "Fortran externals are uppercase" + FORTRANNAMES="FORTRANCAPS" elif test -n "$nameform3" ; then echo "Fortran externals are lower case" FORTRANNAMES="FORTRANNOUNDERSCORE" @@ -76,7 +76,7 @@ if test -n "$arch_IRIX"; then dnl For example dnl IRIX_5_4400 (IRIX 5.x, using MIPS 4400) osversion=`uname -r | sed 's/\..*//'` - dnl Note that we need to allow brackets here, so we briefly turn off + dnl Note that we need to allow brackets here, so we briefly turn off dnl the macro quotes changequote(,)dnl dnl Get the second field (looking for 6.1) @@ -111,7 +111,7 @@ if test -n "$arch_IRIX"; then fi AC_MSG_RESULT($cputype) dnl echo "checking for osversion and cputype" - dnl cputype may contain R4400, R2000A/R3000, or something else. + dnl cputype may contain R4400, R2000A/R3000, or something else. dnl We may eventually need to look at it. if test -z "$osversion" ; then AC_MSG_RESULT([Could not determine OS version. Please send]) @@ -123,9 +123,9 @@ if test -n "$arch_IRIX"; then true elif test $osversion = 6 ; then true - else + else AC_MSG_RESULT([Could not recognize the version of IRIX (got $osversion). -ROMIO knows about versions 4, 5 and 6; the version being returned from +ROMIO knows about versions 4, 5 and 6; the version being returned from uname -r is $osversion. Please send]) uname -a 2>&1 hinv 2>&1 @@ -138,7 +138,7 @@ uname -r is $osversion. Please send]) changequote(,)dnl cputype=`echo $cputype | sed -e 's%.*/%%' -e 's/R//' | tr -d "[A-Z]"` changequote([,])dnl - case $cputype in + case $cputype in 3000) ;; 4000) ;; 4400) ;; @@ -150,7 +150,7 @@ uname -r is $osversion. Please send]) *) AC_MSG_WARN([Unexpected IRIX/MIPS chipset $cputype. Please send the output]) uname -a 2>&1 - hinv 2>&1 + hinv 2>&1 AC_MSG_WARN([to romio-maint@mcs.anl.gov ROMIO will continue and assume that the cputype is compatible with a MIPS 4400 processor.]) @@ -172,7 +172,7 @@ define(PAC_TEST_MPI,[ main(int argc, char **argv) { MPI_Init(&argc,&argv); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -225,10 +225,10 @@ define(PAC_MPI_LONG_LONG_INT,[ #include "mpi.h" main(int argc, char **argv) { - long long i; + long long i; MPI_Init(&argc,&argv); MPI_Send(&i, 1, MPI_LONG_LONG_INT, 0, 0, MPI_COMM_WORLD); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -247,7 +247,7 @@ dnl define(PAC_LONG_LONG_64,[ if test -n "$longlongsize" ; then if test "$longlongsize" = 8 ; then - echo "defining MPI_Offset as long long in C and integer*8 in Fortran" + echo "defining MPI_Offset as long long in C and integer*8 in Fortran" AC_DEFINE(HAVE_LONG_LONG_64,,[Define if long long is 64 bits]) DEFINE_MPI_OFFSET="typedef long long MPI_Offset;" FORTRAN_MPI_OFFSET="integer*8" @@ -260,8 +260,8 @@ if test -n "$longlongsize" ; then LL="\%d" MPI_OFFSET_KIND1="!" MPI_OFFSET_KIND2="!" - else - echo "defining MPI_Offset as long in C and integer in Fortran" + else + echo "defining MPI_Offset as long in C and integer in Fortran" DEFINE_MPI_OFFSET="typedef long MPI_Offset;" FORTRAN_MPI_OFFSET="integer" LL="\%ld" @@ -274,14 +274,14 @@ else if test "$longlongsize" = 8 ; then PAC_TEST_LONG_LONG() else - echo "defining MPI_Offset as long in C and integer in Fortran" + echo "defining MPI_Offset as long in C and integer in Fortran" DEFINE_MPI_OFFSET="typedef long MPI_Offset;" FORTRAN_MPI_OFFSET="integer" LL="\%ld" MPI_OFFSET_KIND1="!" MPI_OFFSET_KIND2="!" fi - else + else dnl check if longlong is not supported or only its size cannot be determined dnl because the program cannot be run. rm -f ltest.c @@ -297,14 +297,14 @@ EOF if test -x conftest$EXEEXT ; then echo "assuming size of long long is 8bytes; use '-longlongsize' to indicate otherwise" rm -f conftest$EXEEXT ltest.c - echo "defining MPI_Offset as long long in C and integer*8 in Fortran" + echo "defining MPI_Offset as long long in C and integer*8 in Fortran" AC_DEFINE(HAVE_LONG_LONG_64,,[Define if long long is 64 bits]) DEFINE_MPI_OFFSET="typedef long long MPI_Offset;" FORTRAN_MPI_OFFSET="integer*8" LL="\%lld" - else + else echo "assuming long long is not available; use '-longlongsize' to indicate otherwise" - echo "defining MPI_Offset as long in C and integer in Fortran" + echo "defining MPI_Offset as long in C and integer in Fortran" DEFINE_MPI_OFFSET="typedef long MPI_Offset;" FORTRAN_MPI_OFFSET="integer" LL="\%ld" @@ -326,7 +326,7 @@ define(PAC_MPI_INFO,[ MPI_Info info; MPI_Init(&argc,&argv); MPI_Info_create(&info); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -363,7 +363,7 @@ define(PAC_MPI_DARRAY_SUBARRAY,[ MPI_Init(&argc,&argv); MPI_Type_create_darray(i, i, i, &i, &i, &i, &i, i, MPI_INT, &t); MPI_Type_create_subarray(i, &i, &i, &i, i, MPI_INT, &t); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -480,7 +480,7 @@ define(PAC_TEST_MPI_SGI_type_is_contig,[ MPI_Init(&argc,&argv); i = MPI_SGI_type_is_contig(type); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -507,7 +507,7 @@ define(PAC_TEST_MPI_COMBINERS,[ MPI_Init(&argc,&argv); i = MPI_COMBINER_STRUCT; - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -581,7 +581,7 @@ fi KINDVAL="" if $FC -o conftest$EXEEXT conftest.$ac_f90ext $FCFLAGS >/dev/null 2>&1 ; then ./conftest$EXEEXT >/dev/null 2>&1 - if test -s conftest.out ; then + if test -s conftest.out ; then KINDVAL=`cat conftest.out` fi fi @@ -624,7 +624,7 @@ EOF dnl dnl dnl PAC_GET_XFS_MEMALIGN -dnl +dnl dnl define(PAC_GET_XFS_MEMALIGN, [AC_MSG_CHECKING([for memory alignment needed for direct I/O]) @@ -634,7 +634,7 @@ AC_TEST_PROGRAM([#include #include #include #include -main() { +main() { struct dioattr st; int fd = open("/tmp/romio_tmp.bin", O_RDWR | O_CREAT, 0644); FILE *f=fopen("memalignval","w"); @@ -704,7 +704,7 @@ fi KINDVAL="" if $FC -o kind$EXEEXT kind.f $FCFLAGS >/dev/null 2>&1 ; then ./kind >/dev/null 2>&1 - if test -s k.out ; then + if test -s k.out ; then KINDVAL=`cat k.out` fi fi @@ -773,7 +773,7 @@ define(PAC_TEST_MPIR_STATUS_SET_BYTES,[ MPI_Init(&argc,&argv); MPIR_Status_set_bytes(status,type,err); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT diff --git a/3rd-party/romio341/confdb/aclocal_shl.m4 b/3rd-party/romio341/confdb/aclocal_shl.m4 index 9997fe54a1b..2a482365392 100644 --- a/3rd-party/romio341/confdb/aclocal_shl.m4 +++ b/3rd-party/romio341/confdb/aclocal_shl.m4 @@ -1,7 +1,7 @@ dnl dnl Definitions for creating shared libraries dnl -dnl The purpose of these definitions is to provide common support for +dnl The purpose of these definitions is to provide common support for dnl shared libraries, with *or without* the use of the GNU Libtool package. dnl For many of our important platforms, the Libtool approach is overkill, dnl and can be particularly painful for developers. @@ -9,30 +9,30 @@ dnl dnl To use libtool, you need macros that are defined by libtool for libtool dnl Don't even think about the consequences of this for updating and for dnl using user-versions of libtool :( -dnl +dnl dnl !!!!!!!!!!!!!!!!!!!!! dnl libtool requires ac 2.50 !!!!!!!!!!!!!!!!! -dnl +dnl dnl builtin(include,libtool.m4) dnl dnl/*D dnl PAC_ARG_SHAREDLIBS - Add --enable-sharedlibs=kind to configure. -dnl +dnl dnl Synopsis: dnl PAC_ARG_SHAREDLIBS dnl dnl Output effects: dnl Adds '--enable-sharedlibs=kind' to the command line. If this is enabled, -dnl then based on the value of 'kind', programs are selected for the +dnl then based on the value of 'kind', programs are selected for the dnl names 'CC_SHL' and 'CC_LINK_SHL' that configure will substitute for in dnl 'Makefile.in's. These symbols are generated by 'simplemake' when dnl shared library support is selected. -dnl The variable 'C_LINKPATH_SHL' is set to the option to specify the +dnl The variable 'C_LINKPATH_SHL' is set to the option to specify the dnl path to search at runtime for libraries (-rpath in gcc/GNU ld). dnl This can be turned off with --disable-rpath , which is appropriate dnl for libraries and for executables that may be installed in different dnl locations. -dnl The variable 'SHLIB_EXT' is set to the extension used by shared +dnl The variable 'SHLIB_EXT' is set to the extension used by shared dnl libraries; under most forms of Unix, this is 'so'; under Mac OS/X, this dnl is 'dylib', and under Windows (including cygwin), this is 'dll'. dnl @@ -40,7 +40,7 @@ dnl Supported values of 'kind' include \: dnl+ gcc - Use gcc to create both shared objects and libraries dnl. osx-gcc - Use gcc on Mac OS/X to create both shared objects and dnl libraries -dnl. solaris-cc - Use native Solaris cc to create shared objects and +dnl. solaris-cc - Use native Solaris cc to create shared objects and dnl libraries dnl. cygwin-gcc - Use gcc on Cygwin to create shared objects and libraries dnl- none - The same as '--disable-sharedlibs' @@ -105,7 +105,7 @@ C_LINKPATH_SHL="" SHLIB_EXT=unknown SHLIB_FROM_LO=no SHLIB_INSTALL='$(INSTALL_PROGRAM)' -case "$enable_sharedlibs" in +case "$enable_sharedlibs" in no|none) ;; gcc-osx|osx-gcc) @@ -114,7 +114,7 @@ case "$enable_sharedlibs" in CC_SHL='${CC} -fPIC' # No way in osx to specify the location of the shared libraries at link # time (see the code in createshlib in mpich/src/util) - # As of 10.5, -Wl,-rpath,dirname should work . The dirname + # As of 10.5, -Wl,-rpath,dirname should work . The dirname # must be a single directory, not a colon-separated list (use multiple # -Wl,-rpath,path for each of the paths in the list). However, os x # apparently records the library full path, so rpath isn't as useful @@ -148,13 +148,13 @@ case "$enable_sharedlibs" in C_LINKPATH_SHL="-Wl,-rpath," fi SHLIB_EXT=so - # We need to test that this isn't osx. The following is a + # We need to test that this isn't osx. The following is a # simple hack osname=`uname -s` - case $osname in + case $osname in *Darwin*|*darwin*) AC_MSG_ERROR([You must specify --enable-sharedlibs=osx-gcc for Mac OS/X]) - ;; + ;; *CYGWIN*|*cygwin*) AC_MSG_ERROR([You must specify --enable-sharedlibs=cygwin-gcc for Cygwin]) ;; @@ -172,7 +172,7 @@ case "$enable_sharedlibs" in C_LINKPATH_SHL="" SHLIB_EXT="dll" enable_sharedlibs="cygwin-gcc" - ;; + ;; libtool) # set TRY_LIBTOOL to yes to experiment with libtool. You are on your @@ -180,7 +180,7 @@ case "$enable_sharedlibs" in if test "$TRY_LIBTOOL" != yes ; then AC_MSG_ERROR([Creating shared libraries using libtool not yet supported]) else - # Using libtool requires a heavy-weight process to test for + # Using libtool requires a heavy-weight process to test for # various stuff that libtool needs. Without this, you'll get a # bizarre error message about libtool being unable to find # configure.in or configure.ac (!) @@ -205,7 +205,7 @@ case "$enable_sharedlibs" in # we are building under cygwin sysname=`uname -s | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` isCygwin=no - case "$sysname" in + case "$sysname" in *CYGWIN*) isCygwin=yes ;; esac if test "$isCygwin" = yes ; then @@ -269,7 +269,7 @@ dnl Other, such as solaris-cc *) AC_MSG_ERROR([Unknown value $enable_sharedlibs for enable-sharedlibs. Values should be gcc or osx-gcc]) enable_sharedlibs=no - ;; + ;; esac # Check for the shared-library extension PAC_CC_SHLIB_EXT @@ -286,7 +286,7 @@ dnl /*D dnl PAC_xx_SHAREDLIBS - Get compiler and linker for shared libraries dnl These routines may be used to determine the compiler and the dnl linker to be used in creating shared libraries -dnl Rather than set predefined variable names, they set an argument +dnl Rather than set predefined variable names, they set an argument dnl (if provided) dnl dnl Synopsis @@ -300,11 +300,11 @@ ifelse($1,,[ AC_CHECK_PROG(pac_prog,gcc,yes,no) # If we are gcc but OS X, set the special type # We need a similar setting for cygwin - if test "$pac_prog" = yes ; then + if test "$pac_prog" = yes ; then osname=`uname -s` - case $osname in + case $osname in *Darwin*|*darwin*) pac_kinds=gcc-osx - ;; + ;; *) pac_kinds=gcc ;; esac @@ -314,7 +314,7 @@ ifelse($1,,[ if test "$pac_prog" = yes ; then pac_kinds="$pac_kinds libtool" ; fi ]) for pac_arg in $pac_kinds ; do - case $pac_arg in + case $pac_arg in gcc) # For example, include the libname as ${LIBNAME_SHL} #C_LINK_SHL='${CC} -shared -Wl,-h,' @@ -363,10 +363,10 @@ ifelse($3,,C_LINK_SHL=$pac_clink_sharedlibs,$3=$pac_clink_sharedlibs) ifelse($4,,SHAREDLIB_TYPE=$pac_type_sharedlibs,$4=$pac_type_sharedlibs) ]) -dnl This macro ensures that all of the necessary substitutions are +dnl This macro ensures that all of the necessary substitutions are dnl made by any subdirectory configure (which may simply SUBST the dnl necessary values rather than trying to determine them from scratch) -dnl This is a more robust (and, in the case of libtool, only +dnl This is a more robust (and, in the case of libtool, only dnl managable) method. AC_DEFUN([PAC_CC_SUBDIR_SHLIBS],[ AC_SUBST(CC_SHL) @@ -395,9 +395,9 @@ AC_DEFUN([PAC_CC_SHLIB_EXT],[ # clean steps that look for libfoo.$SHLIB_EXT . if test "$SHLIB_EXT" = "unknown" ; then osname=`uname -s` - case $osname in + case $osname in *Darwin*|*darwin*) SHLIB_EXT=dylib - ;; + ;; *CYGWIN*|*cygwin*) SHLIB_EXT=dll ;; *Linux*|*LINUX*|*SunOS*) SHLIB_EXT=so diff --git a/3rd-party/romio341/confdb/aclocal_subcfg.m4 b/3rd-party/romio341/confdb/aclocal_subcfg.m4 index fbd1899f4dd..543bfc50724 100644 --- a/3rd-party/romio341/confdb/aclocal_subcfg.m4 +++ b/3rd-party/romio341/confdb/aclocal_subcfg.m4 @@ -30,7 +30,7 @@ dnl to subconfigure as "precious" appropriately. The precious variable dnl can be created in the following ways: dnl 1) implicit declaration through use of autoconf macros, like dnl AC_PROG_CC (declares CC/CFLAGS/CPPFLAGS/LIBS/LDFLAGS), or -dnl AC_PROG_F77 (declares F77/FFLAGS/FLIBS) ... +dnl AC_PROG_F77 (declares F77/FFLAGS/FLIBS) ... dnl which are in turns invoked by other subconfigure. dnl When in doubt, check "ac_precious_var" in the calling configure. dnl 2) explicit "precious" declaration through AC_ARG_VAR. @@ -54,7 +54,7 @@ AC_DEFUN([PAC_CONFIG_SUBDIR_ARGS],[ # Adapted for MPICH from the autoconf-2.67 implementation of # AC_CONFIG_SUBDIRS. Search for "MPICH note:" for relevant commentary and # local modifications. - + # Remove --cache-file, --srcdir, and --disable-option-checking arguments # so they do not pile up. Otherwise relative paths (like --srcdir=.. from # make distcheck) will be incorrect. @@ -115,7 +115,7 @@ AC_DEFUN([PAC_CONFIG_SUBDIR_ARGS],[ AS_VAR_APPEND([pac_sub_configure_args], [" '$pac_arg'"]) ;; esac done - + # Always prepend --prefix to ensure using the same prefix # in subdir configurations. # MPICH note: see tt#983 for an example of why this is necessary @@ -124,22 +124,22 @@ AC_DEFUN([PAC_CONFIG_SUBDIR_ARGS],[ *\'*) pac_arg=`AS_ECHO(["$pac_arg"]) | sed "s/'/'\\\\\\\\''/g"` ;; esac pac_sub_configure_args="'$pac_arg' $pac_sub_configure_args" - + # Pass --silent if test "$silent" = yes; then pac_sub_configure_args="--silent $pac_sub_configure_args" fi - + # Always prepend --disable-option-checking to silence warnings, since # different subdirs can have different --enable and --with options. pac_sub_configure_args="--disable-option-checking $pac_sub_configure_args" - + pac_popdir=`pwd` - + # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. test -d "$srcdir/$pac_dir" || continue - + # MPICH note: modified to remove the internal "_AS_*" macro usage, also # msg is already printed at top dnl _AS_ECHO_LOG([$pac_msg]) diff --git a/3rd-party/romio341/confdb/aclocal_util.m4 b/3rd-party/romio341/confdb/aclocal_util.m4 index 2648be54303..d25ed648420 100644 --- a/3rd-party/romio341/confdb/aclocal_util.m4 +++ b/3rd-party/romio341/confdb/aclocal_util.m4 @@ -131,7 +131,7 @@ AC_SUBST(MKDIR_P) ]) dnl Test for a clean VPATH directory. Provide this command with the names -dnl of all of the generated files that might cause problems +dnl of all of the generated files that might cause problems dnl (Makefiles won't cause problems because there's no VPATH usage for them) dnl dnl Synopsis @@ -151,12 +151,12 @@ if test ! -s $srcdir/conftest$$ ; then pac_header="" ifdef([AC_LIST_HEADER],[pac_header=AC_LIST_HEADER]) for file in config.status $pac_header $1 ; do - if test -f $srcdir/$file ; then + if test -f $srcdir/$file ; then pac_dirtyfiles="$pac_dirtyfiles $file" fi done ifelse($2,,,[ - for dir in $2 ; do + for dir in $2 ; do if test -d $srcdir/$dir ; then pac_dirtydirs="$pac_dirtydirs $dir" fi diff --git a/3rd-party/romio341/configure.ac b/3rd-party/romio341/configure.ac index b0dad8f5a06..b893d419e7f 100644 --- a/3rd-party/romio341/configure.ac +++ b/3rd-party/romio341/configure.ac @@ -1507,7 +1507,7 @@ AC_ARG_VAR([main_top_srcdir],[set by the MPICH configure to indicate the MPICH s AC_ARG_VAR([main_top_builddir],[set by the MPICH configure to indicate the MPICH build root]) # The main_top_srcdir is the location of the source for the building -# package. This is used only as part of the MPICH build, including +# package. This is used only as part of the MPICH build, including # the documentation targets mandoc, htmldoc, and latexdoc if test -z "$main_top_srcdir" ; then if test "$FROM_MPICH" = yes ; then diff --git a/3rd-party/romio341/doc/README b/3rd-party/romio341/doc/README index b61e73ee204..9f72cc10a14 100644 --- a/3rd-party/romio341/doc/README +++ b/3rd-party/romio341/doc/README @@ -1,7 +1,7 @@ The ROMIO Users Guide is in the file users-guide.ps.gz. The book ``Using MPI-2: Advanced Features of the Message-Passing -Interface,'' by William Gropp, Ewing Lusk, and Rajeev Thakur, +Interface,'' by William Gropp, Ewing Lusk, and Rajeev Thakur, MIT Press, 1999, provides a tutorial introduction to all aspects of MPI-2, including I/O. It has lots of example programs. @@ -9,18 +9,18 @@ The following papers related to ROMIO are available online: * Rajeev Thakur, William Gropp, and Ewing Lusk, ``Optimizing Noncontiguous Accesses in MPI-IO,'' Parallel Computing, (28)1:83--105, -January 2002. +January 2002. http://www.mcs.anl.gov/~thakur/papers/mpi-io-noncontig.ps * R. Thakur, W. Gropp, and E. Lusk, ``On Implementing MPI-IO Portably and with High Performance,'' in Proc. of the Sixth Workshop on I/O in -Parallel and Distributed Systems, May 1999. +Parallel and Distributed Systems, May 1999. http://www.mcs.anl.gov/~thakur/papers/mpio-impl.ps * R. Thakur, W. Gropp, and E. Lusk, ``Data Sieving and Collective I/O in ROMIO,'' in Proc. of the 7th Symposium on the Frontiers of Massively Parallel Computation, February 1999, pp. 182--189. -http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps +http://www.mcs.anl.gov/~thakur/papers/romio-coll.ps * R. Thakur, W. Gropp, and E. Lusk, ``A Case for Using MPI's Derived Datatypes to Improve I/O Performance,'' in Proc. of SC98: High @@ -29,7 +29,7 @@ http://www.mcs.anl.gov/~thakur/dtype * R. Thakur, W. Gropp, and E. Lusk, ``An Abstract-Device Interface for Implementing Portable Parallel-I/O Interfaces,'' in Proc. of the 6th -Symposium on the Frontiers of Massively Parallel Computation, +Symposium on the Frontiers of Massively Parallel Computation, October 1996, pp. 180-187. http://www.mcs.anl.gov/~thakur/papers/adio.ps diff --git a/3rd-party/romio341/doc/pubs.bib b/3rd-party/romio341/doc/pubs.bib index 5799bc305cf..946f6f2b541 100644 --- a/3rd-party/romio341/doc/pubs.bib +++ b/3rd-party/romio341/doc/pubs.bib @@ -145,10 +145,10 @@ @InProceedings{lee:rfs } @InProceedings{yu:bgl-io, - author = {Hao Yu and R. K. Sahoo and C. Howson and George. Almasi and - J. G. Castanos and M. Gupta and Jose. E. Moreira and J. J. Parker and - T. E. Engelsiepen and Robert Ross and Rajeev Thakur and Robert Latham - and W. D. Gropp}, + author = {Hao Yu and R. K. Sahoo and C. Howson and George. Almasi and + J. G. Castanos and M. Gupta and Jose. E. Moreira and J. J. Parker and + T. E. Engelsiepen and Robert Ross and Rajeev Thakur and Robert Latham + and W. D. Gropp}, title = {High Performance File {I/O} for the {BlueGene/L} Supercomputer}, booktitle = {Proceedings of the 12th International Symposium on High-Performance Computer Architecture (HPCA-12)}, month = {February}, @@ -260,7 +260,7 @@ @InProceedings{yu:lustre-joining title = {Exploiting {Lustre} File Joining for Effective Collective {IO}}, booktitle = {Seventh IEEE International Symposium on Cluster Computing and the Grid (CCGrid 2007)}, month = {May}, - year = {2007}, + year = {2007}, } @InProceedings{yu:opal, @@ -333,7 +333,7 @@ @article{liao:cooperative_caching_mpi_journal title = {Cooperative Client-side File Caching for {MPI} Applications}, journal = {International Journal of High Performance Computing Applications}, volume = {21}, - number = {2}, + number = {2}, pages = {144-154}, month = {May}, year = {2007} @@ -341,10 +341,10 @@ @article{liao:cooperative_caching_mpi_journal @InProceedings{liao:client_cache_eval, author = {Wei-keng Liao and Avery Ching and Kenin Coloma and Alok Choudhary and Lee Ward}, - title = {An Implementation and Evaluation of Client-side File Caching for {MPI-IO}}, - booktitle = {Proceedings of the 21st International Parallel and Distributed + title = {An Implementation and Evaluation of Client-side File Caching for {MPI-IO}}, + booktitle = {Proceedings of the 21st International Parallel and Distributed Processing Symposium (IPDPS), Long Beach, California}, - month = {March}, + month = {March}, year = {2007} } @@ -384,7 +384,7 @@ @Inbook{liao:atomicity_overlap title = {{MPI} Atomicity and Concurrent Overlapping {I/O}}, booktitle = {High Performance Computing: Paradigm and Infrastructure}, pages = {203-218}, - chapter = {10}, + chapter = {10}, month = {November}, year = {2005}, publisher = {John Wiley & Sons Inc}, @@ -396,7 +396,7 @@ @InProceedings{liao:cooperative_write-behind title = {{Cooperative Write-Behind Data Buffering for MPI I/O}}, booktitle = {Proceedings of the 12th European Parallel Virtual Machine and Message Passing Interface Conference (EURO PVM/MPI), Sorrento (Naples), Italy}, month = {September}, - year = {2005} + year = {2005} } @InProceedings{liao:app_aware_caching, diff --git a/3rd-party/romio341/doc/romio.bib b/3rd-party/romio341/doc/romio.bib index 6c023bf72ec..6b15b0745c6 100644 --- a/3rd-party/romio341/doc/romio.bib +++ b/3rd-party/romio341/doc/romio.bib @@ -8,17 +8,17 @@ @Book{grop99a @Misc{mpi97a, author = "{Message Passing Interface Forum}", - title = "{{MPI-2}: Extensions to the Message-Passing Interface}", + title = "{{MPI-2}: Extensions to the Message-Passing Interface}", note = "{\tt http://www.mpi-forum.org/docs/docs.html}", year = {July 1997} } @InProceedings{thak96e, author = {Rajeev Thakur and William Gropp and Ewing Lusk}, - title = {An Abstract-Device Interface for Implementing Portable + title = {An Abstract-Device Interface for Implementing Portable Parallel-{I/O} Interfaces}, booktitle = {Proceedings of the 6th Symposium on the Frontiers of - Massively Parallel Computation}, + Massively Parallel Computation}, publisher = {IEEE Computer Society Press}, pages = {180--187}, month = {October}, @@ -28,8 +28,8 @@ @InProceedings{thak96e @InProceedings{thak99b, author = {Rajeev Thakur and William Gropp and Ewing Lusk}, title = {On Implementing {MPI-IO} Portably and with High Performance}, - booktitle = {Proceedings of the 6th Workshop on I/O in Parallel and - Distributed Systems}, + booktitle = {Proceedings of the 6th Workshop on I/O in Parallel and + Distributed Systems}, pages = {23--32}, year = {1999}, month = {May}, diff --git a/3rd-party/romio341/doc/source-guide.tex b/3rd-party/romio341/doc/source-guide.tex index 96fa7ca58d9..ec151bfeeab 100644 --- a/3rd-party/romio341/doc/source-guide.tex +++ b/3rd-party/romio341/doc/source-guide.tex @@ -61,7 +61,7 @@ %% \newcommand{\ls}[1] - {\dimen0=\fontdimen6\the\font + {\dimen0=\fontdimen6\the\font \lineskip=#1\dimen0 \advance\lineskip.5\fontdimen5\the\font \advance\lineskip-\dimen0 diff --git a/3rd-party/romio341/doc/users-guide.ps b/3rd-party/romio341/doc/users-guide.ps index e428067c2fc..8117b6ed34f 100644 Binary files a/3rd-party/romio341/doc/users-guide.ps and b/3rd-party/romio341/doc/users-guide.ps differ diff --git a/3rd-party/romio341/doc/users-guide.tex b/3rd-party/romio341/doc/users-guide.tex index 0c40ca6ddf9..48cfdf7c081 100644 --- a/3rd-party/romio341/doc/users-guide.tex +++ b/3rd-party/romio341/doc/users-guide.tex @@ -21,7 +21,7 @@ \rule{1.75in}{.01in} \\ -\vskip 1.3in +\vskip 1.3in {\Large\bf Users Guide for ROMIO: A High-Performance, \\ [1ex] Portable MPI-IO Implementation} \\ [4ex] by \\ [2ex] @@ -60,7 +60,7 @@ %% \newcommand{\ls}[1] - {\dimen0=\fontdimen6\the\font + {\dimen0=\fontdimen6\the\font \lineskip=#1\dimen0 \advance\lineskip.5\fontdimen5\the\font \advance\lineskip-\dimen0 @@ -98,10 +98,10 @@ ROMIO version~1.2.4 on various machines. \end{abstract} -\section{Introduction} +\section{Introduction} ROMIO\footnote{\tt http://www.mcs.anl.gov/romio} is a -high-performance, portable implementation of MPI-IO (the I/O chapter in +high-performance, portable implementation of MPI-IO (the I/O chapter in MPI~\cite{mpi97a}). This document describes how to install and use ROMIO version~1.2.4 on various machines. @@ -166,7 +166,7 @@ \section{General Information} Please read the limitations of this version of ROMIO that are listed in Section~\ref{sec:limit} of this document (e.g., restriction to homogeneous -environments). +environments). \subsection{ROMIO Optimizations} \label{sec:opt} @@ -182,8 +182,8 @@ \subsection{ROMIO Optimizations} of data. The added network cost of performing an I/O operation across the network, as in parallel I/O systems, is often high because of latency. Thus, this naive approach typically performs very poorly because of -the overhead of multiple operations. -% +the overhead of multiple operations. +% In the data sieving technique, a number of noncontiguous regions are accessed by reading a block of data containing all of the regions, including the unwanted data between them (called ``holes''). The regions @@ -232,7 +232,7 @@ \subsection{Hints} \item \texttt{ind\_wr\_buffer\_size} -- Controls the size (in bytes) of the intermediate buffer used by ROMIO when performing data sieving during write operations. Default is \texttt{524288} (512~Kbytes). -\item \texttt{romio\_ds\_read} -- +\item \texttt{romio\_ds\_read} -- Determines when ROMIO will choose to perform data sieving. Valid values are \texttt{enable}, \texttt{disable}, or \texttt{automatic}. Default value is \texttt{automatic}. In \texttt{automatic} mode ROMIO @@ -259,8 +259,8 @@ \subsection{Hints} \texttt{automatic}, ROMIO will use heuristics to determine when to enable the optimization. \item \texttt{romio\_cb\_write} -- Controls when collective buffering is -applied to collective write operations. Valid values are -\texttt{enable}, \texttt{disable}, and \texttt{automatic}. Default is +applied to collective write operations. Valid values are +\texttt{enable}, \texttt{disable}, and \texttt{automatic}. Default is \texttt{automatic}. See the description of \texttt{romio\_cb\_read} for an explanation of the values. \item \texttt{romio\_no\_indep\_rw} -- This hint controls when ``deferred @@ -268,7 +268,7 @@ \subsection{Hints} performing any file operation on non-aggregator nodes. The application is expected to use only collective operations. This is discussed in further detail below. -\item \texttt{cb\_config\_list} -- Provides explicit control over +\item \texttt{cb\_config\_list} -- Provides explicit control over aggregators. This is discussed in further detail below. \end{itemize} @@ -289,7 +289,7 @@ \subsection{Hints} cb_config_list => hostspec [ ',' cb_config_list ] hostspec => hostname [ ':' maxprocesses ] hostname => - | '*' + | '*' maxprocesses => | '*' \end{verbatim} @@ -356,13 +356,13 @@ \subsection{Hints} that they are listed in \texttt{cb\_config\_list}. The following hint controls the deferred open feature of romio and are also -applicable to all file system types: +applicable to all file system types: \begin{itemize} -\item \texttt{romio\_no\_indep\_rw} -- If the application plans on performing only +\item \texttt{romio\_no\_indep\_rw} -- If the application plans on performing only collecitve operations and this hint is set to ``true'', then ROMIO can have just the aggregators open a file. The \texttt{cb\_config\_list} and \texttt{cb\_nodes} hints can be given to further control which nodes are - aggregators. + aggregators. \end{itemize} For PVFS2: @@ -391,7 +391,7 @@ \subsubsection{Hints for XFS} \subsubsection{Hints for PVFS2 (a.k.a OrangeFS)} \label{sec:hints_pvfs} -The PVFS v2 file system has many tuning parameters. +The PVFS v2 file system has many tuning parameters. \begin{itemize} \item dtype i/o \end{itemize} @@ -427,7 +427,7 @@ \subsubsection{Hints for Lustre} collective write performance for some kinds of workloads. So, to avoid this, we define the \texttt{romio\_lustre\_ds\_in\_coll} hint to disable the read-modify-write step in collective I/O. This optimization is distinct from the one in -independent I/O (controlled by \texttt{romio\_ds\_read} and +independent I/O (controlled by \texttt{romio\_ds\_read} and \texttt{romio\_ds\_write}). \end{itemize} @@ -443,7 +443,7 @@ \subsubsection{Hints for PANFS (Panasas)} \begin{itemize} \item \texttt{panfs\_layout\_type} Specifies the layout of a file: 2 = RAID0 -3 = RAID5 Parity Stripes +3 = RAID5 Parity Stripes \item \texttt{panfs\_layout\_stripe\_unit} The size of the stripe unit in bytes @@ -461,7 +461,7 @@ \subsubsection{Hints for PANFS (Panasas)} \item \texttt{panfs\_layout\_visit\_policy} If the layout type is RAID5 Parity Stripes, the policy used to determine the parity stripe a given file offset is -written to: 1 = Round Robin +written to: 1 = Round Robin \end{itemize} PanFS supports the ``concurrent write'' (CW) mode, where groups of @@ -485,7 +485,7 @@ \subsubsection{Hints for PANFS (Panasas)} Below is an example PanFS layout using the following parameters: \begin{verbatim} - + - panfs_layout_type = 3 - panfs_layout_total_num_comps = 100 - panfs_layout_parity_stripe_width = 10 @@ -534,7 +534,7 @@ \subsubsection{Systemwide Hints} ROMIO will look for these hints in the file \texttt{/etc/romio-hints}. A user can set the environment variable \texttt{ROMIO\_HINTS} to the name of a file -which ROMIO will use instead. +which ROMIO will use instead. \subsection{Using ROMIO on NFS} @@ -555,17 +555,17 @@ \subsection{Using ROMIO on NFS} The following are some instructions we received from Ian Wells of HP for setting the {\tt noac} option on NFS. We have not tried them -ourselves. We are including them here because you may find +ourselves. We are including them here because you may find them useful. Note that some of the steps may be specific to HP systems, and you may need root permission to execute some of the -commands. +commands. -\begin{verbatim} +\begin{verbatim} >1. first confirm you are running nfs version 3 > >rpcnfo -p `hostname` | grep nfs > - >ie + >ie > goedel >rpcinfo -p goedel | grep nfs > 100003 2 udp 2049 nfs > 100003 3 udp 2049 nfs @@ -577,11 +577,11 @@ \subsection{Using ROMIO on NFS} > Here is an example of a correct fstab entry for /epm1: > > ie grep epm1 /etc/fstab - > + > > ROOOOT 11>grep epm1 /etc/fstab > gershwin:/epm1 /rmt/gershwin/epm1 nfs bg,intr,noac 0 0 > - > if the noac option is not present, add it + > if the noac option is not present, add it > and then remount this directory > on each of the machines that will be used to share MPIO files > @@ -592,7 +592,7 @@ \subsection{Using ROMIO on NFS} > >3. Confirm that the directory is mounted noac: > - >ROOOOT >grep gershwin /etc/mnttab + >ROOOOT >grep gershwin /etc/mnttab >gershwin:/epm1 /rmt/gershwin/epm1 nfs >noac,acregmin=0,acregmax=0,acdirmin=0,acdirmax=0 0 0 899911504 \end{verbatim} @@ -603,7 +603,7 @@ \subsubsection{ROMIO, NFS, and Synchronization} the disk before replying that an operation is complete. This means that the actual I/O cost on the server side cannot be hidden with caching, etc. when this option is selected. - + In the ``async'' mode the server can get the data into a buffer (and perhaps put it in the write queue; this depends on the implementation) and reply right away. Obviously if the server were to go down after the @@ -683,7 +683,7 @@ \section{Installation Instructions} Since ROMIO is included in MPICH, LAM, HP MPI, SGI MPI, and NEC MPI, you don't need to install it separately if you are using any of these MPI implementations. If you are using some other MPI, you -can configure and build ROMIO as follows: +can configure and build ROMIO as follows: Untar the tar file as \begin{verbatim} @@ -708,12 +708,12 @@ \section{Installation Instructions} filename}''. The {\tt configure} script by default configures ROMIO for the file -systems most likely +systems most likely to be used on the given machine. If you wish, you can explicitly specify the file systems by using the ``{\tt -file\_system}'' option to configure. Multiple file systems can be specified by using `+' as a separator, e.g., \\ \hspace*{.4in} {\tt ./configure -file\_system=xfs+nfs} \\ -For the entire list of options to configure, do\\ +For the entire list of options to configure, do\\ \hspace*{.4in} {\tt ./configure -h | more} \\ After building a specific version, you can install it in a particular directory with \\ @@ -750,7 +750,7 @@ \subsection{Configuring for Linux and Large Files } compiled with a different size of {\tt off\_t}). The latter exposes the gnu libc functions open64(), write64(), read64(), etc. ROMIO does not make use of the 64 bit system calls directly at this time, but we -add this flag for good measure. +add this flag for good measure. If your linux system is relatively new, there is an excellent chance it is running kernel 2.4.0 or newer and glibc-2.2.0 or newer. Add the @@ -781,7 +781,7 @@ \section{Testing ROMIO} \section{Compiling and Running MPI-IO Programs} If ROMIO is not already included in the MPI implementation, you need to include the file {\tt mpio.h} for C or {\tt mpiof.h} for Fortran in -your MPI-IO program. +your MPI-IO program. Note that on HP machines running HPUX and on NEC SX-4, you need to compile Fortran programs with {\tt mpifort}, because {\tt mpif77} does @@ -865,10 +865,10 @@ \section{Usage Tips} \hspace*{.4in} {\tt setenv MPI\_TYPE\_MAX 65536}\\ Use a larger number if you still get the error message. \item If a Fortran program uses a file handle created using ROMIO's C -interface, or vice versa, you must use the functions {\tt MPI\_File\_c2f} +interface, or vice versa, you must use the functions {\tt MPI\_File\_c2f} or {\tt MPI\_File\_f2c} (see \S~4.12.4 in~\cite{mpi97a}). Such a situation occurs, for example, if a Fortran program uses an I/O -library written in C +library written in C with MPI-IO calls. Similar functions {\tt MPIO\_Request\_f2c} and {\tt MPIO\_Request\_c2f} are also provided. \item For Fortran programs on the Intel Paragon, you may need @@ -876,7 +876,7 @@ \section{Usage Tips} statement, e.g., \\ \hspace*{.4in} {\tt include '/usr/local/mpich/include/mpif.h'}\\ instead of \\ -\hspace*{.4in} {\tt include 'mpif.h'}\\ +\hspace*{.4in} {\tt include 'mpif.h'}\\ This is because the {\tt -I} option to the Paragon Fortran compiler {\tt if77} doesn't work correctly. It always looks in the default directories first and, @@ -981,15 +981,15 @@ \subsection{Major Changes in Version 1.0.2} components of the MPI I/O chapter not yet implemented are file interoperability and error handling. -\item Added support for using ``direct I/O'' on SGI's XFS file system. +\item Added support for using ``direct I/O'' on SGI's XFS file system. Direct I/O is an optional feature of XFS in which data is moved - directly between the user's buffer and the storage devices, bypassing - the file-system cache. This can improve performance significantly on + directly between the user's buffer and the storage devices, bypassing + the file-system cache. This can improve performance significantly on systems with high disk bandwidth. Without high disk bandwidth, regular I/O (that uses the file-system cache) perfoms better. ROMIO, therefore, does not use direct I/O by default. The user can turn on direct I/O (separately for reading and writing) either by - using environment variables or by using MPI's hints mechanism (info). + using environment variables or by using MPI's hints mechanism (info). To use the environment-variables method, do \begin{verbatim} setenv MPIO_DIRECT_READ TRUE @@ -1006,7 +1006,7 @@ \subsection{Major Changes in Version 1.0.2} process in the MPI job. This is not guaranteed by the MPI Standard, but it works with SGI's MPI and the {\tt ch\_shmem} device of MPICH. -\item Added support (new ADIO device, {\tt ad\_pvfs}) for the PVFS parallel +\item Added support (new ADIO device, {\tt ad\_pvfs}) for the PVFS parallel file system for Linux clusters, developed at Clemson University (see {\tt http://www.parl.clemson.edu/pvfs}). To use it, you must first install PVFS and then when configuring ROMIO, specify @@ -1022,13 +1022,13 @@ \subsection{Major Changes in Version 1.0.2} \item Uses weak symbols (where available) for building the profiling version, i.e., the PMPI routines. As a result, the size of the library is reduced - considerably. + considerably. \item The Makefiles use {\em virtual paths} if supported by the make utility. GNU {\tt make} supports it, for example. This feature allows you to untar the distribution in some directory, say a slow NFS directory, - and compile the library (create the .o files) in another + and compile the library (create the .o files) in another directory, say on a faster local disk. For example, if the tar file has been untarred in an NFS directory called {\tt /home/thakur/romio}, one can compile it in a different directory, say {\tt /tmp/thakur}, as @@ -1041,7 +1041,7 @@ \subsection{Major Changes in Version 1.0.2} The .o files will be created in {\tt /tmp/thakur}; the library will be created in\newline {\tt /home/thakur/romio/lib/\$ARCH/libmpio.a}. This method works only if the {\tt make} utility supports {\em - virtual paths}. + virtual paths}. If the default {\tt make} utility does not, you can install GNU {\tt make} which does, and specify it to {\tt configure} as \begin{verbatim} @@ -1052,8 +1052,8 @@ \subsection{Major Changes in Version 1.0.2} \item This version is included in MPICH 1.2.0. If you are using MPICH, you need not download ROMIO separately; it gets built as part of MPICH. - The previous version of ROMIO is included in LAM, HP MPI, SGI MPI, and - NEC MPI. NEC has also implemented the MPI-IO functions missing + The previous version of ROMIO is included in LAM, HP MPI, SGI MPI, and + NEC MPI. NEC has also implemented the MPI-IO functions missing in ROMIO, and therefore NEC MPI has a complete implementation of MPI-IO. \end{itemize} @@ -1069,7 +1069,7 @@ \subsection{Major Changes in Version 1.0.1} \item New devices {\tt ad\_hfs} for HP HFS file system and {\tt ad\_xfs} for SGI XFS file system. -\item Users no longer need to prefix the filename with the type of +\item Users no longer need to prefix the filename with the type of file system; ROMIO determines the file-system type on its own. \item Added support for 64-bit file sizes on IBM PIOFS, SGI XFS, @@ -1078,11 +1078,11 @@ \subsection{Major Changes in Version 1.0.1} \item {\tt MPI\_Offset} is an 8-byte integer on machines that support 8-byte integers. It is of type {\tt long long} in C and {\tt integer*8} in Fortran. With a Fortran 90 compiler, you can use either -{\tt integer*8} or {\tt integer(kind=MPI\_OFFSET\_KIND)}. -If you {\tt printf} an {\tt MPI\_Offset} in C, remember to use {\tt \%lld} -or {\tt \%ld} as required by your compiler. (See what is used in the test +{\tt integer*8} or {\tt integer(kind=MPI\_OFFSET\_KIND)}. +If you {\tt printf} an {\tt MPI\_Offset} in C, remember to use {\tt \%lld} +or {\tt \%ld} as required by your compiler. (See what is used in the test program {\tt romio/test/misc.c}). -On some machines, ROMIO detects at configure time that {\tt long long} is +On some machines, ROMIO detects at configure time that {\tt long long} is either not supported by the C compiler or it doesn't work properly. In such cases, configure sets {\tt MPI\_Offset} to {\tt long} in C and {\tt integer} in Fortran. This happens on Intel Paragon, Sun4, and FreeBSD. @@ -1098,7 +1098,7 @@ \subsection{Major Changes in Version 1.0.1} \texttt{striping\_unit} (on PFS and PIOFS), \texttt{start\_iodevice} (on PFS and PIOFS), and \texttt{pfs\_svr\_buf} (on PFS only). - + \end{itemize} \newpage @@ -1108,7 +1108,7 @@ \subsection{Major Changes in Version 1.0.1} %\bibliography{/homes/thakur/tex/bib/papers,/homes/robl/projects/papers/pario} % this is the pared-down one containing only those references used in % users-guide.tex -% to regenerate, uncomment the full databases above, then run +% to regenerate, uncomment the full databases above, then run % ~gropp/bin/citetags users-guide.tex | sort | uniq | \ % ~gropp/bin/citefind - /homes/thakur/tex/bib/papers.bib \ % /homes/robl/projects/papers/pario diff --git a/3rd-party/romio341/include/mpio.h.in b/3rd-party/romio341/include/mpio.h.in index b68a1865f2b..e2388fd3682 100644 --- a/3rd-party/romio341/include/mpio.h.in +++ b/3rd-party/romio341/include/mpio.h.in @@ -42,7 +42,7 @@ typedef struct ADIOI_FileD *MPI_File; @DEFINE_HAVE_MPI_GREQUEST@ /* *INDENT-ON* */ #ifndef HAVE_MPI_GREQUEST -typedef struct ADIOI_RequestD *MPIO_Request; +typedef struct ADIOI_RequestD *MPIO_Request; #else #define MPIO_Request MPI_Request #define MPIO_USES_MPI_REQUEST @@ -64,7 +64,7 @@ typedef struct ADIOI_RequestD *MPIO_Request; this definition. */ #ifndef HAVE_MPI_DATAREP_FUNCTIONS #define HAVE_MPI_DATAREP_FUNCTIONS -typedef int (MPI_Datarep_conversion_function)(void *, MPI_Datatype, int, +typedef int (MPI_Datarep_conversion_function)(void *, MPI_Datatype, int, void *, MPI_Offset, void *); typedef int (MPI_Datarep_extent_function)(MPI_Datatype datatype, MPI_Aint *, void *); @@ -77,7 +77,7 @@ typedef int (MPI_Datarep_extent_function)(MPI_Datatype datatype, MPI_Aint *, /* *INDENT-ON* */ #endif #ifdef NEEDS_MPI_FINT -typedef int MPI_Fint; +typedef int MPI_Fint; #endif #ifndef HAVE_MPI_INFO @@ -95,7 +95,7 @@ typedef int MPI_Fint; #define MPI_MODE_RDONLY 2 /* ADIO_RDONLY */ #define MPI_MODE_RDWR 8 /* ADIO_RDWR */ #define MPI_MODE_WRONLY 4 /* ADIO_WRONLY */ -#define MPI_MODE_CREATE 1 /* ADIO_CREATE */ +#define MPI_MODE_CREATE 1 /* ADIO_CREATE */ #define MPI_MODE_EXCL 64 /* ADIO_EXCL */ #define MPI_MODE_DELETE_ON_CLOSE 16 /* ADIO_DELETE_ON_CLOSE */ #define MPI_MODE_UNIQUE_OPEN 32 /* ADIO_UNIQUE_OPEN */ @@ -139,7 +139,7 @@ typedef int MPI_Fint; /* MPI-IO function prototypes */ -/* The compiler must support ANSI C style prototypes, otherwise +/* The compiler must support ANSI C style prototypes, otherwise long long constants (e.g. 0) may get passed as ints. */ #ifndef HAVE_PRAGMA_HP_SEC_DEF @@ -177,8 +177,8 @@ int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int c MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) ROMIO_API_PUBLIC; /* nonblocking calls currently use MPIO_Request, because generalized - requests not yet implemented. For the same reason, MPIO_Test and - MPIO_Wait are used to test and wait on nonblocking I/O requests */ + requests not yet implemented. For the same reason, MPIO_Test and + MPIO_Wait are used to test and wait on nonblocking I/O requests */ int MPI_File_iread_at(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) ROMIO_API_PUBLIC; int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, const void *buf, int count, @@ -196,8 +196,8 @@ int MPI_File_write_all(MPI_File fh, const void *buf, int count, MPI_Datatype dat MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) ROMIO_API_PUBLIC; /* nonblocking calls currently use MPIO_Request, because generalized - requests not yet implemented. For the same reason, MPIO_Test and - MPIO_Wait are used to test and wait on nonblocking I/O requests */ + requests not yet implemented. For the same reason, MPIO_Test and + MPIO_Wait are used to test and wait on nonblocking I/O requests */ int MPI_File_iread(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) ROMIO_API_PUBLIC; @@ -386,9 +386,9 @@ int PMPI_File_set_info(MPI_File, MPI_Info) ROMIO_API_PUBLIC; int PMPI_File_get_info(MPI_File, MPI_Info *) ROMIO_API_PUBLIC; /* Section 9.3 */ -int PMPI_File_set_view(MPI_File, MPI_Offset, +int PMPI_File_set_view(MPI_File, MPI_Offset, MPI_Datatype, MPI_Datatype, const char *, MPI_Info) ROMIO_API_PUBLIC; -int PMPI_File_get_view(MPI_File, MPI_Offset *, +int PMPI_File_get_view(MPI_File, MPI_Offset *, MPI_Datatype *, MPI_Datatype *, char *) ROMIO_API_PUBLIC; /* Section 9.4.2 */ @@ -406,8 +406,8 @@ int PMPI_File_write_at_all(MPI_File, MPI_Offset, const void *, MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) ROMIO_API_PUBLIC; /* nonblocking calls currently use MPIO_Request, because generalized - requests not yet implemented. For the same reason, MPIO_Test and - MPIO_Wait are used to test and wait on nonblocking I/O requests */ + requests not yet implemented. For the same reason, MPIO_Test and + MPIO_Wait are used to test and wait on nonblocking I/O requests */ int PMPI_File_iread_at(MPI_File, MPI_Offset, void *, int, MPI_Datatype, MPIO_Request *) @@ -427,8 +427,8 @@ int PMPI_File_write_all(MPI_File, const void *, int, MPI_Datatype, MPI_Status *) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) ROMIO_API_PUBLIC; /* nonblocking calls currently use MPIO_Request, because generalized - requests not yet implemented. For the same reason, MPIO_Test and - MPIO_Wait are used to test and wait on nonblocking I/O requests */ + requests not yet implemented. For the same reason, MPIO_Test and + MPIO_Wait are used to test and wait on nonblocking I/O requests */ int PMPI_File_iread(MPI_File, void *, int, MPI_Datatype, MPIO_Request *) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) ROMIO_API_PUBLIC; @@ -444,7 +444,7 @@ int PMPI_File_read_shared(MPI_File, void *, int, MPI_Datatype, MPI_Status *) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) ROMIO_API_PUBLIC; int PMPI_File_write_shared(MPI_File, const void *, int, MPI_Datatype, MPI_Status *) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) ROMIO_API_PUBLIC; -int PMPI_File_iread_shared(MPI_File, void *, int, +int PMPI_File_iread_shared(MPI_File, void *, int, MPI_Datatype, MPIO_Request *) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) ROMIO_API_PUBLIC; int PMPI_File_iwrite_shared(MPI_File, const void *, int, @@ -517,11 +517,11 @@ int PMPI_File_iwrite_all(MPI_File fh, const void *buf, int count, MPI_Datatype d #ifndef HAVE_MPI_DARRAY_SUBARRAY /* Section 4.14.4 */ -int PMPI_Type_create_subarray(int, int *, int *, int *, int, +int PMPI_Type_create_subarray(int, int *, int *, int *, int, MPI_Datatype, MPI_Datatype *) ROMIO_API_PUBLIC; /* Section 4.14.5 */ -int PMPI_Type_create_darray(int, int, int, int *, int *, +int PMPI_Type_create_darray(int, int, int, int *, int *, int *, int *, int, MPI_Datatype, MPI_Datatype *) ROMIO_API_PUBLIC; #endif diff --git a/3rd-party/romio341/include/mpiof.h.in b/3rd-party/romio341/include/mpiof.h.in index 6b84d9d98f3..e34112aeb8c 100644 --- a/3rd-party/romio341/include/mpiof.h.in +++ b/3rd-party/romio341/include/mpiof.h.in @@ -3,7 +3,7 @@ ! See COPYRIGHT in top-level directory ! -! user include file for Fortran MPI-IO programs +! user include file for Fortran MPI-IO programs ! INTEGER MPI_MODE_RDONLY, MPI_MODE_RDWR, MPI_MODE_WRONLY INTEGER MPI_MODE_DELETE_ON_CLOSE, MPI_MODE_UNIQUE_OPEN diff --git a/3rd-party/romio341/mpl/confdb/aclocal_am.m4 b/3rd-party/romio341/mpl/confdb/aclocal_am.m4 index 4d3b0de2257..8e425df1902 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_am.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_am.m4 @@ -1,6 +1,6 @@ dnl AM_IGNORE is an extension that tells (a patched) automake not to dnl include the specified AC_SUBST variable in the Makefile.in that -dnl automake generates. We don't use AC_DEFUN, since aclocal will +dnl automake generates. We don't use AC_DEFUN, since aclocal will dnl then complain that AM_IGNORE is a duplicate (if you are using the dnl patched automake/aclocal). m4_ifdef([AM_IGNORE],[],[m4_define([AM_IGNORE],[])]) diff --git a/3rd-party/romio341/mpl/confdb/aclocal_attr_alias.m4 b/3rd-party/romio341/mpl/confdb/aclocal_attr_alias.m4 index 32f016546dc..128a08844a4 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_attr_alias.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_attr_alias.m4 @@ -17,7 +17,7 @@ AC_PATH_PROGS_FEATURE_CHECK(NM_G, nm, [ # Tru64's nm complains that /dev/null is an invalid object file # # AIX's sed does not accept \+, 1) instead of doing 's|a\+||', do 's|aa*||' - # or 2) instead of 's|A \+B|AB|g', do 's|A *B|AB|g' + # or 2) instead of 's|A \+B|AB|g', do 's|A *B|AB|g' # Check if nm accepts -g case `${ac_path_NM_G} -g /dev/null 2>&1 | sed '1q'` in @@ -108,7 +108,7 @@ mpif_cmblk_t MPIFCMB; /* Do the test in this file instead in the file - where __attribute__((alias)) is used. + where __attribute__((alias)) is used. This is needed for pgcc since pgcc seems to define aliased symbols if they are in the same file. */ @@ -171,7 +171,7 @@ if test "$pac_c_attr_alias_other" = "yes" ; then #if defined(HAVE_STDIO_H) || defined(STDC_HEADERS) #include #endif - + struct mpif_cmblk_t_ { int imember; }; typedef struct mpif_cmblk_t_ mpif_cmblk_t; @@ -239,7 +239,7 @@ if test "$pac_c_attr_alias_main" = "yes" ; then cmp_addr=${addr} fi done - + if test "$diff_addrs" != "yes" ; then dnl echo "Same addresses. Multiple aliases support" AC_MSG_RESULT([${NM_G} says yes]) @@ -348,7 +348,7 @@ dnl the following weird behavour dnl pgf77 -o ftest ftest.f => when $?=0 with zero stderr output dnl pgf77 -o ftest ftest.f dummy.o => when $?=0 with non-zero stderr output. dnl stderr has "ftest.f:". -dnl +dnl # First create a fortran CONFTEST which will be used repeatedly. AC_LANG_PUSH([Fortran]) dnl AC_LANG_PUSH([Fortran 77]) AC_LANG_CONFTEST([ @@ -385,7 +385,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[ pac_f2c_alignedn_diffbase=no ]) # Be sure NOT to remove the conftest.f which is still needed for later use. - # rm -f conftest.$ac_ext + # rm -f conftest.$ac_ext # Restore everything in autoconf that has been overwritten PAC_POP_FLAG([ac_link]) # restore previously pushed LIBS diff --git a/3rd-party/romio341/mpl/confdb/aclocal_bugfix.m4 b/3rd-party/romio341/mpl/confdb/aclocal_bugfix.m4 index ef320dec578..35bb45b529f 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_bugfix.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_bugfix.m4 @@ -17,26 +17,26 @@ dnl Synopsis: dnl PAC_PROG_CHECK_INSTALL_WORKS dnl dnl Output Effect: -dnl Sets the variable 'INSTALL' to the value of 'ac_sh_install' if +dnl Sets the variable 'INSTALL' to the value of 'ac_sh_install' if dnl a file cannot be installed into a local directory with the 'INSTALL' dnl program dnl dnl Notes: -dnl The 'AC_PROG_INSTALL' scripts tries to avoid broken versions of -dnl install by avoiding directories such as '/usr/sbin' where some -dnl systems are known to have bad versions of 'install'. Unfortunately, +dnl The 'AC_PROG_INSTALL' scripts tries to avoid broken versions of +dnl install by avoiding directories such as '/usr/sbin' where some +dnl systems are known to have bad versions of 'install'. Unfortunately, dnl this is exactly the sort of test-on-name instead of test-on-capability dnl that 'autoconf' is meant to eliminate. The test in this script -dnl is very simple but has been adequate for working around problems -dnl on Solaris, where the '/usr/sbin/install' program (known by -dnl autoconf to be bad because it is in /usr/sbin) is also reached by a +dnl is very simple but has been adequate for working around problems +dnl on Solaris, where the '/usr/sbin/install' program (known by +dnl autoconf to be bad because it is in /usr/sbin) is also reached by a dnl soft link through /bin, which autoconf believes is good. dnl -dnl No variables are cached to ensure that we do not make a mistake in +dnl No variables are cached to ensure that we do not make a mistake in dnl our choice of install program. dnl dnl The Solaris configure requires the directory name to immediately -dnl follow the '-c' argument, rather than the more common +dnl follow the '-c' argument, rather than the more common dnl.vb dnl args sourcefiles destination-dir dnl.ve diff --git a/3rd-party/romio341/mpl/confdb/aclocal_cache.m4 b/3rd-party/romio341/mpl/confdb/aclocal_cache.m4 index 9d02c416387..d0a79822470 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_cache.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_cache.m4 @@ -1,20 +1,20 @@ dnl dnl/*D -dnl AC_CACHE_LOAD - Replacement for autoconf cache load +dnl AC_CACHE_LOAD - Replacement for autoconf cache load dnl dnl Notes: -dnl Caching in autoconf is broken (at least through version 2.13). +dnl Caching in autoconf is broken (at least through version 2.13). dnl The problem is that the cache is read dnl without any check for whether it makes any sense to read it. -dnl A common problem is a build on a shared file system; connecting to +dnl A common problem is a build on a shared file system; connecting to dnl a different computer and then building within the same directory will dnl lead to at best error messages from configure and at worse a build that dnl is wrong but fails only at run time (e.g., wrong datatype sizes used). dnl Later versions of autoconf do include some checks for changes in the dnl environment that impact the choices, but still misses problems with dnl multiple different systems. -dnl -dnl This fixes that by requiring the user to explicitly enable caching +dnl +dnl This fixes that by requiring the user to explicitly enable caching dnl before the cache file will be loaded. dnl dnl To use this version of 'AC_CACHE_LOAD', you need to include @@ -26,7 +26,7 @@ dnl command causes configure to keep track of the system being configured dnl in a config.system file; if the current system matches the value stored dnl in that file (or there is neither a config.cache nor config.system file), dnl configure will enable caching. In order to ensure that the configure -dnl tests make sense, the values of CC, F77, F90, and CXX are also included +dnl tests make sense, the values of CC, F77, F90, and CXX are also included dnl in the config.system file. In addition, the value of PATH is included dnl to ensure that changes in the PATH that might select a different version dnl of a program with the same name (such as a native make versus gnumake) @@ -34,7 +34,7 @@ dnl are detected. dnl dnl Bugs: dnl This does not work with the Cygnus configure because the enable arguments -dnl are processed *after* AC_CACHE_LOAD (!). To address this, we avoid +dnl are processed *after* AC_CACHE_LOAD (!). To address this, we avoid dnl changing the value of enable_cache, and use real_enable_cache, duplicating dnl the "notgiven" value. dnl @@ -46,14 +46,14 @@ dnl See Also: dnl PAC_ARG_CACHING dnl D*/ define([AC_CACHE_LOAD], -[if test "$CONFIGURE_DEBUG_CACHE" = yes ; then +[if test "$CONFIGURE_DEBUG_CACHE" = yes ; then oldopts="$-" clearMinusX=no - set -x - if test "$oldopts" != "$-" ; then + set -x + if test "$oldopts" != "$-" ; then clearMinusX=yes fi -fi +fi if test "X$cache_system" = "X" ; then # A default file name, just in case cache_system="config.system" @@ -66,13 +66,13 @@ if test "X$cache_system" = "X" ; then test "x$cache_system" = "x$cache_file" && cache_system="config.system" # else # We must *not* set enable_cache to no because we need to know if -# enable_cache was not set. +# enable_cache was not set. # enable_cache=no fi fi dnl dnl The "action-if-not-given" part of AC_ARG_ENABLE is not executed until -dnl after the AC_CACHE_LOAD is executed (!). Thus, the value of +dnl after the AC_CACHE_LOAD is executed (!). Thus, the value of dnl enable_cache if neither --enable-cache or --disable-cache is selected dnl is null. Just in case autoconf ever fixes this, we test both cases. dnl @@ -81,12 +81,12 @@ dnl change which versions of programs are found (such as vendor make dnl or GNU make). dnl # -# Get a test value and flag whether we should remove/replace the +# Get a test value and flag whether we should remove/replace the # cache_system file (do so unless cache_system_ok is yes) # FC and F77 should be synonyms. Save both in case # We include the xxxFLAGS in case the user is using the flags to change -# the language (either input or output) of the compiler. E.g., -# using -xarch=v9 on Solaris to select 64 bit output or using -D_BSD_SOURCE +# the language (either input or output) of the compiler. E.g., +# using -xarch=v9 on Solaris to select 64 bit output or using -D_BSD_SOURCE # with gcc to get different header files on input. cleanargs=`echo "$CC $F77 $FC $CXX $F90 $CFLAGS $FFLAGS $CXXFLAGS $F90FLAGS $PATH" | tr '"' ' '` if uname -srm >/dev/null 2>&1 ; then @@ -112,7 +112,7 @@ if test "X$real_enable_cache" = "Xnotgiven" ; then elif test ! -f "$cache_system" -a -n "$cache_system_text" ; then # remove the cache file because it may not correspond to our # system - if test "$cache_file" != "/dev/null" ; then + if test "$cache_file" != "/dev/null" ; then rm -f $cache_file fi real_enable_cache="yes" @@ -157,7 +157,7 @@ if test "$clearMinusX" = yes ; then fi ]) dnl -dnl/*D +dnl/*D dnl PAC_ARG_CACHING - Enable caching of results from a configure execution dnl dnl Synopsis: @@ -165,7 +165,7 @@ dnl PAC_ARG_CACHING dnl dnl Output Effects: dnl Adds '--enable-cache' and '--disable-cache' to the command line arguments -dnl accepted by 'configure'. +dnl accepted by 'configure'. dnl dnl See Also: dnl AC_CACHE_LOAD @@ -194,7 +194,7 @@ AC_DEFUN([PAC_CACHE_CLEAN],[ else echo "not updating unwritable cache $cache_file" fi - fi + fi rm -f confcache if test "$DEBUG_AUTOCONF_CACHE" = "yes" ; then echo "Results of cleaned cache file:" @@ -207,20 +207,20 @@ AC_DEFUN([PAC_CACHE_CLEAN],[ dnl/*D dnl PAC_SUBDIR_CACHE - Create a cache file before ac_output for subdirectory dnl configures. -dnl +dnl dnl Synopsis: dnl PAC_SUBDIR_CACHE(when) dnl dnl Input Parameter: dnl . when - Indicates when the cache should be created (optional) dnl If 'always', create a new cache file. This option -dnl should be used if any of the cache parameters (such as +dnl should be used if any of the cache parameters (such as dnl CFLAGS or LDFLAGS) may have changed. dnl dnl Output Effects: -dnl +dnl dnl Create a cache file before ac_output so that subdir configures don't -dnl make mistakes. +dnl make mistakes. dnl We can't use OUTPUT_COMMANDS to remove the cache file, because those dnl commands are executed *before* the subdir configures. dnl @@ -232,9 +232,9 @@ if test "x$1" = "xalways" -o \( "$cache_file" = "/dev/null" -a "X$real_enable_ca # lost cache_file=`pwd`/$$conf.cache touch $cache_file - dnl + dnl dnl For Autoconf 2.52+, we should ensure that the environment is set - dnl for the cache. Make sure that we get the values and set the + dnl for the cache. Make sure that we get the values and set the dnl xxx_set variables properly ac_cv_env_CC_set=set ac_cv_env_CC_value=$CC @@ -320,7 +320,7 @@ fi ]) dnl dnl The following three macros support the sharing of configure results -dnl by configure scripts, including ones that are not run with +dnl by configure scripts, including ones that are not run with dnl AC_CONFIG_SUBDIRS (the cachefiles managed by --enable-cache can dnl only be used with AC_CONFIG_SUBDIRS; creating a autoconf-style dnl cachefile before the the end of the autoconf process will often @@ -335,7 +335,7 @@ AC_ARG_ENABLE(base-cache, if test "$enable_base_cache" = "default" ; then if test "$CONF_USE_CACHEFILE" = yes ; then enable_base_cache=yes - else + else enable_base_cache=no fi fi diff --git a/3rd-party/romio341/mpl/confdb/aclocal_cc.m4 b/3rd-party/romio341/mpl/confdb/aclocal_cc.m4 index 207f7ca4040..26ac2253fde 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_cc.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_cc.m4 @@ -14,13 +14,13 @@ dnl dnl If no actions are specified, a working value is added to 'COPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl dnl D*/ @@ -112,13 +112,13 @@ dnl PAC_C_OPTIMIZATION([action if found]) dnl dnl Output Effect: dnl Adds options to 'COPTIONS' if no other action is specified -dnl +dnl dnl Notes: dnl This is a temporary standin for compiler optimization. dnl It should try to match known systems to known compilers (checking, of dnl course), and then falling back to some common defaults. dnl Note that many compilers will complain about -g and aggressive -dnl optimization. +dnl optimization. dnl D*/ AC_DEFUN([PAC_C_OPTIMIZATION],[ for copt in "-O4 -Ofast" "-Ofast" "-fast" "-O3" "-xO3" "-O" ; do @@ -178,18 +178,18 @@ return 0; } ],pac_cv_prog_c_unaligned_doubles="yes",pac_cv_prog_c_unaligned_doubles="no", pac_cv_prog_c_unaligned_doubles="unknown")]) -ifelse($1,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "yes" ; then +ifelse($1,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "yes" ; then $1 fi) -ifelse($2,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "no" ; then +ifelse($2,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "no" ; then $2 fi) -ifelse($3,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "unknown" ; then +ifelse($3,,,if test "X$pac_cv_prog_c_unaligned_doubles" = "unknown" ; then $3 fi) ]) -dnl/*D +dnl/*D dnl PAC_PROG_C_WEAK_SYMBOLS - Test whether C supports weak alias symbols. dnl dnl Synopsis @@ -211,7 +211,7 @@ dnl sets the shell variable pac_cv_attr_weak to yes. dnl Also checks for __attribute__((weak_import)) which is supported by dnl Apple in Mac OSX (at least in Darwin). Note that this provides only dnl weak symbols, not weak aliases -dnl +dnl dnl D*/ AC_DEFUN([PAC_PROG_C_WEAK_SYMBOLS],[ pragma_extra_message="" @@ -230,7 +230,7 @@ int Foo(int a) { return a; } # only within a single object file! This tests that case. # Note that there is an extern int PFoo declaration before the # pragma. Some compilers require this in order to make the weak symbol -# externally visible. +# externally visible. if test "$has_pragma_weak" = yes ; then PAC_COMPLINK_IFELSE([ AC_LANG_SOURCE([ @@ -272,7 +272,7 @@ return Foo(0);} ]) fi dnl -if test -z "$pac_cv_prog_c_weak_symbols" ; then +if test -z "$pac_cv_prog_c_weak_symbols" ; then AC_TRY_LINK([ extern int PFoo(int); #pragma _HP_SECONDARY_DEF Foo PFoo @@ -361,14 +361,14 @@ correctly set error code when a fatal error occurs]) fi ]) -dnl/*D +dnl/*D dnl PAC_PROG_C_MULTIPLE_WEAK_SYMBOLS - Test whether C and the dnl linker allow multiple weak symbols. dnl dnl Synopsis dnl PAC_PROG_C_MULTIPLE_WEAK_SYMBOLS(action-if-true,action-if-false) dnl -dnl +dnl dnl D*/ AC_DEFUN([PAC_PROG_C_MULTIPLE_WEAK_SYMBOLS],[ AC_CACHE_CHECK([for multiple weak symbol support], @@ -408,10 +408,10 @@ dnl pac_cc_strict_flags contains the strict flags. dnl dnl -std=c89 is used to select the C89 version of the ANSI/ISO C standard. dnl As of this writing, many C compilers still accepted only this version, -dnl not the later C99 version. When all compilers accept C99, this +dnl not the later C99 version. When all compilers accept C99, this dnl should be changed to the appropriate standard level. Note that we've -dnl had trouble with gcc 2.95.3 accepting -std=c89 but then trying to -dnl compile program with a invalid set of options +dnl had trouble with gcc 2.95.3 accepting -std=c89 but then trying to +dnl compile program with a invalid set of options dnl (-D __STRICT_ANSI__-trigraphs) AC_DEFUN([PAC_CC_STRICT],[ export enable_strict_done @@ -428,23 +428,23 @@ if test "$enable_strict_done" != "yes" ; then # warning at 256k. # # These were added to reduce warnings: - # -Wno-missing-field-initializers -- We want to allow a struct to be - # initialized to zero using "struct x y = {0};" and not require + # -Wno-missing-field-initializers -- We want to allow a struct to be + # initialized to zero using "struct x y = {0};" and not require # each field to be initialized individually. # -Wno-unused-parameter -- For portability, some parameters go unused - # when we have different implementations of functions for + # when we have different implementations of functions for # different platforms - # -Wno-unused-label -- We add fn_exit: and fn_fail: on all functions, - # but fn_fail may not be used if the function doesn't return an + # -Wno-unused-label -- We add fn_exit: and fn_fail: on all functions, + # but fn_fail may not be used if the function doesn't return an # error. # -Wno-sign-compare -- read() and write() return bytes read/written # as a signed value, but we often compare this to size_t (or # msg_sz_t) variables. # These were removed to reduce warnings: - # -Wcast-qual -- Sometimes we need to cast "volatile char*" to + # -Wcast-qual -- Sometimes we need to cast "volatile char*" to # "char*", e.g., for memcpy. # -Wpadded -- We catch struct padding with asserts when we need to - # -Wredundant-decls -- Having redundant declarations is benign and the + # -Wredundant-decls -- Having redundant declarations is benign and the # code already has some. # -Waggregate-return -- This seems to be a performance-related warning # aggregate return values are legal in ANSI C, but they may be returned @@ -455,7 +455,7 @@ if test "$enable_strict_done" != "yes" ; then # -Wdeclaration-after-statement -- This is a C89 # requirement. When compiling with C99, this should be # disabled. - # -Wfloat-equal -- There are places in hwloc that set a float var to 0, then + # -Wfloat-equal -- There are places in hwloc that set a float var to 0, then # compare it to 0 later to see if it was updated. Also when using strtod() # one needs to compare the return value with 0 to see whether a conversion # was performed. @@ -476,11 +476,11 @@ if test "$enable_strict_done" != "yes" ; then # However, since Intel compiler currently does not include -Wtype-limits # in -Wextra, -Wtype-limits was added to handle warnings with the Intel # compiler. - # -Wno-type-limits -- There are places where we compare an unsigned to - # a constant that happens to be zero e.g., if x is unsigned and + # -Wno-type-limits -- There are places where we compare an unsigned to + # a constant that happens to be zero e.g., if x is unsigned and # MIN_VAL is zero, we'd like to do "MPIR_Assert(x >= MIN_VAL);". - # Note this option is not supported by gcc 4.2. This needs to be added - # after most other warning flags, so that we catch a gcc bug on 32-bit + # Note this option is not supported by gcc 4.2. This needs to be added + # after most other warning flags, so that we catch a gcc bug on 32-bit # that doesn't give a warning that this is unsupported, unless another # warning is triggered, and then if gives an error. # the embedded newlines in this string are safe because we evaluate each @@ -638,11 +638,11 @@ fi ]) dnl/*D -dnl PAC_ARG_STRICT - Add --enable-strict to configure. +dnl PAC_ARG_STRICT - Add --enable-strict to configure. dnl dnl Synopsis: dnl PAC_ARG_STRICT -dnl +dnl dnl Output effects: dnl Adds '--enable-strict' to the command line. dnl @@ -663,7 +663,7 @@ dnl four dnl eight dnl dnl In addition, a "Could not determine alignment" and a "error!" -dnl return is possible. +dnl return is possible. AC_DEFUN([PAC_C_MAX_INTEGER_ALIGN],[ AC_CACHE_CHECK([for max C struct integer alignment], pac_cv_c_max_integer_align,[ @@ -794,7 +794,7 @@ dnl eight dnl sixteen dnl dnl In addition, a "Could not determine alignment" and a "error!" -dnl return is possible. +dnl return is possible. AC_DEFUN([PAC_C_MAX_FP_ALIGN],[ AC_CACHE_CHECK([for max C struct floating point alignment], pac_cv_c_max_fp_align,[ @@ -908,7 +908,7 @@ dnl four dnl eight dnl dnl In addition, a "Could not determine alignment" and a "error!" -dnl return is possible. +dnl return is possible. AC_DEFUN([PAC_C_MAX_DOUBLE_FP_ALIGN],[ AC_CACHE_CHECK([for max C struct alignment of structs with doubles], pac_cv_c_max_double_fp_align,[ @@ -1206,7 +1206,7 @@ dnl Synopsis: dnl PAC_FUNC_NEEDS_DECL(headerfiles,funcname) dnl dnl Output Effect: -dnl Sets 'NEEDS__DECL' if 'funcname' is not declared by the +dnl Sets 'NEEDS__DECL' if 'funcname' is not declared by the dnl headerfiles. dnl dnl Approach: @@ -1243,8 +1243,8 @@ dnl #endif dnl If *not*, define __attribute__(a) as null dnl dnl We start by requiring Gcc. Some other compilers accept __attribute__ -dnl but generate warning messages, or have different interpretations -dnl (which seems to make __attribute__ just as bad as #pragma) +dnl but generate warning messages, or have different interpretations +dnl (which seems to make __attribute__ just as bad as #pragma) dnl For example, the Intel icc compiler accepts __attribute__ and dnl __attribute__((pure)) but generates warnings for __attribute__((format...)) dnl @@ -1271,7 +1271,7 @@ fi # These tests check not only that the compiler defines some symbol, such # as __FUNCTION__, but that the symbol correctly names the function. # -# Defines +# Defines # HAVE__FUNC__ (if __func__ defined) # HAVE_CAP__FUNC__ (if __FUNC__ defined) # HAVE__FUNCTION__ (if __FUNCTION__ defined) diff --git a/3rd-party/romio341/mpl/confdb/aclocal_coverage.m4 b/3rd-party/romio341/mpl/confdb/aclocal_coverage.m4 index 844beb5098f..55cb8eb6e4b 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_coverage.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_coverage.m4 @@ -44,7 +44,7 @@ if test "$enable_coverage" = "yes" ; then fi fi # Add similar options for g77 so that the Fortran tests will also - # + # if test "$enable_f77" = yes ; then if test "$ac_cv_f77_compiler_gnu" = "yes" ; then FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage" @@ -67,14 +67,14 @@ if test "$enable_coverage" = "yes" ; then AC_MSG_WARN([--enable-coverage only supported for GFORTRAN]) fi fi - # On some platforms (e.g., Mac Darwin), we must also *link* + # On some platforms (e.g., Mac Darwin), we must also *link* # with the -fprofile-args -ftest-coverage option. AC_MSG_CHECKING([whether compilation with coverage analysis enabled works]) AC_LINK_IFELSE([AC_LANG_SOURCE([int main(int argc, char **argv){return 1;}])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([Unable to link programs when coverage analysis enabled])]) - + # Test for the routines that we need to use to ensure that the # data files are (usually) written out # FIXME: Some versions of Linux provide usleep, but it rounds times diff --git a/3rd-party/romio341/mpl/confdb/aclocal_cxx.m4 b/3rd-party/romio341/mpl/confdb/aclocal_cxx.m4 index 6c902af2c53..c4f6e047b14 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_cxx.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_cxx.m4 @@ -59,7 +59,7 @@ AC_DEFUN([AX_CXX_NAMESPACE_STD], AC_CACHE_CHECK(whether the compiler implements the namespace std, ac_cv_cxx_namespace_std, [ac_cv_cxx_namespace_std=no -if test "$ac_cv_cxx_namespaces" = yes ; then +if test "$ac_cv_cxx_namespaces" = yes ; then AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_TRY_COMPILE([ @@ -87,13 +87,13 @@ dnl dnl If no actions are specified, a working value is added to 'CXXOPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl D*/ AC_DEFUN([PAC_CXX_CHECK_COMPILER_OPTION],[ diff --git a/3rd-party/romio341/mpl/confdb/aclocal_f77.m4 b/3rd-party/romio341/mpl/confdb/aclocal_f77.m4 index f4415107460..0b6bf912a91 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_f77.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_f77.m4 @@ -1,7 +1,7 @@ dnl dnl/*D dnl PAC_PROG_F77_NAME_MANGLE - Determine how the Fortran compiler mangles -dnl names +dnl names dnl dnl Synopsis: dnl PAC_PROG_F77_NAME_MANGLE([action]) @@ -19,20 +19,20 @@ dnl mixed -> mixed_ F77_NAME_MIXED_USCORE dnl mixed -> UPPER@STACK_SIZE F77_NAME_UPPER_STDCALL dnl.ve dnl If an action is specified, it is executed instead. -dnl +dnl dnl Notes: dnl We assume that if lower -> lower (any underscore), upper -> upper with the -dnl same underscore behavior. Previous versions did this by -dnl compiling a Fortran program and running strings -a over it. Depending on -dnl strings is a bad idea, so instead we try compiling and linking with a +dnl same underscore behavior. Previous versions did this by +dnl compiling a Fortran program and running strings -a over it. Depending on +dnl strings is a bad idea, so instead we try compiling and linking with a dnl C program, since that is why we are doing this anyway. A similar approach -dnl is used by FFTW, though without some of the cases we check (specifically, +dnl is used by FFTW, though without some of the cases we check (specifically, dnl mixed name mangling). STD_CALL not only specifies a particular name dnl mangling convention (adding the size of the calling stack into the function dnl name, but also the stack management convention (callee cleans the stack, dnl and arguments are pushed onto the stack from right to left) dnl -dnl One additional problem is that some Fortran implementations include +dnl One additional problem is that some Fortran implementations include dnl references to the runtime (like pgf90_compiled for the pgf90 compiler dnl used as the "Fortran 77" compiler). This is not yet solved. dnl @@ -92,7 +92,7 @@ if test "$pac_found" != "yes" ; then AC_LANG_PROGRAM([],[ call my_name(0)]) ],[ pac_found=yes - ]) + ]) AC_LANG_POP([Fortran 77]) LIBS="$saved_LIBS" rm -f cconftest.$OBJEXT @@ -151,7 +151,7 @@ name_scheme="`echo $pac_cv_prog_f77_name_mangle | sed 's% %_%g'`" # Turn lowercase into uppercase. name_scheme="`echo $name_scheme | sed -e 'y%abcdefghijklmnopqrstuvwxyz%ABCDEFGHIJKLMNOPQRSTUVWXYZ%'`" F77_NAME_MANGLE="F77_NAME_${name_scheme}" -AC_DEFINE_UNQUOTED([$F77_NAME_MANGLE]) +AC_DEFINE_UNQUOTED([$F77_NAME_MANGLE]) AC_SUBST(F77_NAME_MANGLE) if test "X$pac_cv_prog_f77_name_mangle" = "X" ; then AC_MSG_WARN([Unknown Fortran naming scheme]) @@ -196,11 +196,11 @@ dnl Sets SIZEOF_F77_uctype to the size if bytes of type. dnl If type is unknown, the size is set to 0. dnl If cross-compiling, the value cross-size is used (it may be a variable) dnl For example 'PAC_PROG_F77_CHECK_SIZEOF(real)' defines -dnl 'SIZEOF_F77_REAL' to 4 on most systems. The variable +dnl 'SIZEOF_F77_REAL' to 4 on most systems. The variable dnl 'pac_cv_sizeof_f77_' (e.g., 'pac_cv_sizeof_f77_real') is also set to -dnl the size of the type. +dnl the size of the type. dnl If the corresponding variable is already set, that value is used. -dnl If the name has an '*' in it (e.g., 'integer*4'), the defined name +dnl If the name has an '*' in it (e.g., 'integer*4'), the defined name dnl replaces that with an underscore (e.g., 'SIZEOF_F77_INTEGER_4'). dnl dnl Notes: @@ -251,7 +251,7 @@ static int isize_val=0; void cisize_(char *,char*); void isize_(void); void cisize_(char *i1p, char *i2p) -{ +{ isize_val = (int)(i2p - i1p); } ],[ @@ -386,7 +386,7 @@ dnl Notes: dnl Check whether '!' may be used to begin comments in Fortran. dnl dnl This macro requires a version of autoconf `after` 2.13; the 'acgeneral.m4' -dnl file contains an error in the handling of Fortran programs in +dnl file contains an error in the handling of Fortran programs in dnl 'AC_TRY_COMPILE' (fixed in our local version). dnl dnl D*/ @@ -422,13 +422,13 @@ dnl dnl If no actions are specified, a working value is added to 'FOPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl D*/ AC_DEFUN([PAC_F77_CHECK_COMPILER_OPTION],[ @@ -507,10 +507,10 @@ dnl PAC_PROG_F77_LIBRARY_DIR_FLAG - Determine the flag used to indicate dnl the directories to find libraries in dnl dnl Notes: -dnl Many compilers accept '-Ldir' just like most C compilers. -dnl Unfortunately, some (such as some HPUX Fortran compilers) do not, +dnl Many compilers accept '-Ldir' just like most C compilers. +dnl Unfortunately, some (such as some HPUX Fortran compilers) do not, dnl and require instead either '-Wl,-L,dir' or something else. This -dnl command attempts to determine what is accepted. The flag is +dnl command attempts to determine what is accepted. The flag is dnl placed into 'F77_LIBDIR_LEADER'. dnl dnl D*/ @@ -562,19 +562,19 @@ if test "X$pac_cv_prog_f77_library_dir_flag" != "Xnone" ; then fi ]) dnl -dnl/*D +dnl/*D dnl PAC_PROG_F77_HAS_INCDIR - Check whether Fortran accepts -Idir flag dnl dnl Syntax: dnl PAC_PROG_F77_HAS_INCDIR(directory,action-if-true,action-if-false) dnl dnl Output Effect: -dnl Sets 'F77_INCDIR' to the flag used to choose the directory. +dnl Sets 'F77_INCDIR' to the flag used to choose the directory. dnl dnl Notes: dnl This refers to the handling of the common Fortran include extension, dnl not to the use of '#include' with the C preprocessor. -dnl If directory does not exist, it will be created. In that case, the +dnl If directory does not exist, it will be created. In that case, the dnl directory should be a direct descendant of the current directory. dnl dnl D*/ @@ -616,7 +616,7 @@ fi dnl dnl/*D dnl PAC_PROG_F77_ALLOWS_UNUSED_EXTERNALS - Check whether the Fortran compiler -dnl allows unused and undefined functions to be listed in an external +dnl allows unused and undefined functions to be listed in an external dnl statement dnl dnl Syntax: @@ -647,12 +647,12 @@ else ifelse([$2],[],[:],[$2]) fi ]) -dnl PAC_PROG_F77_RUN_PROC_FROM_C( c main program, fortran routine, -dnl [action-if-works], [action-if-fails], +dnl PAC_PROG_F77_RUN_PROC_FROM_C( c main program, fortran routine, +dnl [action-if-works], [action-if-fails], dnl [cross-action] ) dnl Fortran routine MUST be named ftest unless you include code dnl to select the appropriate Fortran name. -dnl +dnl AC_DEFUN([PAC_PROG_F77_RUN_PROC_FROM_C],[ AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS]) @@ -694,18 +694,18 @@ AC_LANG_POP([Fortran 77]) ]) dnl PAC_PROG_F77_IN_C_LIBS dnl -dnl Find the essential libraries that are needed to use the C linker to -dnl create a program that includes a trival Fortran code. +dnl Find the essential libraries that are needed to use the C linker to +dnl create a program that includes a trival Fortran code. dnl dnl For example, all pgf90 compiled objects include a reference to the dnl symbol pgf90_compiled, found in libpgf90 . dnl -dnl There is an additional problem. To *run* programs, we may need +dnl There is an additional problem. To *run* programs, we may need dnl additional arguments; e.g., if shared libraries are used. Even dnl with autoconf 2.52, the autoconf macro to find the library arguments dnl doesn't handle this, either by detecting the use of -rpath or dnl by trying to *run* a trivial program. It only checks for *linking*. -dnl +dnl dnl AC_DEFUN([PAC_PROG_F77_IN_C_LIBS],[ AC_REQUIRE([AC_HEADER_STDC]) @@ -776,7 +776,7 @@ fi ]) dnl dnl Test to see if we should use C or Fortran to link programs whose -dnl main program is in Fortran. We may find that neither work because +dnl main program is in Fortran. We may find that neither work because dnl we need special libraries in each case. dnl AC_DEFUN([PAC_PROG_F77_LINKER_WITH_C],[ @@ -893,7 +893,7 @@ AC_LINK_IFELSE([],[ pac_libs="" pac_other="" for name in $FLIBS ; do - case $name in + case $name in -l*) pac_libs="$pac_libs $name" ;; -L*) pac_ldirs="$pac_ldirs $name" ;; *) pac_other="$pac_other $name" ;; @@ -915,7 +915,7 @@ AC_LANG_PUSH([C]) ]) dnl dnl Test for extra libraries needed when linking C routines that use -dnl stdio with Fortran. This test was created for OSX, which +dnl stdio with Fortran. This test was created for OSX, which dnl sometimes requires -lSystemStubs. If another library is needed, dnl add it to F77_OTHER_LIBS dnl @@ -979,7 +979,7 @@ dnl Endof ac_cache_check if test "$pac_cv_prog_f77_and_c_stdio_libs" != "none" \ -a "$pac_cv_prog_f77_and_c_stdio_libs" != "unknown" ; then F77_OTHER_LIBS="$F77_OTHER_LIBS $pac_cv_prog_f77_and_c_stdio_libs" -fi +fi ]) dnl dnl Check that the FLIBS determined by AC_F77_LIBRARY_LDFLAGS is valid. @@ -1193,7 +1193,7 @@ AC_LANG_POP([Fortran 77]) AC_MSG_RESULT([$pac_cv_f77_accepts_F]) ]) dnl -dnl /*D +dnl /*D dnl PAC_PROG_F77_CRAY_POINTER - Check if Fortran 77 supports Cray-style pointer. dnl If so, set pac_cv_prog_f77_has_pointer to yes dnl and find out if any extra compiler flag is @@ -1313,16 +1313,16 @@ dnl PAC_F77_LOGICALS_IN_C(MPI_FINT) dnl dnl where MPI_FINT is the C type for Fortran integer. dnl -dnl Use a Fortran main program. This simplifies some steps, -dnl since getting all of the Fortran libraries (including shared -dnl libraries that are not in the default library search path) can -dnl be tricky. Specifically, The PROG_F77_RUN_PROC_FROM_C failed with +dnl Use a Fortran main program. This simplifies some steps, +dnl since getting all of the Fortran libraries (including shared +dnl libraries that are not in the default library search path) can +dnl be tricky. Specifically, The PROG_F77_RUN_PROC_FROM_C failed with dnl some installations of the Portland group compiler. dnl dnl We'd also like to check other values for .TRUE. and .FALSE. to see dnl if the compiler allows (or uses) more than one value (some DEC compilers, -dnl for example, used the high (sign) bit to indicate true and false; the -dnl rest of the bits were ignored. For now, we'll assume that there are +dnl for example, used the high (sign) bit to indicate true and false; the +dnl rest of the bits were ignored. For now, we'll assume that there are dnl unique true and false values. dnl AC_DEFUN([PAC_F77_LOGICALS_IN_C],[ @@ -1404,14 +1404,14 @@ if test -n "$true_val" -a -n "$false_val" ; then fi ]) dnl/*D -dnl PAC_PROG_F77_MISMATCHED_ARGS([option],[AllOnly]) - Determine whether the -dnl Fortran compiler allows routines to be called with different -dnl argument types. If not, attempts to determine a command-line argument -dnl that permits such use +dnl PAC_PROG_F77_MISMATCHED_ARGS([option],[AllOnly]) - Determine whether the +dnl Fortran compiler allows routines to be called with different +dnl argument types. If not, attempts to determine a command-line argument +dnl that permits such use dnl (The Fortran standard prohibits this usage) dnl dnl option is set to the compiler option to use. -dnl if AllOnly is yes (literal, not variable with value), then only consider +dnl if AllOnly is yes (literal, not variable with value), then only consider dnl options that turn off checking dnl for all routines dnl @@ -1458,7 +1458,7 @@ if test "X$pac_cv_prog_f77_mismatched_args" = X ; then FFLAGS="$save_FFLAGS" if test "$testok" = yes ; then break ; fi done - if test "$testok" = yes ; then + if test "$testok" = yes ; then pac_cv_prog_f77_mismatched_args_parm="$flags" pac_cv_prog_f77_mismatched_args="yes, with $pac_cv_prog_f77_mismatched_args_parm" fi @@ -1467,7 +1467,7 @@ if test "X$pac_cv_prog_f77_mismatched_args" = X ; then fi AC_MSG_RESULT($pac_cv_prog_f77_mismatched_args) if test "$pac_cv_prog_f77_mismatched_args" = no ; then - AC_MSG_ERROR([The Fortran compiler $F77 will not compile files that call + AC_MSG_ERROR([The Fortran compiler $F77 will not compile files that call the same routine with arguments of different types.]) fi diff --git a/3rd-party/romio341/mpl/confdb/aclocal_f77old.m4 b/3rd-party/romio341/mpl/confdb/aclocal_f77old.m4 index 5d6e2d9e70a..71d1ae4023e 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_f77old.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_f77old.m4 @@ -15,7 +15,7 @@ dnl.ve dnl If 'F77_GETARG' has a value, then that value and the values for these dnl other symbols will be used instead. If no approach is found, all of these dnl variables will have empty values. -dnl If no other approach works and a file 'f77argdef' is in the directory, +dnl If no other approach works and a file 'f77argdef' is in the directory, dnl that file will be sourced for the values of the above four variables. dnl dnl In most cases, you should add F77_GETARG_FFLAGS to the FFLAGS variable @@ -24,13 +24,13 @@ dnl performed on the compiler version that will be used. dnl dnl 'AC_SUBST' is called for all six variables. dnl -dnl One complication is that on systems with multiple Fortran compilers, +dnl One complication is that on systems with multiple Fortran compilers, dnl some libraries used by one Fortran compiler may have been (mis)placed dnl in a common location. We have had trouble with libg2c in particular. dnl To work around this, we test whether iargc etc. work first. This dnl will catch most systems and will speed up the tests. dnl -dnl Next, the libraries are only added if they are needed to complete a +dnl Next, the libraries are only added if they are needed to complete a dnl link; they aren''t added just because they exist. dnl dnl f77argdef @@ -55,11 +55,11 @@ AC_CACHE_VAL(pac_cv_prog_f77_cmdarg, f77_getargdecl="${F77_GETARGDECL:-external getarg}" f77_getarg="${F77_GETARG:-call GETARG(i,s)}" f77_iargc="${F77_IARGC:-IARGC()}" - # + # # Grumble. The Absoft Fortran compiler computes i - i as 0 and then # 1.0 / 0 at compile time, even though the code may never be executed. # What we need is a way to generate an error, so the second usage of i - # was replaced with f77_iargc. + # was replaced with f77_iargc. cat > conftest.f <, but this caused other + # (we experimented with using a , but this caused other # problems because we need in the IFS) trial_LIBS="0 -lU77 -lPEPCF90" if test "$NOG2C" != "1" ; then @@ -149,7 +149,7 @@ $libs" # The -N109 was used for getarg before we realized that GETARG # was necessary with the (non standard conforming) Absoft compiler # (Fortran is monocase; Absoft uses mixedcase by default) - # The -f is used by Absoft and is the compiler switch that folds + # The -f is used by Absoft and is the compiler switch that folds # symbolic names to lower case. Without this option, the compiler # considers upper- and lower-case letters to be unique. # The -YEXT_NAMES=LCS will cause external names to be output as lower @@ -157,14 +157,14 @@ $libs" # The first line is ", the space is important # To make the Absoft f77 and f90 work together, we need to prefer the # upper case versions of the arguments. They also require libU77. - # -YCFRL=1 causes Absoft f90 to work with g77 and similar (f2c-based) + # -YCFRL=1 causes Absoft f90 to work with g77 and similar (f2c-based) # Fortran compilers # # Problem: The Intel efc compiler hangs when presented with -N109 . # The only real fix for this is to detect this compiler and exclude # the test. We may want to reorganize these tests so that if we # can compile code without special options, we never look for them. - # + # using_intel_efc="no" pac_test_msg=`$F77 -V 2>&1 | grep 'Intel(R) Fortran Itanium'` if test "$pac_test_msg" != "" ; then @@ -194,10 +194,10 @@ $libs" PAC_F77_CHECK_COMPILER_OPTION($flag,opt_ok=yes,opt_ok=no) fi if test "$opt_ok" = "yes" ; then - if test "$flag" = " " -o "$flag" = "000" ; then - fflag="" - else - fflag="$flag" + if test "$flag" = " " -o "$flag" = "000" ; then + fflag="" + else + fflag="$flag" fi # discard options that don't allow mixed-case name matching cat > conftest.f </dev/null 2>&1 ; then found_answer="yes" fi - else + else found_answer="yes" fi fi @@ -358,9 +358,9 @@ EOF fi done done - IFS="$save_IFS" + IFS="$save_IFS" rm -f conftest.* - trial=`expr $trial + 1` + trial=`expr $trial + 1` done fi pac_cv_F77_GETARGDECL="$F77_GETARGDECL" @@ -368,7 +368,7 @@ pac_cv_F77_IARGC="$F77_IARGC" pac_cv_F77_GETARG="$F77_GETARG" pac_cv_FXX_MODULE="$FXX_MODULE" ]) -if test "$found_cached" = "yes" ; then +if test "$found_cached" = "yes" ; then AC_MSG_RESULT([$pac_cv_prog_f77_cmdarg]) elif test -z "$pac_cv_F77_IARGC" ; then AC_MSG_WARN([Could not find a way to access the command line from Fortran 77]) diff --git a/3rd-party/romio341/mpl/confdb/aclocal_fc.m4 b/3rd-party/romio341/mpl/confdb/aclocal_fc.m4 index 93465edaa6b..ea30ab1ede9 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_fc.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_fc.m4 @@ -13,7 +13,7 @@ AC_COMPILE_IFELSE([ ],[ AC_MSG_RESULT([f90]) ],[ - ac_fc_srcext="f" + ac_fc_srcext="f" AC_COMPILE_IFELSE([ AC_LANG_PROGRAM() ],[ @@ -56,12 +56,12 @@ AC_LINK_IFELSE([ rm -f work.pc work.pcl AC_LANG_POP(Fortran) dnl cross_compiling no longer maintained by autoconf as part of the -dnl AC_LANG changes. If we set it here, a later AC_LANG may not +dnl AC_LANG changes. If we set it here, a later AC_LANG may not dnl restore it (in the case where one compiler claims to be a cross compiler dnl and another does not) dnl cross_compiling=$pac_cv_prog_f90_cross ]) -dnl/*D +dnl/*D dnl PAC_PROG_FC_INT_KIND - Determine kind parameter for an integer with dnl the specified number of bytes. dnl @@ -79,7 +79,7 @@ else AC_LANG_PUSH(Fortran) AC_MSG_CHECKING([for Fortran 90 integer kind for $2-byte integers]) # Convert bytes to digits - case $2 in + case $2 in 1) sellen=2 ;; 2) sellen=4 ;; 4) sellen=8 ;; @@ -89,7 +89,7 @@ else esac # Check for cached value eval testval=\$"pac_cv_prog_fc_int_kind_$sellen" - if test -n "$testval" ; then + if test -n "$testval" ; then AC_MSG_RESULT([$testval (cached)]) $1=$testval else @@ -125,7 +125,7 @@ dnl ------------------------------------------------------------------------ dnl Special characteristics that have no autoconf counterpart but that dnl we need as part of the Fortran 90 support. To distinquish these, they dnl have a [PAC] prefix. -dnl +dnl dnl At least one version of the Cray compiler needs the option -em to dnl generate a separate module file, rather than including the module dnl information in the object (.o) file. @@ -181,7 +181,7 @@ AC_COMPILE_IFELSE([ pac_MOD="" fi fi - if test -z "$pac_MOD" ; then + if test -z "$pac_MOD" ; then pac_cv_fc_module_ext="unknown" else pac_cv_fc_module_ext=$pac_MOD @@ -259,7 +259,7 @@ AC_COMPILE_IFELSE([],[ mv $pac_module conftestdir # Remove any temporary files, and hide the work.pc file # (if the compiler generates them) - if test -f work.pc ; then + if test -f work.pc ; then mv -f work.pc conftest.pc fi rm -f work.pcl @@ -298,7 +298,7 @@ if test "X$pac_cv_fc_module_incflag" = "X" ; then AC_MSG_RESULT([-cl,filename where filename contains a list of files and directories]) FC_WORK_FILES_ARG="-cl,mpimod.pcl" FCMODINCSPEC="-cl,/mod.pcl" - else + else # The version of the Intel compiler that I have refuses to let # you put the "work catalog" list anywhere but the current directory. pac_cv_fc_module_incflag="Unavailable!" @@ -306,12 +306,12 @@ if test "X$pac_cv_fc_module_incflag" = "X" ; then else # Early versions of the Intel ifc compiler required a *file* # containing the names of files that contained the names of the - # + # # -cl,filename.pcl # filename.pcl contains # fullpathname.pc - # The "fullpathname.pc" is generated, I believe, when a module is - # compiled. + # The "fullpathname.pc" is generated, I believe, when a module is + # compiled. # Intel compilers use a wierd system: -cl,filename.pcl . If no file is # specified, work.pcl and work.pc are created. However, if you specify # a file, it must contain the name of a file ending in .pc . Ugh! @@ -370,7 +370,7 @@ AC_COMPILE_IFELSE([],[ rm -f "$pac_module" # Remove any temporary files, and hide the work.pc file # (if the compiler generates them) - if test -f work.pc ; then + if test -f work.pc ; then mv -f work.pc conftest.pc fi rm -f work.pcl @@ -433,7 +433,7 @@ AC_SUBST([FCMODOUTFLAG],[$pac_cv_fc_module_outflag]) dnl dnl PAC_FC_AND_F77_COMPATIBLE([action-if-true],[action-if-false]) dnl -dnl Determine whether object files compiled with Fortran 77 can be +dnl Determine whether object files compiled with Fortran 77 can be dnl linked to Fortran 90 main programs. dnl dnl The test uses a name that includes an underscore unless the 3rd @@ -498,7 +498,7 @@ dnl ]) dnl dnl -dnl /*D +dnl /*D dnl PAC_PROG_FC_CRAY_POINTER - Check if Fortran supports Cray-style pointer. dnl If so, set pac_cv_prog_fc_has_pointer to yes dnl and find out if any extra compiler flag is @@ -605,7 +605,7 @@ AC_LANG_POP(C) dnl if test "$pac_cv_prog_fc_and_c_stdio_libs" != none -a \ "$pac_cv_prog_fc_and_c_stdio_libs" != unknown ; then - FC_OTHER_LIBS="$FC_OTHER_LIBS $pac_cv_prog_fc_and_c_stdio_libs" + FC_OTHER_LIBS="$FC_OTHER_LIBS $pac_cv_prog_fc_and_c_stdio_libs" fi ]) dnl @@ -623,13 +623,13 @@ dnl dnl If no actions are specified, a working value is added to 'FCOPTIONS' dnl dnl Notes: -dnl This is now careful to check that the output is different, since +dnl This is now careful to check that the output is different, since dnl some compilers are noisy. -dnl +dnl dnl We are extra careful to prototype the functions in case compiler options dnl that complain about poor code are in effect. dnl -dnl Because this is a long script, we have ensured that you can pass a +dnl Because this is a long script, we have ensured that you can pass a dnl variable containing the option name as the first argument. dnl D*/ AC_DEFUN([PAC_FC_CHECK_COMPILER_OPTION],[ @@ -772,14 +772,14 @@ for arg in --version -V -v ; do rm -f conftest.txt PAC_RUNLOG([$FC $arg conftest.txt 2>&1]) # Ignore the return code, because some compilers set the - # return code to zero on invalid arguments and some to + # return code to zero on invalid arguments and some to # non-zero on success (with no files to compile) if test -f conftest.txt ; then if grep 'Portland Group' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=pgi elif grep 'Sun Workshop' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=sun - elif grep 'Sun Fortran 9' conftest.txt >/dev/null 2>&1 ; then + elif grep 'Sun Fortran 9' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=sun elif grep 'Absoft' conftest.txt >/dev/null 2>&1 ; then pac_cv_fc_vendor=absoft diff --git a/3rd-party/romio341/mpl/confdb/aclocal_make.m4 b/3rd-party/romio341/mpl/confdb/aclocal_make.m4 index 147e92e9c2e..2c900e810b6 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_make.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_make.m4 @@ -72,7 +72,7 @@ fi ])dnl dnl/*D -dnl PAC_PROG_MAKE_ALLOWS_COMMENTS - Check whether comments are allowed in +dnl PAC_PROG_MAKE_ALLOWS_COMMENTS - Check whether comments are allowed in dnl shell commands in a makefile dnl dnl Synopsis: @@ -105,7 +105,7 @@ ALL: pac_str=`$MAKE -f conftest 2>&1` # This is needed for Mac OSX 10.5 rm -rf conftest.dSYM -rm -f conftest +rm -f conftest if test "$pac_str" != "success" ; then pac_cv_prog_make_allows_comments="no" else @@ -135,7 +135,7 @@ dnl or dnl.vb dnl .PATH: . ${srcdir} dnl.ve -dnl +dnl dnl Notes: dnl The test checks that the path works with implicit targets (some makes dnl support only explicit targets with 'VPATH' or 'PATH'). @@ -166,7 +166,7 @@ VPATH=.:conftestdir @echo \$< EOF ac_out=`$MAKE -f conftest 2>&1 | grep 'conftestdir/a.c'` -if test -n "$ac_out" ; then +if test -n "$ac_out" ; then pac_cv_prog_make_vpath="VPATH" else rm -f conftest @@ -177,7 +177,7 @@ all: a.o @echo \$< EOF ac_out=`$MAKE -f conftest 2>&1 | grep 'conftestdir/a.c'` - if test -n "$ac_out" ; then + if test -n "$ac_out" ; then pac_cv_prog_make_vpath=".PATH" else pac_cv_prog_make_vpath="neither VPATH nor .PATH works" @@ -226,7 +226,7 @@ EOF pac_str=`$MAKE -f conftest 2>&1` # This is needed for Mac OSX 10.5 rm -rf conftest.dSYM -rm -f conftest +rm -f conftest if test "$pac_str" = "XX" ; then pac_cv_prog_make_set_cflags="no" else @@ -241,7 +241,7 @@ fi ])dnl dnl/*D -dnl PAC_PROG_MAKE_CLOCK_SKEW - Check whether there is a problem with +dnl PAC_PROG_MAKE_CLOCK_SKEW - Check whether there is a problem with dnl clock skew in suing make. dnl dnl Effect: @@ -277,7 +277,7 @@ fi ]) dnl/*D -dnl PAC_PROG_MAKE - Checks for the varieties of MAKE, including support for +dnl PAC_PROG_MAKE - Checks for the varieties of MAKE, including support for dnl VPATH dnl dnl Synopsis: @@ -292,10 +292,10 @@ dnl This macro uses 'PAC_PROG_MAKE_INCLUDE', dnl 'PAC_PROG_MAKE_ALLOWS_COMMENTS', 'PAC_PROG_MAKE_VPATH', and dnl 'PAC_PROG_MAKE_SET_CFLAGS'. See those commands for details about their dnl actions. -dnl +dnl dnl It may call 'AC_PROG_MAKE_SET', which sets 'SET_MAKE' to 'MAKE = @MAKE@' dnl if the make program does not set the value of make, otherwise 'SET_MAKE' -dnl is set to empty; if the make program echos the directory name, then +dnl is set to empty; if the make program echos the directory name, then dnl 'SET_MAKE' is set to 'MAKE = $MAKE'. dnl D*/ AC_DEFUN([PAC_PROG_MAKE],[ diff --git a/3rd-party/romio341/mpl/confdb/aclocal_romio.m4 b/3rd-party/romio341/mpl/confdb/aclocal_romio.m4 index 802e2855eea..ace4c7460fd 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_romio.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_romio.m4 @@ -1,5 +1,5 @@ dnl -dnl This files contains additional macros for using autoconf to +dnl This files contains additional macros for using autoconf to dnl build configure scripts. dnl dnl Almost all of this file is taken from the aclocal.m4 of MPICH @@ -19,21 +19,21 @@ AC_DEFUN([PAC_GET_FORTNAMES],[ EOF $F77 $FFLAGS -c confftest.f > /dev/null 2>&1 if test ! -s confftest.$OBJEXT ; then - AC_MSG_WARN([Unable to test Fortran compiler. Compiling a test + AC_MSG_WARN([Unable to test Fortran compiler. Compiling a test program failed to produce an object file]) NOF77=1 elif test -z "$FORTRANNAMES" ; then # MAC OS X (and probably FreeBSD need strings - (not strings -a) # Cray doesn't accept -a ... allstrings="-a" - if test $arch_CRAY ; then - allstrings="" + if test $arch_CRAY ; then + allstrings="" elif strings - confftest.$OBJEXT < /dev/null >/dev/null 2>&1 ; then allstrings="-" elif strings -a confftest.$OBJEXT < /dev/null >/dev/null 2>&1 ; then allstrings="-a" fi - + nameform1=`strings $allstrings confftest.$OBJEXT | grep mpir_init_fop_ | head -1` nameform2=`strings $allstrings confftest.$OBJEXT | grep MPIR_INIT_FOP | head -1` nameform3=`strings $allstrings confftest.$OBJEXT | grep mpir_init_fop | head -1` @@ -47,8 +47,8 @@ program failed to produce an object file]) echo "Fortran externals have a trailing underscore and are lowercase" FORTRANNAMES="FORTRANUNDERSCORE" elif test -n "$nameform2" ; then - echo "Fortran externals are uppercase" - FORTRANNAMES="FORTRANCAPS" + echo "Fortran externals are uppercase" + FORTRANNAMES="FORTRANCAPS" elif test -n "$nameform3" ; then echo "Fortran externals are lower case" FORTRANNAMES="FORTRANNOUNDERSCORE" @@ -76,7 +76,7 @@ if test -n "$arch_IRIX"; then dnl For example dnl IRIX_5_4400 (IRIX 5.x, using MIPS 4400) osversion=`uname -r | sed 's/\..*//'` - dnl Note that we need to allow brackets here, so we briefly turn off + dnl Note that we need to allow brackets here, so we briefly turn off dnl the macro quotes changequote(,)dnl dnl Get the second field (looking for 6.1) @@ -111,7 +111,7 @@ if test -n "$arch_IRIX"; then fi AC_MSG_RESULT($cputype) dnl echo "checking for osversion and cputype" - dnl cputype may contain R4400, R2000A/R3000, or something else. + dnl cputype may contain R4400, R2000A/R3000, or something else. dnl We may eventually need to look at it. if test -z "$osversion" ; then AC_MSG_RESULT([Could not determine OS version. Please send]) @@ -123,9 +123,9 @@ if test -n "$arch_IRIX"; then true elif test $osversion = 6 ; then true - else + else AC_MSG_RESULT([Could not recognize the version of IRIX (got $osversion). -ROMIO knows about versions 4, 5 and 6; the version being returned from +ROMIO knows about versions 4, 5 and 6; the version being returned from uname -r is $osversion. Please send]) uname -a 2>&1 hinv 2>&1 @@ -138,7 +138,7 @@ uname -r is $osversion. Please send]) changequote(,)dnl cputype=`echo $cputype | sed -e 's%.*/%%' -e 's/R//' | tr -d "[A-Z]"` changequote([,])dnl - case $cputype in + case $cputype in 3000) ;; 4000) ;; 4400) ;; @@ -150,7 +150,7 @@ uname -r is $osversion. Please send]) *) AC_MSG_WARN([Unexpected IRIX/MIPS chipset $cputype. Please send the output]) uname -a 2>&1 - hinv 2>&1 + hinv 2>&1 AC_MSG_WARN([to romio-maint@mcs.anl.gov ROMIO will continue and assume that the cputype is compatible with a MIPS 4400 processor.]) @@ -172,7 +172,7 @@ define(PAC_TEST_MPI,[ main(int argc, char **argv) { MPI_Init(&argc,&argv); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -225,10 +225,10 @@ define(PAC_MPI_LONG_LONG_INT,[ #include "mpi.h" main(int argc, char **argv) { - long long i; + long long i; MPI_Init(&argc,&argv); MPI_Send(&i, 1, MPI_LONG_LONG_INT, 0, 0, MPI_COMM_WORLD); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -247,7 +247,7 @@ dnl define(PAC_LONG_LONG_64,[ if test -n "$longlongsize" ; then if test "$longlongsize" = 8 ; then - echo "defining MPI_Offset as long long in C and integer*8 in Fortran" + echo "defining MPI_Offset as long long in C and integer*8 in Fortran" AC_DEFINE(HAVE_LONG_LONG_64,,[Define if long long is 64 bits]) DEFINE_MPI_OFFSET="typedef long long MPI_Offset;" FORTRAN_MPI_OFFSET="integer*8" @@ -260,8 +260,8 @@ if test -n "$longlongsize" ; then LL="\%d" MPI_OFFSET_KIND1="!" MPI_OFFSET_KIND2="!" - else - echo "defining MPI_Offset as long in C and integer in Fortran" + else + echo "defining MPI_Offset as long in C and integer in Fortran" DEFINE_MPI_OFFSET="typedef long MPI_Offset;" FORTRAN_MPI_OFFSET="integer" LL="\%ld" @@ -274,14 +274,14 @@ else if test "$longlongsize" = 8 ; then PAC_TEST_LONG_LONG() else - echo "defining MPI_Offset as long in C and integer in Fortran" + echo "defining MPI_Offset as long in C and integer in Fortran" DEFINE_MPI_OFFSET="typedef long MPI_Offset;" FORTRAN_MPI_OFFSET="integer" LL="\%ld" MPI_OFFSET_KIND1="!" MPI_OFFSET_KIND2="!" fi - else + else dnl check if longlong is not supported or only its size cannot be determined dnl because the program cannot be run. rm -f ltest.c @@ -297,14 +297,14 @@ EOF if test -x conftest$EXEEXT ; then echo "assuming size of long long is 8bytes; use '-longlongsize' to indicate otherwise" rm -f conftest$EXEEXT ltest.c - echo "defining MPI_Offset as long long in C and integer*8 in Fortran" + echo "defining MPI_Offset as long long in C and integer*8 in Fortran" AC_DEFINE(HAVE_LONG_LONG_64,,[Define if long long is 64 bits]) DEFINE_MPI_OFFSET="typedef long long MPI_Offset;" FORTRAN_MPI_OFFSET="integer*8" LL="\%lld" - else + else echo "assuming long long is not available; use '-longlongsize' to indicate otherwise" - echo "defining MPI_Offset as long in C and integer in Fortran" + echo "defining MPI_Offset as long in C and integer in Fortran" DEFINE_MPI_OFFSET="typedef long MPI_Offset;" FORTRAN_MPI_OFFSET="integer" LL="\%ld" @@ -326,7 +326,7 @@ define(PAC_MPI_INFO,[ MPI_Info info; MPI_Init(&argc,&argv); MPI_Info_create(&info); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -363,7 +363,7 @@ define(PAC_MPI_DARRAY_SUBARRAY,[ MPI_Init(&argc,&argv); MPI_Type_create_darray(i, i, i, &i, &i, &i, &i, i, MPI_INT, &t); MPI_Type_create_subarray(i, &i, &i, &i, i, MPI_INT, &t); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -480,7 +480,7 @@ define(PAC_TEST_MPI_SGI_type_is_contig,[ MPI_Init(&argc,&argv); i = MPI_SGI_type_is_contig(type); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -507,7 +507,7 @@ define(PAC_TEST_MPI_COMBINERS,[ MPI_Init(&argc,&argv); i = MPI_COMBINER_STRUCT; - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT @@ -581,7 +581,7 @@ fi KINDVAL="" if $FC -o conftest$EXEEXT conftest.$ac_f90ext $FCFLAGS >/dev/null 2>&1 ; then ./conftest$EXEEXT >/dev/null 2>&1 - if test -s conftest.out ; then + if test -s conftest.out ; then KINDVAL=`cat conftest.out` fi fi @@ -624,7 +624,7 @@ EOF dnl dnl dnl PAC_GET_XFS_MEMALIGN -dnl +dnl dnl define(PAC_GET_XFS_MEMALIGN, [AC_MSG_CHECKING([for memory alignment needed for direct I/O]) @@ -634,7 +634,7 @@ AC_TEST_PROGRAM([#include #include #include #include -main() { +main() { struct dioattr st; int fd = open("/tmp/romio_tmp.bin", O_RDWR | O_CREAT, 0644); FILE *f=fopen("memalignval","w"); @@ -704,7 +704,7 @@ fi KINDVAL="" if $FC -o kind$EXEEXT kind.f $FCFLAGS >/dev/null 2>&1 ; then ./kind >/dev/null 2>&1 - if test -s k.out ; then + if test -s k.out ; then KINDVAL=`cat k.out` fi fi @@ -773,7 +773,7 @@ define(PAC_TEST_MPIR_STATUS_SET_BYTES,[ MPI_Init(&argc,&argv); MPIR_Status_set_bytes(status,type,err); - MPI_Finalize(); + MPI_Finalize(); } EOF rm -f conftest$EXEEXT diff --git a/3rd-party/romio341/mpl/confdb/aclocal_shl.m4 b/3rd-party/romio341/mpl/confdb/aclocal_shl.m4 index 9997fe54a1b..2a482365392 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_shl.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_shl.m4 @@ -1,7 +1,7 @@ dnl dnl Definitions for creating shared libraries dnl -dnl The purpose of these definitions is to provide common support for +dnl The purpose of these definitions is to provide common support for dnl shared libraries, with *or without* the use of the GNU Libtool package. dnl For many of our important platforms, the Libtool approach is overkill, dnl and can be particularly painful for developers. @@ -9,30 +9,30 @@ dnl dnl To use libtool, you need macros that are defined by libtool for libtool dnl Don't even think about the consequences of this for updating and for dnl using user-versions of libtool :( -dnl +dnl dnl !!!!!!!!!!!!!!!!!!!!! dnl libtool requires ac 2.50 !!!!!!!!!!!!!!!!! -dnl +dnl dnl builtin(include,libtool.m4) dnl dnl/*D dnl PAC_ARG_SHAREDLIBS - Add --enable-sharedlibs=kind to configure. -dnl +dnl dnl Synopsis: dnl PAC_ARG_SHAREDLIBS dnl dnl Output effects: dnl Adds '--enable-sharedlibs=kind' to the command line. If this is enabled, -dnl then based on the value of 'kind', programs are selected for the +dnl then based on the value of 'kind', programs are selected for the dnl names 'CC_SHL' and 'CC_LINK_SHL' that configure will substitute for in dnl 'Makefile.in's. These symbols are generated by 'simplemake' when dnl shared library support is selected. -dnl The variable 'C_LINKPATH_SHL' is set to the option to specify the +dnl The variable 'C_LINKPATH_SHL' is set to the option to specify the dnl path to search at runtime for libraries (-rpath in gcc/GNU ld). dnl This can be turned off with --disable-rpath , which is appropriate dnl for libraries and for executables that may be installed in different dnl locations. -dnl The variable 'SHLIB_EXT' is set to the extension used by shared +dnl The variable 'SHLIB_EXT' is set to the extension used by shared dnl libraries; under most forms of Unix, this is 'so'; under Mac OS/X, this dnl is 'dylib', and under Windows (including cygwin), this is 'dll'. dnl @@ -40,7 +40,7 @@ dnl Supported values of 'kind' include \: dnl+ gcc - Use gcc to create both shared objects and libraries dnl. osx-gcc - Use gcc on Mac OS/X to create both shared objects and dnl libraries -dnl. solaris-cc - Use native Solaris cc to create shared objects and +dnl. solaris-cc - Use native Solaris cc to create shared objects and dnl libraries dnl. cygwin-gcc - Use gcc on Cygwin to create shared objects and libraries dnl- none - The same as '--disable-sharedlibs' @@ -105,7 +105,7 @@ C_LINKPATH_SHL="" SHLIB_EXT=unknown SHLIB_FROM_LO=no SHLIB_INSTALL='$(INSTALL_PROGRAM)' -case "$enable_sharedlibs" in +case "$enable_sharedlibs" in no|none) ;; gcc-osx|osx-gcc) @@ -114,7 +114,7 @@ case "$enable_sharedlibs" in CC_SHL='${CC} -fPIC' # No way in osx to specify the location of the shared libraries at link # time (see the code in createshlib in mpich/src/util) - # As of 10.5, -Wl,-rpath,dirname should work . The dirname + # As of 10.5, -Wl,-rpath,dirname should work . The dirname # must be a single directory, not a colon-separated list (use multiple # -Wl,-rpath,path for each of the paths in the list). However, os x # apparently records the library full path, so rpath isn't as useful @@ -148,13 +148,13 @@ case "$enable_sharedlibs" in C_LINKPATH_SHL="-Wl,-rpath," fi SHLIB_EXT=so - # We need to test that this isn't osx. The following is a + # We need to test that this isn't osx. The following is a # simple hack osname=`uname -s` - case $osname in + case $osname in *Darwin*|*darwin*) AC_MSG_ERROR([You must specify --enable-sharedlibs=osx-gcc for Mac OS/X]) - ;; + ;; *CYGWIN*|*cygwin*) AC_MSG_ERROR([You must specify --enable-sharedlibs=cygwin-gcc for Cygwin]) ;; @@ -172,7 +172,7 @@ case "$enable_sharedlibs" in C_LINKPATH_SHL="" SHLIB_EXT="dll" enable_sharedlibs="cygwin-gcc" - ;; + ;; libtool) # set TRY_LIBTOOL to yes to experiment with libtool. You are on your @@ -180,7 +180,7 @@ case "$enable_sharedlibs" in if test "$TRY_LIBTOOL" != yes ; then AC_MSG_ERROR([Creating shared libraries using libtool not yet supported]) else - # Using libtool requires a heavy-weight process to test for + # Using libtool requires a heavy-weight process to test for # various stuff that libtool needs. Without this, you'll get a # bizarre error message about libtool being unable to find # configure.in or configure.ac (!) @@ -205,7 +205,7 @@ case "$enable_sharedlibs" in # we are building under cygwin sysname=`uname -s | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` isCygwin=no - case "$sysname" in + case "$sysname" in *CYGWIN*) isCygwin=yes ;; esac if test "$isCygwin" = yes ; then @@ -269,7 +269,7 @@ dnl Other, such as solaris-cc *) AC_MSG_ERROR([Unknown value $enable_sharedlibs for enable-sharedlibs. Values should be gcc or osx-gcc]) enable_sharedlibs=no - ;; + ;; esac # Check for the shared-library extension PAC_CC_SHLIB_EXT @@ -286,7 +286,7 @@ dnl /*D dnl PAC_xx_SHAREDLIBS - Get compiler and linker for shared libraries dnl These routines may be used to determine the compiler and the dnl linker to be used in creating shared libraries -dnl Rather than set predefined variable names, they set an argument +dnl Rather than set predefined variable names, they set an argument dnl (if provided) dnl dnl Synopsis @@ -300,11 +300,11 @@ ifelse($1,,[ AC_CHECK_PROG(pac_prog,gcc,yes,no) # If we are gcc but OS X, set the special type # We need a similar setting for cygwin - if test "$pac_prog" = yes ; then + if test "$pac_prog" = yes ; then osname=`uname -s` - case $osname in + case $osname in *Darwin*|*darwin*) pac_kinds=gcc-osx - ;; + ;; *) pac_kinds=gcc ;; esac @@ -314,7 +314,7 @@ ifelse($1,,[ if test "$pac_prog" = yes ; then pac_kinds="$pac_kinds libtool" ; fi ]) for pac_arg in $pac_kinds ; do - case $pac_arg in + case $pac_arg in gcc) # For example, include the libname as ${LIBNAME_SHL} #C_LINK_SHL='${CC} -shared -Wl,-h,' @@ -363,10 +363,10 @@ ifelse($3,,C_LINK_SHL=$pac_clink_sharedlibs,$3=$pac_clink_sharedlibs) ifelse($4,,SHAREDLIB_TYPE=$pac_type_sharedlibs,$4=$pac_type_sharedlibs) ]) -dnl This macro ensures that all of the necessary substitutions are +dnl This macro ensures that all of the necessary substitutions are dnl made by any subdirectory configure (which may simply SUBST the dnl necessary values rather than trying to determine them from scratch) -dnl This is a more robust (and, in the case of libtool, only +dnl This is a more robust (and, in the case of libtool, only dnl managable) method. AC_DEFUN([PAC_CC_SUBDIR_SHLIBS],[ AC_SUBST(CC_SHL) @@ -395,9 +395,9 @@ AC_DEFUN([PAC_CC_SHLIB_EXT],[ # clean steps that look for libfoo.$SHLIB_EXT . if test "$SHLIB_EXT" = "unknown" ; then osname=`uname -s` - case $osname in + case $osname in *Darwin*|*darwin*) SHLIB_EXT=dylib - ;; + ;; *CYGWIN*|*cygwin*) SHLIB_EXT=dll ;; *Linux*|*LINUX*|*SunOS*) SHLIB_EXT=so diff --git a/3rd-party/romio341/mpl/confdb/aclocal_subcfg.m4 b/3rd-party/romio341/mpl/confdb/aclocal_subcfg.m4 index fbd1899f4dd..543bfc50724 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_subcfg.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_subcfg.m4 @@ -30,7 +30,7 @@ dnl to subconfigure as "precious" appropriately. The precious variable dnl can be created in the following ways: dnl 1) implicit declaration through use of autoconf macros, like dnl AC_PROG_CC (declares CC/CFLAGS/CPPFLAGS/LIBS/LDFLAGS), or -dnl AC_PROG_F77 (declares F77/FFLAGS/FLIBS) ... +dnl AC_PROG_F77 (declares F77/FFLAGS/FLIBS) ... dnl which are in turns invoked by other subconfigure. dnl When in doubt, check "ac_precious_var" in the calling configure. dnl 2) explicit "precious" declaration through AC_ARG_VAR. @@ -54,7 +54,7 @@ AC_DEFUN([PAC_CONFIG_SUBDIR_ARGS],[ # Adapted for MPICH from the autoconf-2.67 implementation of # AC_CONFIG_SUBDIRS. Search for "MPICH note:" for relevant commentary and # local modifications. - + # Remove --cache-file, --srcdir, and --disable-option-checking arguments # so they do not pile up. Otherwise relative paths (like --srcdir=.. from # make distcheck) will be incorrect. @@ -115,7 +115,7 @@ AC_DEFUN([PAC_CONFIG_SUBDIR_ARGS],[ AS_VAR_APPEND([pac_sub_configure_args], [" '$pac_arg'"]) ;; esac done - + # Always prepend --prefix to ensure using the same prefix # in subdir configurations. # MPICH note: see tt#983 for an example of why this is necessary @@ -124,22 +124,22 @@ AC_DEFUN([PAC_CONFIG_SUBDIR_ARGS],[ *\'*) pac_arg=`AS_ECHO(["$pac_arg"]) | sed "s/'/'\\\\\\\\''/g"` ;; esac pac_sub_configure_args="'$pac_arg' $pac_sub_configure_args" - + # Pass --silent if test "$silent" = yes; then pac_sub_configure_args="--silent $pac_sub_configure_args" fi - + # Always prepend --disable-option-checking to silence warnings, since # different subdirs can have different --enable and --with options. pac_sub_configure_args="--disable-option-checking $pac_sub_configure_args" - + pac_popdir=`pwd` - + # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. test -d "$srcdir/$pac_dir" || continue - + # MPICH note: modified to remove the internal "_AS_*" macro usage, also # msg is already printed at top dnl _AS_ECHO_LOG([$pac_msg]) diff --git a/3rd-party/romio341/mpl/confdb/aclocal_util.m4 b/3rd-party/romio341/mpl/confdb/aclocal_util.m4 index 2648be54303..d25ed648420 100644 --- a/3rd-party/romio341/mpl/confdb/aclocal_util.m4 +++ b/3rd-party/romio341/mpl/confdb/aclocal_util.m4 @@ -131,7 +131,7 @@ AC_SUBST(MKDIR_P) ]) dnl Test for a clean VPATH directory. Provide this command with the names -dnl of all of the generated files that might cause problems +dnl of all of the generated files that might cause problems dnl (Makefiles won't cause problems because there's no VPATH usage for them) dnl dnl Synopsis @@ -151,12 +151,12 @@ if test ! -s $srcdir/conftest$$ ; then pac_header="" ifdef([AC_LIST_HEADER],[pac_header=AC_LIST_HEADER]) for file in config.status $pac_header $1 ; do - if test -f $srcdir/$file ; then + if test -f $srcdir/$file ; then pac_dirtyfiles="$pac_dirtyfiles $file" fi done ifelse($2,,,[ - for dir in $2 ; do + for dir in $2 ; do if test -d $srcdir/$dir ; then pac_dirtydirs="$pac_dirtydirs $dir" fi diff --git a/3rd-party/romio341/mpl/configure.ac b/3rd-party/romio341/mpl/configure.ac index 6c162862596..aec7d2e9397 100644 --- a/3rd-party/romio341/mpl/configure.ac +++ b/3rd-party/romio341/mpl/configure.ac @@ -259,8 +259,8 @@ fi ####################################################################### # ---------------------------------------------------------------------------- -# Support for timers. The following code processes the -# --enable-timer-type=name argument and selects the timer based on +# Support for timers. The following code processes the +# --enable-timer-type=name argument and selects the timer based on # both that field and what configure is able to determine is available. # The file src/include/mpl_timer.h is also created. # ---------------------------------------------------------------------------- @@ -307,7 +307,7 @@ if test -z "$timer_type" ; then AC_CHECK_FUNCS(clock_gettime clock_getres gethrtime mach_absolute_time gettimeofday) if test "$ac_cv_func_gethrtime" = "yes" ; then # Sigh. The Solaris include files do not define hrtime_t - # Before we accept this choice, make sure that we can + # Before we accept this choice, make sure that we can # do arithmetic with hrtime_t . AC_CACHE_CHECK([that hrtime_t is properly defined for gethrtime], pac_cv_hrtime_works,[ @@ -315,10 +315,10 @@ if test -z "$timer_type" ; then #include ],[hrtime_t t1, t2; t1 = 1; t2 = 2; t1 = t1 + t2;], pac_cv_hrtime_works=yes,pac_cv_hrtime_works=no)]) - # A more ambitious test would look to see if casting an + # A more ambitious test would look to see if casting an # hrtime_t to int64_t works, and even more ambitious # would check whether long or long long was 64 bits (or even - # better, the sizeof hrtime_t). + # better, the sizeof hrtime_t). # AC_CHECK_FUNCS has false positive when checking whether gethrtime is # available on Solaris with strict configuration. We must use @@ -334,7 +334,7 @@ pac_cv_hrtime_works=yes,pac_cv_hrtime_works=no)]) # Test on both because some systems (e.g., cygwin) provide # clock_gettime but not clock_getres timer_type=clock_gettime - elif test "$ac_cv_func_mach_absolute_time" = "yes" ; then + elif test "$ac_cv_func_mach_absolute_time" = "yes" ; then timer_type=mach_absolute_time elif test "$ac_cv_func_gettimeofday" = "yes" ; then timer_type=gettimeofday @@ -386,8 +386,8 @@ case "$timer_type" in AC_MSG_ERROR([The available timer requires _XOPEN_SOURCE=500. Add -D_XOPEN_SOURCE=500 to CFLAGS and rerun configure]) fi fi - # - # FreeBSD 4.3 incorrectly puts the header into sys/time.h; + # + # FreeBSD 4.3 incorrectly puts the header into sys/time.h; # time.h is required (see pages 45 and 46 in the POSIX standard). # See if we can compile AC_CACHE_CHECK([for CLOCK_REALTIME defined in time.h],pac_cv_posix_clock_realtime,[ @@ -425,7 +425,7 @@ pac_cv_posix_clock_realtime=no) ;; linux86_cycle|linux86_cycle_2) - + # The following AC_TRY_RUN statements are needed because x86_64 compilers # usually know about rdtscp but the cpu may or may not actually implement the # feature. This is not cross-compile safe, unfortunately. In the long run we diff --git a/3rd-party/romio341/test/.codingcheck b/3rd-party/romio341/test/.codingcheck index 0d0a655fa81..823ebd28ea7 100644 --- a/3rd-party/romio341/test/.codingcheck +++ b/3rd-party/romio341/test/.codingcheck @@ -1,10 +1,10 @@ # -# We allow these routines for the romio test programs -%romioTestRoutines = ( +# We allow these routines for the romio test programs +%romioTestRoutines = ( 'printf' => sys, 'fprintf' => sys , 'sprintf' => sys, 'vprintf' => sys, - 'strcpy' => sys, 'strncpy' => sys, 'strcat' => sys, + 'strcpy' => sys, 'strncpy' => sys, 'strcat' => sys, 'malloc' => sys, 'free' => sys, 'calloc' => sys, 'strdup' => sys, - 'assert' => sys, 'snprintf' => sys, + 'assert' => sys, 'snprintf' => sys, ); if (defined(&PushAllowFuncNames)) { &PushAllowFuncNames( "romioTestRoutines", "tree", "add" ); diff --git a/3rd-party/romio341/test/Makefile.am b/3rd-party/romio341/test/Makefile.am index 191cf0b6e7a..8ca1769e413 100644 --- a/3rd-party/romio341/test/Makefile.am +++ b/3rd-party/romio341/test/Makefile.am @@ -25,7 +25,7 @@ CTESTS = simple perf async coll_test coll_perf misc file_info excl large_array \ atomicity noncontig i_noncontig noncontig_coll split_coll shared_fp \ large_file psimple error status noncontig_coll2 aggregation1 aggregation2 \ async-multiple ordered_fp hindexed external32 types_with_zeros darray_read syshints -FTESTS = fcoll_test fperf fmisc pfcoll_test +FTESTS = fcoll_test fperf fmisc pfcoll_test noinst_PROGRAMS = $(CTESTS) diff --git a/3rd-party/romio341/test/Mfile.in b/3rd-party/romio341/test/Mfile.in index 5e8b531182b..4e616e11e2f 100644 --- a/3rd-party/romio341/test/Mfile.in +++ b/3rd-party/romio341/test/Mfile.in @@ -29,7 +29,7 @@ srcdir = @srcdir@ @VPATH@ PROFLIB = -CFLAGS = @CFLAGS@ @DEFS@ $(OPTFLAGS) +CFLAGS = @CFLAGS@ @DEFS@ $(OPTFLAGS) CCFLAGS = $(CFLAGS) FFLAGS = $(OPTFLAGS) @FFLAGS@ # Use LIBS to add any special libraries for C programs @@ -37,18 +37,18 @@ LIBS = @LIB_PATH@ @LIB_LIST@ # Use FLIBS to add any special libraries for Fortran programs FLIBS = @FLIB_PATH@ @LIB_LIST@ @F77EXTRALIBS@ EXECS = $(CTESTS) $(FTESTS) -OTHEREXECS = +OTHEREXECS = CTESTS = simple perf async coll_test coll_perf misc file_info excl \ large_array \ atomicity noncontig i_noncontig noncontig_coll split_coll shared_fp \ large_file psimple error status noncontig_coll2 -FTESTS = fcoll_test fperf fmisc pfcoll_test +FTESTS = fcoll_test fperf fmisc pfcoll_test default: $(EXECS) # # Note that runtests builds the executables as required -testing: +testing: -./runtests $(TESTARGS) all: testing @@ -67,7 +67,7 @@ fcoll_test: fcoll_test.f fmisc: fmisc.f $(F77) $(USER_FFLAGS) -o fmisc fmisc.f $(FLIBS) -pfcoll_test: pfcoll_test.f +pfcoll_test: pfcoll_test.f $(F77) $(USER_FFLAGS) -o pfcoll_test pfcoll_test.f $(FLIBS) # diff --git a/3rd-party/romio341/test/README b/3rd-party/romio341/test/README index dbab8e393d4..15a24804b42 100644 --- a/3rd-party/romio341/test/README +++ b/3rd-party/romio341/test/README @@ -1,9 +1,9 @@ -This directory contains a few example programs. +This directory contains a few example programs. Each program takes the filename as a command-line argument -"-fname filename". +"-fname filename". -If you are using "mpirun" to run an MPI program, you can run the +If you are using "mpirun" to run an MPI program, you can run the program "simple" with two processes as follows: mpirun -np 2 simple -fname test @@ -22,9 +22,9 @@ perf.c: A simple read and write performance test. Each process writes reads it back. For a different access size, change the value of SIZE in the code. The bandwidth is reported for two cases: (1) without including MPI_File_sync and (2) including - MPI_File_sync. - -async.c: This program is the same as simple.c, except that it uses + MPI_File_sync. + +async.c: This program is the same as simple.c, except that it uses asynchronous I/O. coll_test.c: This program tests the use of collective I/O. It writes @@ -42,8 +42,8 @@ coll_perf.c: Measures the I/O bandwidth for writing/reading a 3D misc.c: Tests various miscellaneous MPI-IO functions -atomicity.c: Tests whether atomicity semantics are satisfied for - overlapping accesses in atomic mode. The probability of detecting +atomicity.c: Tests whether atomicity semantics are satisfied for + overlapping accesses in atomic mode. The probability of detecting errors is higher if you run it on 8 or more processes. large_file.c: Tests access to large files. Writes a 4-Gbyte file and @@ -53,20 +53,20 @@ large_file.c: Tests access to large files. Writes a 4-Gbyte file and large_array.c: Tests writing and reading a 4-Gbyte distributed array using the distributed array datatype constructor. Works only on file systems that support 64-bit file sizes and MPI implementations - that support 64-bit MPI_Aint. + that support 64-bit MPI_Aint. -file_info.c: Tests the setting and retrieval of hints via +file_info.c: Tests the setting and retrieval of hints via MPI_File_set_info and MPI_File_get_info excl.c: Tests MPI_File_open with MPI_MODE_EXCL -noncontig.c: Tests noncontiguous accesses in memory and file using +noncontig.c: Tests noncontiguous accesses in memory and file using independent I/O. Run it on two processes only. noncontig_coll.c: Same as noncontig.c, but uses collective I/O -noncontig_coll2.c: Same as noncontig_coll.c, but exercises the - cb_config_list hint and aggregation handling more. +noncontig_coll2.c: Same as noncontig_coll.c, but exercises the + cb_config_list hint and aggregation handling more. i_noncontig.c: Same as noncontig.c, but uses nonblocking I/O @@ -78,7 +78,7 @@ fperf.f: Fortran version of perf.c fcoll_test.f: Fortran version of coll_test.c -pfcoll_test.f: Same as fcoll_test.f but uses the PMPI versions of +pfcoll_test.f: Same as fcoll_test.f but uses the PMPI versions of all MPI routines fmisc.f: Fortran version of misc.c diff --git a/3rd-party/romio341/test/fcoll_test.f.in b/3rd-party/romio341/test/fcoll_test.f.in index 9de090d73ac..7b9649ceaae 100644 --- a/3rd-party/romio341/test/fcoll_test.f.in +++ b/3rd-party/romio341/test/fcoll_test.f.in @@ -1,4 +1,4 @@ -! +! ! Copyright (C) by Argonne National Laboratory ! See COPYRIGHT in top-level directory ! @@ -10,7 +10,7 @@ ! Fortran equivalent of coll_test.c - integer FILESIZE + integer FILESIZE parameter (FILESIZE=32*32*32*4) ! A 32^3 array. For other array sizes, change FILESIZE above and @@ -21,7 +21,7 @@ ! back, and checks that the data read is correct. ! Note that the file access pattern is noncontiguous. - + integer newtype, i, ndims, array_of_gsizes(3) integer order, intsize, nprocs, j, array_of_distribs(3) integer array_of_dargs(3), array_of_psizes(3) @@ -37,7 +37,7 @@ call MPI_COMM_SIZE(MPI_COMM_WORLD, nprocs, ierr) call MPI_COMM_RANK(MPI_COMM_WORLD, mynod, ierr) -! process 0 takes the file name as a command-line argument and +! process 0 takes the file name as a command-line argument and ! broadcasts it to other processes if (mynod .eq. 0) then @@ -59,14 +59,14 @@ @F77GETARG@ call MPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) - else + else call MPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) end if ! create the distributed array filetype - + ndims = 3 order = MPI_ORDER_FORTRAN @@ -94,12 +94,12 @@ call MPI_TYPE_COMMIT(newtype, ierr) -! initialize writebuf +! initialize writebuf call MPI_TYPE_SIZE(newtype, bufcount, ierr) call MPI_TYPE_SIZE(MPI_INTEGER, intsize, ierr) bufcount = bufcount/intsize - do i=1, bufcount + do i=1, bufcount writebuf(i) = 1 end do @@ -130,7 +130,7 @@ call MPI_FILE_OPEN(MPI_COMM_WORLD, str, & & MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr) - disp = 0 + disp = 0 call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", & & MPI_INFO_NULL, ierr) call MPI_FILE_WRITE_ALL(fh, writebuf, bufcount, MPI_INTEGER, & @@ -141,7 +141,7 @@ call MPI_FILE_OPEN(MPI_COMM_WORLD, str, & & MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr) - + call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", & & MPI_INFO_NULL, ierr) call MPI_FILE_READ_ALL(fh, readbuf, bufcount, MPI_INTEGER, & @@ -159,7 +159,7 @@ call MPI_TYPE_FREE(newtype, ierr) call MPI_Allreduce( errs, toterrs, 1, MPI_INTEGER, MPI_SUM, & - $ MPI_COMM_WORLD, ierr ) + $ MPI_COMM_WORLD, ierr ) if (mynod .eq. 0) then if( toterrs .gt. 0 ) then print *, 'Found ', toterrs, ' errors' diff --git a/3rd-party/romio341/test/fmisc.f.in b/3rd-party/romio341/test/fmisc.f.in index 4bd02b605db..90463195887 100644 --- a/3rd-party/romio341/test/fmisc.f.in +++ b/3rd-party/romio341/test/fmisc.f.in @@ -26,7 +26,7 @@ call MPI_INIT(ierr) call MPI_COMM_RANK(MPI_COMM_WORLD, mynod, ierr) -! process 0 takes the file name as a command-line argument and +! process 0 takes the file name as a command-line argument and ! broadcasts it to other processes if (mynod .eq. 0) then @@ -48,7 +48,7 @@ @F77GETARG@ call MPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) - else + else call MPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) end if @@ -94,7 +94,7 @@ call MPI_TYPE_COMMIT(newtype, ierr) disp = 1000 - call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, 'native', & + call MPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, 'native', & & MPI_INFO_NULL, ierr) if (mynod .eq. 0 .and. verbose) then print *, ' testing MPI_FILE_GET_VIEW' @@ -113,7 +113,7 @@ end if offset = 10 call MPI_FILE_GET_BYTE_OFFSET(fh, offset, disp, ierr) - if (disp .ne. 1080) then + if (disp .ne. 1080) then errs = errs + 1 print *, 'byte offset = ', disp, ', should be 1080' end if @@ -133,14 +133,14 @@ errs = errs + 1 print *, 'file size = ', filesize, ', should be 1060' end if - + if (mynod .eq. 0 .and. verbose) then print *, ' seeking to eof and testing MPI_FILE_GET_POSITION' end if offset = 0 call MPI_FILE_SEEK(fh, offset, MPI_SEEK_END, ierr) call MPI_FILE_GET_POSITION(fh, offset, ierr) - if (offset .ne. 10) then + if (offset .ne. 10) then errs = errs + 1 print *, 'file pointer posn = ', offset, ', should be 10' end if @@ -162,7 +162,7 @@ call MPI_FILE_SEEK(fh, offset, MPI_SEEK_CUR, ierr) call MPI_FILE_GET_POSITION(fh, offset, ierr) call MPI_FILE_GET_BYTE_OFFSET(fh, offset, disp, ierr) - if (disp .ne. 1000) then + if (disp .ne. 1000) then errs = errs + 1 print *, 'file pointer posn in bytes = ', disp, & & ', should be 1000' @@ -185,7 +185,7 @@ end if call MPI_Allreduce( errs, toterrs, 1, MPI_INTEGER, MPI_SUM, & - $ MPI_COMM_WORLD, ierr ) + $ MPI_COMM_WORLD, ierr ) if (mynod .eq. 0) then if( toterrs .gt. 0 ) then print *, 'Found ', toterrs, ' errors' @@ -194,8 +194,8 @@ endif endif - call MPI_TYPE_FREE(newtype, ierr) - call MPI_TYPE_FREE(filetype, ierr) + call MPI_TYPE_FREE(newtype, ierr) + call MPI_TYPE_FREE(filetype, ierr) call MPI_GROUP_FREE(group, ierr) call MPI_FINALIZE(ierr) diff --git a/3rd-party/romio341/test/fperf.f.in b/3rd-party/romio341/test/fperf.f.in index cbd583cf62a..87d15d7053e 100644 --- a/3rd-party/romio341/test/fperf.f.in +++ b/3rd-party/romio341/test/fperf.f.in @@ -10,7 +10,7 @@ ! Fortran equivalent of perf.c - integer SIZE + integer SIZE parameter (SIZE=1048576*4) ! read/write size per node in bytes @@ -30,7 +30,7 @@ call MPI_COMM_SIZE(MPI_COMM_WORLD, nprocs, ierr) call MPI_COMM_RANK(MPI_COMM_WORLD, mynod, ierr) -! process 0 takes the file name as a command-line argument and +! process 0 takes the file name as a command-line argument and ! broadcasts it to other processes if (mynod .eq. 0) then @@ -50,11 +50,11 @@ i = i + 1 @F77GETARG@ - call MPI_BCAST(str, 1024, MPI_CHARACTER, 0, & + call MPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) print *, 'Access size per process = ', SIZE, ' bytes', & & ', ntimes = ', ntimes - else + else call MPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) end if @@ -71,7 +71,7 @@ stim = MPI_WTIME() call MPI_FILE_WRITE(fh, buf, SIZE, MPI_BYTE, status, ierr) write_tim = MPI_WTIME() - stim - + call MPI_FILE_CLOSE(fh, ierr) call MPI_BARRIER(MPI_COMM_WORLD, ierr) @@ -85,7 +85,7 @@ stim = MPI_WTIME() call MPI_FILE_READ(fh, buf, SIZE, MPI_BYTE, status, ierr) read_tim = MPI_WTIME() - stim - + call MPI_FILE_CLOSE(fh, ierr) call MPI_ALLREDUCE(write_tim, new_write_tim, 1, & @@ -100,7 +100,7 @@ min_write_tim = new_write_tim end if end do - + if (mynod .eq. 0) then read_bw = (SIZE*nprocs*1.0D0)/(min_read_tim*1000000.0D0) write_bw = (SIZE*nprocs*1.0D0)/(min_write_tim*1000000.0D0) @@ -108,14 +108,14 @@ & write_bw, ' Mbytes/sec' print *, 'Read bandwidth without prior file sync = ', & & read_bw, ' Mbytes/sec' - end if + end if min_read_tim = 10000000.0D0 min_write_tim = 10000000.0D0 flag = 0 do j=1, ntimes - call MPI_FILE_OPEN(MPI_COMM_WORLD, str, & + call MPI_FILE_OPEN(MPI_COMM_WORLD, str, & & MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr) call MPI_FILE_SEEK(fh, offset, MPI_SEEK_SET, ierr) @@ -125,15 +125,15 @@ call MPI_FILE_WRITE(fh, buf, SIZE, MPI_BYTE, status, ierr) call MPI_FILE_SYNC(fh, ierr) write_tim = MPI_WTIME() - stim - if (ierr .eq. MPI_ERR_UNKNOWN) then + if (ierr .eq. MPI_ERR_UNKNOWN) then flag = 1 end if - + call MPI_FILE_CLOSE(fh, ierr) call MPI_BARRIER(MPI_COMM_WORLD, ierr) - call MPI_FILE_OPEN(MPI_COMM_WORLD, str, & + call MPI_FILE_OPEN(MPI_COMM_WORLD, str, & & MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr) call MPI_FILE_SEEK(fh, offset, MPI_SEEK_SET, ierr) @@ -142,7 +142,7 @@ stim = MPI_WTIME() call MPI_FILE_READ(fh, buf, SIZE, MPI_BYTE, status, ierr) read_tim = MPI_WTIME() - stim - + call MPI_FILE_CLOSE(fh, ierr) call MPI_ALLREDUCE(write_tim, new_write_tim, 1, & @@ -158,18 +158,18 @@ end if end do - + if (mynod .eq. 0) then if (flag .eq. 1) then print *, 'MPI_FILE_SYNC returns error.' else read_bw = (SIZE*nprocs*1.0D0)/(min_read_tim*1000000.0D0) write_bw = (SIZE*nprocs*1.0D0)/(min_write_tim*1000000.0D0) - print *, 'Write bandwidth including file sync = ', & + print *, 'Write bandwidth including file sync = ', & & write_bw, ' Mbytes/sec' print *, 'Read bandwidth after file sync = ', & & read_bw, ' Mbytes/sec' - end if + end if end if call MPI_FINALIZE(ierr) diff --git a/3rd-party/romio341/test/pfcoll_test.f.in b/3rd-party/romio341/test/pfcoll_test.f.in index b8dfada4477..32323e02560 100644 --- a/3rd-party/romio341/test/pfcoll_test.f.in +++ b/3rd-party/romio341/test/pfcoll_test.f.in @@ -11,7 +11,7 @@ ! This is the same as fcoll_test.f, but uses the PMPI versions ! of all functions in order to test the profiling interface. - integer FILESIZE + integer FILESIZE parameter (FILESIZE=32*32*32*4) ! A 32^3 array. For other array sizes, change FILESIZE above and @@ -22,7 +22,7 @@ ! back, and checks that the data read is correct. ! Note that the file access pattern is noncontiguous. - + integer newtype, i, ndims, array_of_gsizes(3) integer order, intsize, nprocs, j, array_of_distribs(3) integer array_of_dargs(3), array_of_psizes(3) @@ -38,7 +38,7 @@ call PMPI_COMM_SIZE(MPI_COMM_WORLD, nprocs, ierr) call PMPI_COMM_RANK(MPI_COMM_WORLD, mynod, ierr) -! process 0 takes the file name as a command-line argument and +! process 0 takes the file name as a command-line argument and ! broadcasts it to other processes if (mynod .eq. 0) then @@ -60,14 +60,14 @@ @F77GETARG@ call PMPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) - else + else call PMPI_BCAST(str, 1024, MPI_CHARACTER, 0, & & MPI_COMM_WORLD, ierr) end if ! create the distributed array filetype - + ndims = 3 order = MPI_ORDER_FORTRAN @@ -95,12 +95,12 @@ call PMPI_TYPE_COMMIT(newtype, ierr) -! initialize writebuf +! initialize writebuf call PMPI_TYPE_SIZE(newtype, bufcount, ierr) call PMPI_TYPE_SIZE(MPI_INTEGER, intsize, ierr) bufcount = bufcount/intsize - do i=1, bufcount + do i=1, bufcount writebuf(i) = 1 end do @@ -131,7 +131,7 @@ call PMPI_FILE_OPEN(MPI_COMM_WORLD, str, & & MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr) - disp = 0 + disp = 0 call PMPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", & & MPI_INFO_NULL, ierr) call PMPI_FILE_WRITE_ALL(fh, writebuf, bufcount, MPI_INTEGER, & @@ -142,7 +142,7 @@ call PMPI_FILE_OPEN(MPI_COMM_WORLD, str, & & MPI_MODE_CREATE+MPI_MODE_RDWR, MPI_INFO_NULL, fh, ierr) - + call PMPI_FILE_SET_VIEW(fh, disp, MPI_INTEGER, newtype, "native", & & MPI_INFO_NULL, ierr) call PMPI_FILE_READ_ALL(fh, readbuf, bufcount, MPI_INTEGER, & @@ -160,7 +160,7 @@ call PMPI_TYPE_FREE(newtype, ierr) call MPI_Allreduce( errs, toterrs, 1, MPI_INTEGER, MPI_SUM, & - $ MPI_COMM_WORLD, ierr ) + $ MPI_COMM_WORLD, ierr ) if (mynod .eq. 0) then if( toterrs .gt. 0 ) then print *, 'Found ', toterrs, ' errors' diff --git a/3rd-party/romio341/test/rtest.in b/3rd-party/romio341/test/rtest.in index 01b43b9a4e5..40fe950b62c 100644 --- a/3rd-party/romio341/test/rtest.in +++ b/3rd-party/romio341/test/rtest.in @@ -32,7 +32,7 @@ makeeach=0 writesummaryfile=no MAKE="@MAKE@" for arg in "$@" ; do - case $arg in + case $arg in -checkonly ) runtests=0 ;; @@ -114,7 +114,7 @@ RunTest status 1 "**** Testing status.c ****" "-fname $FILENAME" # # Run Fortran tests ONLY if Fortran available -if [ @HAS_FORTRAN@ = 1 ] ; then +if [ @HAS_FORTRAN@ = 1 ] ; then RunTest fmisc 4 "**** Testing fmisc.f ****" "-fname $FILENAME" RunTest fcoll_test 4 "**** Testing fcoll_test.f ****" "-fname $FILENAME" diff --git a/3rd-party/romio341/test/runtests.in b/3rd-party/romio341/test/runtests.in index 7af4ee053cf..f109df79367 100644 --- a/3rd-party/romio341/test/runtests.in +++ b/3rd-party/romio341/test/runtests.in @@ -22,7 +22,7 @@ subset_only=0 FILENAME=test # Using shifts should remove args from the list. for arg in "$@" ; do - case $arg in + case $arg in -checkonly) shift runtests=0 @@ -69,7 +69,7 @@ for arg in "$@" ; do echo "If -check is used, only a single simple test is run; this" echo "is used to check that mpirun can run an MPI program." echo "If -subset is used, we skip tests for atomicity and shared" - echo "file pointers which can fail on some distributed file systems" + echo "file pointers which can fail on some distributed file systems" exit 1 ;; *) @@ -83,13 +83,13 @@ done # MakeExe program-name MakeExe() { - if [ -s $STOPFILE ] ; then + if [ -s $STOPFILE ] ; then echo "Found stopfile; exiting" exit 0 fi if [ ! -x $1 ] ; then $MAKE $1 - if [ ! -x $1 ] ; then + if [ ! -x $1 ] ; then echo "Could not build executable $1; aborting tests" exit 1 fi @@ -126,7 +126,7 @@ CheckOutput() { grep -v 'FORTRAN STOP' ${bfile}.out > ${bfile}.tout if diff -b $bfile.tout $stdfile > /dev/null ; then true - elif [ -s $stdfile2 ] ; then + elif [ -s $stdfile2 ] ; then # check for alternate in case configuration has fewer datatypes if diff -b $bfile.tout $stdfile2 > /dev/null ; then true @@ -155,7 +155,7 @@ RunTest() { rm -rf $FILENAME* echo "**** Testing ${1}.c ****" mpirun -np 4 ./${1} -fname $FILENAME "$@" >>${1}.out 2>1 - CheckOutput ${1} + CheckOutput ${1} CleanExe ${1} } @@ -200,13 +200,13 @@ $mpirun -np 4 ./async-multiple -fname $FILENAME CleanExe async-multiple # OutTime -if [ $subset_only -eq 0 ] ; then +if [ $subset_only -eq 0 ] ; then testfiles="$testfiles atomicity.out" \rm -f atomicity.out MakeExe atomicity \rm -f $FILENAME* echo '**** Testing atomicity.c ****' - # Atomicity test recommends at least 8 processes (separate processors + # Atomicity test recommends at least 8 processes (separate processors # even better) $mpirun -np 4 ./atomicity -fname $FILENAME # CheckOutput atomicity @@ -306,7 +306,7 @@ CleanExe hindexed # -offm 4 -hints romio_cb_write enable -fname $FILENAME #CleanExe write_all_test OutTime -if [ $subset_only -eq 0 ] ; then +if [ $subset_only -eq 0 ] ; then testfiles="$testfiles misc.out" \rm -f misc.out MakeExe misc @@ -398,7 +398,7 @@ $mpirun -np 1 ./syshints $srcdir/test_hintfile CleanExe syshints # -if [ @NOF77@ = 0 ] ; then +if [ @NOF77@ = 0 ] ; then echo "" echo "FORTRAN TESTS" OutTime @@ -451,7 +451,7 @@ fi # nodiff=1 # for file in $testfiles ; do # stdfile="${srcdir}/std/`basename $file .out`.std" -# # if basename is sendrecv or isndrcv, then we may want to test +# # if basename is sendrecv or isndrcv, then we may want to test # # with .std2 as well. We should really separate out the long double # # tests ... # if [ -s $stdfile ] ; then @@ -462,7 +462,7 @@ fi # grep -v 'FORTRAN STOP' ${file} > ${bfile} # if diff -b $bfile $stdfile > /dev/null ; then # true -# elif [ -s $stdfile2 ] ; then +# elif [ -s $stdfile2 ] ; then # # check for alternate in case configuration has fewer datatypes # if diff -b $bfile $stdfile2 > /dev/null ; then # true @@ -488,4 +488,4 @@ fi # echo "-- No differences found; test successful" # fi exit 0 - + diff --git a/3rd-party/romio341/util/romioinstall.in b/3rd-party/romio341/util/romioinstall.in index c3c09c9ec47..b41e6f01203 100644 --- a/3rd-party/romio341/util/romioinstall.in +++ b/3rd-party/romio341/util/romioinstall.in @@ -6,7 +6,7 @@ # This script needs to be built by configure. # -# This is a script to install ROMIO. It can be invoked with +# This is a script to install ROMIO. It can be invoked with # make install # # (if you used -prefix at configure time) or, @@ -51,8 +51,8 @@ failmode=soft # Shell procedures to copy files and create directories # -# We could use install, but install is too different and too hard to -# test. So here are the routines to copy file, make directories, and +# We could use install, but install is too different and too hard to +# test. So here are the routines to copy file, make directories, and # replace #...# and @...@ in files CP=cp # @@ -76,14 +76,14 @@ elif [ -d $1 ] ; then echo ">>> $1 is a directory; not copied <<<" errs=`expr $errs + 1` if [ $failmode = "hard" ] ; then exit 1 ; fi -elif [ ! -f $1 ] ; then +elif [ ! -f $1 ] ; then echo "**File $1 does not exist (or is not a regular file)!" errs=`expr $errs + 1` if [ $failmode = "hard" ] ; then exit 1 ; fi else if [ $verbose = 1 ] ; then echo "Copying $1 to $dest" ; fi # We don't delete the file in the event that we are copying the - # file over itself (we SHOULD check for that separately, by checking + # file over itself (we SHOULD check for that separately, by checking # that directories are distinct) #if [ -f $dest ] ; then $Show rm -f $dest ; fi $Show $CP $1 $dest @@ -115,7 +115,7 @@ CopyFileP() { # for arg in "$@" ; do - case "$arg" in + case "$arg" in -prefix=*) PREFIX=`echo $arg | sed -e 's/-prefix=//'` prefix=$PREFIX @@ -136,7 +136,7 @@ if test -z "$prefix" ; then fi # Uninstall filename -if [ -z "$UNINSTALLFILE" ] ; then +if [ -z "$UNINSTALLFILE" ] ; then UNINSTALLFILE="$sbindir/romiouninstall" MkDir `dirname $UNINSTALLFILE` fi @@ -166,13 +166,13 @@ if test "$WANT_INSTALL" = "1"; then #cp -r $ROMIO_HOME/lib $PREFIX #chmod 755 $PREFIX/lib for file in $TOP_BUILD_DIR/lib/* ; do - if [ -f $file ] ; then - CopyFileP $file $libdir + if [ -f $file ] ; then + CopyFileP $file $libdir fi done - # Romio also copies directories in the lib directory. + # Romio also copies directories in the lib directory. - if [ -z "$mandir" ] ; then + if [ -z "$mandir" ] ; then mandir=$PREFIX/man fi echo "copying directory $ROMIO_HOME/man to $mandir" @@ -186,7 +186,7 @@ if test "$WANT_INSTALL" = "1"; then echo "copying directory $ROMIO_HOME/test to $exampledir" MkDir $exampledir MkDir $exampledir/std - for file in $ROMIO_HOME/test/std/* ; do + for file in $ROMIO_HOME/test/std/* ; do CopyFile $file $exampledir/std done CopyFile test/Makefile $exampledir @@ -205,9 +205,9 @@ if test "$WANT_INSTALL" = "1"; then NEWLIB=`echo $TMPNEWLIB | sed 's/\//\\\\\//g'` sed -e 5s/INCLUDE_DIR[\ ]*=\ [/a-z0-9.A-Z_-]*/INCLUDE_DIR\ =\ $NEWINC/ \ -e 6s/LIBS[\ ]*=\ [/a-z0-9.A-Z_-]*/LIBS\ =\ $NEWLIB/ $exampledir/Makefile\ - > $exampledir/.romiotmp + > $exampledir/.romiotmp mv $exampledir/.romiotmp $exampledir/Makefile - + # MkDir $sbindir echo "rm -f $UNINSTALLFILE" >> $UNINSTALLFILE diff --git a/3rd-party/romio341/util/tarch b/3rd-party/romio341/util/tarch index 1c752765364..d2888d2cab4 100755 --- a/3rd-party/romio341/util/tarch +++ b/3rd-party/romio341/util/tarch @@ -60,7 +60,7 @@ for LARCH in $ARCHLIST ; do case $LARCH in SUPER-UX) FARCH=SX4; break ;; AIX|RIOS) FARCH=rs6000; break ;; - HP-UX) + HP-UX) if [ -a /dev/kmem ] ; then FARCH=hpux ; else @@ -73,9 +73,9 @@ for LARCH in $ARCHLIST ; do GARCH=$LARCH ;; sun4*) Version=`$UNAME -r` - # In "improving" SunOS, the useful feature of "substr" was withdrawn - # from expr. Can't let the users have life too easy, can we? This - # means that we can't just use + # In "improving" SunOS, the useful feature of "substr" was withdrawn + # from expr. Can't let the users have life too easy, can we? This + # means that we can't just use # set MajorVersion = `expr substr $Version 1 1` # because it won't work on Solaris systems. The following should work # on both: @@ -98,8 +98,8 @@ for LARCH in $ARCHLIST ; do break ;; mips|dec-5000) FARCH=dec5000 ; break ;; - next) FARCH=NeXT ; break ;; - KSR1|KSR2) FARCH=ksr ; break ;; + next) FARCH=NeXT ; break ;; + KSR1|KSR2) FARCH=ksr ; break ;; FreeBSD) FARCH=freebsd ; break ;; OpenBSD) FARCH=openbsd ; break ;; NetBSD) FARCH=netbsd ; break ;; diff --git a/3rd-party/treematch/IntConstantInitializedVector.c b/3rd-party/treematch/IntConstantInitializedVector.c index 25a6708b2c9..63394928b6b 100644 --- a/3rd-party/treematch/IntConstantInitializedVector.c +++ b/3rd-party/treematch/IntConstantInitializedVector.c @@ -7,7 +7,7 @@ int intCIV_isInitialized(int_CIVector * v, int i) if(v->top == 0) return 0; if(v->from[i] >= 0) - if(v->from[i] < v->top && v->to[v->from[i]] == i) + if(v->from[i] < v->top && v->to[v->from[i]] == i) return 1; return 0; } @@ -44,7 +44,7 @@ int intCIV_set(int_CIVector * v, int i, int val) v->top++; } v->vec[i] = val; - return 0; + return 0; } int intCIV_get(int_CIVector * v, int i) diff --git a/3rd-party/treematch/PriorityQueue.c b/3rd-party/treematch/PriorityQueue.c index 83e08ad2f2d..f0f902753be 100644 --- a/3rd-party/treematch/PriorityQueue.c +++ b/3rd-party/treematch/PriorityQueue.c @@ -10,8 +10,8 @@ int compfunc(const FiboNode * const, const FiboNode * const); static int compFunc(const FiboNode * const node1, const FiboNode * const node2) { - return - ( ( ((QueueElement*)(node1))->key > ((QueueElement*)(node2))->key ) ? -1 : 1); + return + ( ( ((QueueElement*)(node1))->key > ((QueueElement*)(node2))->key ) ? -1 : 1); } int PQ_init(PriorityQueue * const q, int size) @@ -26,7 +26,7 @@ int PQ_init(PriorityQueue * const q, int size) void PQ_exit(PriorityQueue * const q) { - + int i; for(i = 0; i < q->size; i++) { @@ -52,7 +52,7 @@ int PQ_isEmpty(PriorityQueue * const q) { FiboTree * tree = (FiboTree *)q; /* if the tree root is linked to itself then the tree is empty */ - if(&(tree->rootdat) == (tree->rootdat.linkdat.nextptr)) + if(&(tree->rootdat) == (tree->rootdat.linkdat.nextptr)) return 1; return 0; } @@ -145,7 +145,7 @@ void PQ_decreaseElementKey(PriorityQueue * const q, QueueElement * const e, doub void PQ_adjustElementKey(PriorityQueue * const q, QueueElement * const e, double i) { if(e->isInQueue) - { + { PQ_deleteElement(q, e); e->key = i; PQ_insertElement(q, e); diff --git a/3rd-party/treematch/PriorityQueue.h b/3rd-party/treematch/PriorityQueue.h index c9ef1d2291a..83554d4168f 100644 --- a/3rd-party/treematch/PriorityQueue.h +++ b/3rd-party/treematch/PriorityQueue.h @@ -25,7 +25,7 @@ typedef struct PriorityQueue_ /* PQ_init initiates a PriorityQueue with a size given in argument and sets compFunc as comparison function. Note that you have to allocate memory to the PriorityQueue pointer before calling this function. - Returns : + Returns : 0 if success !0 if failed @@ -45,7 +45,7 @@ int PQ_isEmpty(PriorityQueue * const); /* PQ_insertElement inserts the given QueueElement in the given PriorityQueue */ -void PQ_insertElement(PriorityQueue * const, QueueElement * const); +void PQ_insertElement(PriorityQueue * const, QueueElement * const); /* PQ_deleteElement delete the element given in argument from the PriorityQueue. */ diff --git a/3rd-party/treematch/fibo.c b/3rd-party/treematch/fibo.c index 97070e7273a..dd0634c7b0c 100644 --- a/3rd-party/treematch/fibo.c +++ b/3rd-party/treematch/fibo.c @@ -8,13 +8,13 @@ ** use, modify and/or redistribute the software under the terms of the ** CeCILL-B license as circulated by CEA, CNRS and INRIA at the following ** URL: "http://www.cecill.info". -** +** ** As a counterpart to the access to the source code and rights to copy, ** modify and redistribute granted by the license, users are provided ** only with a limited warranty and the software's author, the holder of ** the economic rights, and the successive licensors have only limited ** liability. -** +** ** In this respect, the user's attention is drawn to the risks associated ** with loading, using, modifying and/or developing or reproducing the ** software by the user in light of its specific status of free software, @@ -25,7 +25,7 @@ ** their requirements in conditions enabling the security of their ** systems and/or data to be ensured and, more generally, to use and ** operate it in the same conditions as regards security. -** +** ** The fact that you are presently reading this means that you have had ** knowledge of the CeCILL-B license and that you accept its terms. */ diff --git a/3rd-party/treematch/fibo.h b/3rd-party/treematch/fibo.h index f7239ce50b7..7df86d72884 100644 --- a/3rd-party/treematch/fibo.h +++ b/3rd-party/treematch/fibo.h @@ -8,13 +8,13 @@ ** use, modify and/or redistribute the software under the terms of the ** CeCILL-B license as circulated by CEA, CNRS and INRIA at the following ** URL: "http://www.cecill.info". -** +** ** As a counterpart to the access to the source code and rights to copy, ** modify and redistribute granted by the license, users are provided ** only with a limited warranty and the software's author, the holder of ** the economic rights, and the successive licensors have only limited ** liability. -** +** ** In this respect, the user's attention is drawn to the risks associated ** with loading, using, modifying and/or developing or reproducing the ** software by the user in light of its specific status of free software, @@ -25,7 +25,7 @@ ** their requirements in conditions enabling the security of their ** systems and/or data to be ensured and, more generally, to use and ** operate it in the same conditions as regards security. -** +** ** The fact that you are presently reading this means that you have had ** knowledge of the CeCILL-B license and that you accept its terms. */ @@ -73,7 +73,7 @@ typedef struct FiboLink_ { "bitsizeof (INT)", so it can hold on an "int". The flag value is stored in the lowest bit of the value. */ - + typedef struct FiboNode_ { struct FiboNode_ * pareptr; /*+ Pointer to parent element, if any +*/ diff --git a/3rd-party/treematch/k-partitioning.h b/3rd-party/treematch/k-partitioning.h index 8db2392e1a5..0dca81d8f3e 100644 --- a/3rd-party/treematch/k-partitioning.h +++ b/3rd-party/treematch/k-partitioning.h @@ -12,9 +12,9 @@ - nb_constraints : the number of constraints - greedy_trials : the number of trials to build the partition vector with kpartition_greedy - 0 : cyclic distribution of vertices - - > 0 : use of kpartition_greedy with greedy_trials number of trials + - > 0 : use of kpartition_greedy with greedy_trials number of trials */ - + int* kPartitioning(double ** comm, int n, int k, int * const constraints, int nb_constraints, int greedy_trials); #endif /*K_PARTITIONING*/ diff --git a/3rd-party/treematch/tm_bucket.h b/3rd-party/treematch/tm_bucket.h index 433d4816466..aed948f2ea4 100644 --- a/3rd-party/treematch/tm_bucket.h +++ b/3rd-party/treematch/tm_bucket.h @@ -28,7 +28,7 @@ typedef struct{ typedef _bucket_list_t *bucket_list_t; -double bucket_grouping(tm_affinity_mat_t *aff_mat,tm_tree_t *tab_node, tm_tree_t *new_tab_node, +double bucket_grouping(tm_affinity_mat_t *aff_mat,tm_tree_t *tab_node, tm_tree_t *new_tab_node, int arity,int M); int try_add_edge(tm_tree_t *tab_node, tm_tree_t *parent,int arity,int i,int j,int *nb_groups); #endif diff --git a/3rd-party/treematch/tm_kpartitioning.c b/3rd-party/treematch/tm_kpartitioning.c index 09cb35add50..de90efd03f3 100644 --- a/3rd-party/treematch/tm_kpartitioning.c +++ b/3rd-party/treematch/tm_kpartitioning.c @@ -87,7 +87,7 @@ SCOTCH_Graph* com_mat_to_scotch_graph(com_mat_t *com_mat, int n){ } } } - + /* for(i = baseval; i < com_mat->n ; i++) { */ /* verttab[i] = edgeNum; */ @@ -116,7 +116,7 @@ SCOTCH_Graph* com_mat_to_scotch_graph(com_mat_t *com_mat, int n){ edgenbr = edgeNum; SCOTCH_graphInit(graphptr); - SCOTCH_graphBuild(graphptr, 0, vertnbr, verttab, verttab+1, NULL, NULL, edgenbr, edgetab, edlotab); + SCOTCH_graphBuild(graphptr, 0, vertnbr, verttab, verttab+1, NULL, NULL, edgenbr, edgetab, edlotab); return graphptr; } @@ -156,7 +156,7 @@ int *kpartition_scotch(int k, com_mat_t *com_mat, int n, int *constraints, int SCOTCH_Num *parttab = (SCOTCH_Num *)MALLOC(sizeof(SCOTCH_Num) * n); int *partition = (int *)MALLOC(sizeof(int) * n); int i, j; - int *nb_dumb = (int *)MALLOC(sizeof(int) * k); /*number of dumb vertices per partition */ + int *nb_dumb = (int *)MALLOC(sizeof(int) * k); /*number of dumb vertices per partition */ int dumb_id, min_nb_dumb = n, sum_dumb = 0, p; /* if(SCOTCH_graphCheck(graphptr) == 1){ */ /* fprintf(stderr,"Bad scotch graph! Exiting program...\n"); */ @@ -193,23 +193,23 @@ int *kpartition_scotch(int k, com_mat_t *com_mat, int n, int *constraints, int start=end; } - /* Imagine we have n=12, k=3, nb_dumb[0] = 3, nb_dumb[1] = 2, nb_dumb[2] = 3, hence min_nb_dumb = 2 and sum_dumb = 8 + /* Imagine we have n=12, k=3, nb_dumb[0] = 3, nb_dumb[1] = 2, nb_dumb[2] = 3, hence min_nb_dumb = 2 and sum_dumb = 8 So, we have 8 fix vertices and 12-8 = 4 free vertices - We want scotch to allocate the 6 free vertices such that the whole partition is balanced (4 vertex in each) : + We want scotch to allocate the 6 free vertices such that the whole partition is balanced (4 vertex in each) : 1 in parttion 0, 2 in partition 1 and 1 in partition 2. - To do so we can fill partab as follows: + To do so we can fill partab as follows: {-1, -1, -1, -1, 0, 0, 0, 1, 1, 2, 2, 2} and call scotch with a n=12 vertices graph with SCOTCH_STRATBALANCE dumb_id = n - sum_dumb; for(i = 0;i4) @@ -259,7 +259,7 @@ int *kpartition_scotch(int k, com_mat_t *com_mat, int n, int *constraints, int } }else{ if(tm_get_verbose_level()>=CRITICAL){ - fprintf(stderr,"Scotch Partitionning failed\n"); + fprintf(stderr,"Scotch Partitionning failed\n"); } exit(-1); } @@ -280,7 +280,7 @@ int *kpartition_scotch(int k, com_mat_t *com_mat, int n, int *constraints, int SCOTCH_memFree(graphptr); FREE(parttab); FREE(nb_dumb); - + return partition; } @@ -714,7 +714,7 @@ static void display_partition(int *partition, int *local_vertices, int n, int de } } fprintf(stdout,"\n"); - } + } } void kpartition_build_level_topology(tm_tree_t *cur_node, com_mat_t *com_mat, int N, int depth, diff --git a/3rd-party/treematch/tm_kpartitioning.h b/3rd-party/treematch/tm_kpartitioning.h index 09c2227c066..7ea02947cdd 100644 --- a/3rd-party/treematch/tm_kpartitioning.h +++ b/3rd-party/treematch/tm_kpartitioning.h @@ -1,7 +1,7 @@ typedef struct _com_mat_t{ - double **comm; + double **comm; int n; /*comm is of size n by n the other element are zeroes*/ - + } com_mat_t; diff --git a/3rd-party/treematch/tm_mapping.c b/3rd-party/treematch/tm_mapping.c index b30846c0ccd..2c31415f72a 100644 --- a/3rd-party/treematch/tm_mapping.c +++ b/3rd-party/treematch/tm_mapping.c @@ -196,7 +196,7 @@ static char *parse_line(int i, double **mat, double *sum_row, int N, char *data, mat[i][j] = val; /* printf("mat[%d][%d] = %ld\n",i,j, val); */ if (val){ - (*nnz)++; + (*nnz)++; sum_row[i] += val; } j++; @@ -228,13 +228,13 @@ static long int init_mat_mmap(char *filename,int N, double **mat, double *sum_ro } char* data = (char*) mmap(NULL, filesize, PROT_READ, MAP_SHARED, fd, 0); - + if(data == MAP_FAILED){ if(vl >= CRITICAL) fprintf(stderr,"Cannot mmap %s\n",filename); exit(-1); } - + i = 0; while(i= CRITICAL) fprintf(stderr,"Cannot open %s\n",filename); @@ -263,7 +263,7 @@ static long int init_mat_long(char *filename,int N, double **mat, double *sum_ro i = 0; while(i= INFO) printf("Reading matrix file: %s\n",filename); @@ -342,9 +342,9 @@ tm_affinity_mat_t *tm_load_aff_mat(char *filename) /* the last column stores the sum of the line*/ mat[i] = (double*)MALLOC((order)*sizeof(double)); /* on my mac parsing large file is better done with fopen than mmap */ - #ifdef __MACH__ + #ifdef __MACH__ if (get_filesize(filename) > 1024*1024*1014) { - nnz = init_mat_long(filename,order, mat, sum_row); + nnz = init_mat_long(filename,order, mat, sum_row); if(tm_get_verbose_level() >= DEBUG) printf("New parser\n"); }else{ @@ -353,11 +353,11 @@ tm_affinity_mat_t *tm_load_aff_mat(char *filename) printf("MMap parser\n"); } #else - nnz = init_mat_mmap(filename,order, mat, sum_row); + nnz = init_mat_mmap(filename,order, mat, sum_row); if(tm_get_verbose_level() >= DEBUG) printf("MMap parser\n"); #endif - + /* TIC; */ /* init_mat(filename,order, mat, sum_row); */ /* double duration_fl = TOC; */ diff --git a/3rd-party/treematch/tm_mt.h b/3rd-party/treematch/tm_mt.h index 58f50d8f509..63ca9ac1be4 100644 --- a/3rd-party/treematch/tm_mt.h +++ b/3rd-party/treematch/tm_mt.h @@ -2,7 +2,7 @@ void init_genrand(unsigned long s); void init_by_array(unsigned long init_key[], int key_length); /* generates a random number on the interval [0,0x7fffffff] */ -unsigned long genrand_int32(void); +unsigned long genrand_int32(void); long genrand_int31(void); double genrand_real1(void); double genrand_real2(void); diff --git a/3rd-party/treematch/tm_topology.c b/3rd-party/treematch/tm_topology.c index 92143f7a52d..a54ff3b892a 100644 --- a/3rd-party/treematch/tm_topology.c +++ b/3rd-party/treematch/tm_topology.c @@ -209,9 +209,9 @@ int symetric(hwloc_topology_t topology) static void build_process_tab_id(tm_topology_t *topology, hwloc_obj_t *objs, char* filename){ unsigned int i,j; - unsigned int nb_nodes = topology->nb_proc_units; + unsigned int nb_nodes = topology->nb_proc_units; int vl = tm_get_verbose_level(); - + /* Build process id tab */ if(numbering == TM_NUMBERING_LOGICAL){ for (i = 0; i < nb_nodes; i++){ @@ -290,7 +290,7 @@ tm_topology_t* hwloc_to_tm(char *filename) /* work on depth */ topodepth = hwloc_topology_get_depth(topology); - + res = (tm_topology_t*)MALLOC(sizeof(tm_topology_t)); res->oversub_fact = 1; res->nb_constraints = 0; @@ -311,19 +311,19 @@ tm_topology_t* hwloc_to_tm(char *filename) objs[0] = hwloc_get_next_obj_by_depth(topology, depth, NULL); hwloc_get_closest_objs(topology, objs[0], objs+1, nb_nodes-1); res->arity[depth] = objs[0]->arity; - + if(vl >= DEBUG) printf("\n--%d(%d) **%d**:--\n",res->arity[depth],nb_nodes,res->arity[0]); - + if (depth == topodepth -1){ res->nb_constraints = nb_nodes; res->nb_proc_units = nb_nodes; res->node_id = (int*)MALLOC(sizeof(int)*nb_nodes); res->node_rank = (int*)MALLOC(sizeof(int)*nb_nodes); - + build_process_tab_id(res, objs, filename); - + } FREE(objs); @@ -383,7 +383,7 @@ tm_topology_t* tm_get_local_topology_with_hwloc(void) res->nb_nodes = (size_t*)MALLOC(sizeof(size_t)*res->nb_levels); res->arity = (int*)MALLOC(sizeof(int)*res->nb_levels); res->oversub_fact = 1; //defaut - res->cost = NULL; + res->cost = NULL; /* Build TreeMatch topology */ for( depth = 0 ; depth < topodepth ; depth++ ){ @@ -450,7 +450,7 @@ void tm_display_topology(tm_topology_t *topology) int i; unsigned long id; for( i = 0 ; i < topology->nb_levels ; i++ ){ - printf("Level %d with arity %d ", i, topology->arity[i]); + printf("Level %d with arity %d ", i, topology->arity[i]); printf("\n"); } @@ -477,10 +477,10 @@ void tm_display_arity(tm_topology_t *topology){ int depth; for(depth=0; depth < topology->nb_levels; depth++){ printf("%d",topology->arity[depth]); - if(topology->cost) - printf("(%lf)",topology->cost[depth]); - else - printf(":"); + if(topology->cost) + printf("(%lf)",topology->cost[depth]); + else + printf(":"); } printf("\n"); } @@ -837,7 +837,7 @@ void build_synthetic_proc_id(tm_topology_t *topology) for( i = 0 ; i < topology->nb_levels ; i++ ){ /* printf("n= %lld, arity := %d\n",n, topology->arity[i]); */ topology->nb_nodes[i] = n; - + if (i == topology->nb_levels-1){ topology->node_rank = (int*)MALLOC(sizeof(int)*n); topology->node_id = (int*)MALLOC(sizeof(int)*n); @@ -846,10 +846,10 @@ void build_synthetic_proc_id(tm_topology_t *topology) fprintf(stderr,"Cannot allocate last level (of size %ld) of the topology\n", (unsigned long int)n); exit(-1); } - + topology->nb_constraints = n; topology->nb_proc_units = n; - + for( j = 0 ; j < n ; j++ ){ topology->node_id[j] = j; topology->node_rank[j] = j; @@ -892,8 +892,8 @@ void tm_enable_oversubscribing(tm_topology_t *topology, unsigned int oversub_fac } FREE(topology->node_id); FREE(topology->node_rank); - topology->node_id = node_id; - topology->node_rank = node_rank; + topology->node_id = node_id; + topology->node_rank = node_rank; } } diff --git a/3rd-party/treematch/tm_tree.c b/3rd-party/treematch/tm_tree.c index f0c8d77656b..3a819669b6e 100644 --- a/3rd-party/treematch/tm_tree.c +++ b/3rd-party/treematch/tm_tree.c @@ -243,7 +243,7 @@ void partial_aggregate_aff_mat (int nb_args, void **args, int thread_id){ int M = *(int*)args[4]; double **mat = (double**)args[5]; double *sum_row = (double*)args[6]; - long int *nnz = (long int *)args[7]; + long int *nnz = (long int *)args[7]; int i, j, i1, j1; int id1, id2; @@ -283,7 +283,7 @@ static tm_affinity_mat_t *aggregate_aff_mat(tm_tree_t *tab_node, tm_affinity_mat double **new_mat = NULL, **old_mat = aff_mat->mat; double *sum_row = NULL; long int nnz = 0; - + new_mat = (double**)MALLOC(M*sizeof(double*)); for( i = 0 ; i < M ; i++ ) new_mat[i] = (double*)CALLOC((M), sizeof(double)); @@ -337,7 +337,7 @@ static tm_affinity_mat_t *aggregate_aff_mat(tm_tree_t *tab_node, tm_affinity_mat FREE(works); FREE(nnz_tab); - + }else{ for( i = 0 ; i < M ; i++ ) for( j = 0 ; j < M ; j++ ){ @@ -357,7 +357,7 @@ static tm_affinity_mat_t *aggregate_aff_mat(tm_tree_t *tab_node, tm_affinity_mat } } } - + return new_affinity_mat(new_mat, sum_row, M, nnz); } @@ -1551,7 +1551,7 @@ void fast_group(tm_affinity_mat_t *aff_mat, tm_tree_t *tab_node, tm_tree_t *par - + double fast_grouping(tm_affinity_mat_t *aff_mat, tm_tree_t *tab_node, tm_tree_t *new_tab_node, int arity, int solution_size, double nb_groups) { @@ -1607,9 +1607,9 @@ static double k_partition_grouping(tm_affinity_mat_t *aff_mat, tm_tree_t *tab_no j = j_tab[i]; j_tab[i]++; new_tab_node[i].child[j] = &tab_node[k]; - new_tab_node[i].child[j]->parent = &new_tab_node[i]; + new_tab_node[i].child[j]->parent = &new_tab_node[i]; } - + for( i = 0 ; i < solution_size ; i++ ){ new_tab_node[i].arity = arity; update_val(aff_mat, &new_tab_node[i]); @@ -1713,7 +1713,7 @@ tm_affinity_mat_t *build_cost_matrix(tm_affinity_mat_t *aff_mat, double* obj_wei double avg; int i, j, mat_order; long int nnz = 0; - + if(!obj_weight) return aff_mat; @@ -1920,7 +1920,7 @@ void group_nodes(tm_affinity_mat_t *aff_mat, tm_tree_t *tab_node, tm_tree_t *new } } } - + /* Reorder solution and apply it to new_tab_node: returned array */ qsort(best_selection, solution_size, sizeof(group_list_t*), group_list_id); @@ -2129,7 +2129,7 @@ tm_tree_t *build_level_topology(tm_tree_t *tab_node, tm_affinity_mat_t *aff_mat, for( i = 0 ; i < M ; i++ ){ tm_tree_t **list_child = NULL; list_child = (tm_tree_t**)CALLOC(arity, sizeof(tm_tree_t*)); - set_node(&new_tab_node[i], list_child, arity, NULL, i, 0, tab_node, depth); + set_node(&new_tab_node[i], list_child, arity, NULL, i, 0, tab_node, depth); } duration = TOC; if(verbose_level >= INFO) diff --git a/3rd-party/treematch/tm_verbose.c b/3rd-party/treematch/tm_verbose.c index e360d7122b9..3fdeac7addd 100644 --- a/3rd-party/treematch/tm_verbose.c +++ b/3rd-party/treematch/tm_verbose.c @@ -22,7 +22,7 @@ int tm_open_verbose_file(char *filename){ int tm_close_verbose_file(void){ if(output != NULL) return fclose(output); - + return 0; } diff --git a/3rd-party/treematch/treematch.h b/3rd-party/treematch/treematch.h index e15e9ab5a4a..69f593473e1 100644 --- a/3rd-party/treematch/treematch.h +++ b/3rd-party/treematch/treematch.h @@ -66,7 +66,7 @@ typedef struct { int **free_nodes; /* array of node that are free: useful to simulate batch scheduler*/ double *cost; /* Cost of the communication depending on the distance: cost[i] is the cost for communicating at distance nb_levels-i*/ - + int *constraints; /* Array of constraints: id of the nodes where it is possible to map processes */ int nb_constraints; /* Size of the above array */ int oversub_fact; /* Maximum number of processes to be mapped on a given node */ diff --git a/3rd-party/treematch/uthash.h b/3rd-party/treematch/uthash.h index 3a3dd9a69a2..7b98cad5cc9 100644 --- a/3rd-party/treematch/uthash.h +++ b/3rd-party/treematch/uthash.h @@ -22,7 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef UTHASH_H -#define UTHASH_H +#define UTHASH_H #include /* memcmp,strlen */ #include /* ptrdiff_t */ @@ -49,7 +49,7 @@ do { char **_da_dst = (char**)(&(dst)); \ *_da_dst = (char*)(src); \ } while(0) -#else +#else #define DECLTYPE_ASSIGN(dst,src) \ do { \ (dst) = DECLTYPE(dst)(src); \ @@ -121,9 +121,9 @@ do { HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1))) #else -#define HASH_BLOOM_MAKE(tbl) -#define HASH_BLOOM_FREE(tbl) -#define HASH_BLOOM_ADD(tbl,hashv) +#define HASH_BLOOM_MAKE(tbl) +#define HASH_BLOOM_FREE(tbl) +#define HASH_BLOOM_ADD(tbl,hashv) #define HASH_BLOOM_TEST(tbl,hashv) (1) #endif @@ -148,7 +148,7 @@ do { #define HASH_ADD(hh,head,fieldname,keylen_in,add) \ HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add) - + #define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \ do { \ unsigned _ha_bkt; \ @@ -300,10 +300,10 @@ do { } \ } while (0) #else -#define HASH_FSCK(hh,head) +#define HASH_FSCK(hh,head) #endif -/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to +/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to * the descriptor to which this macro is defined for tuning the hash function. * The app can #include to get the prototype for write(2). */ #ifdef HASH_EMIT_KEYS @@ -313,12 +313,12 @@ do { write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \ write(HASH_EMIT_KEYS, keyptr, fieldlen); \ } while (0) -#else -#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) +#else +#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) #endif /* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */ -#ifdef HASH_FUNCTION +#ifdef HASH_FUNCTION #define HASH_FCN HASH_FUNCTION #else #define HASH_FCN HASH_JEN @@ -335,7 +335,7 @@ do { } while (0) -/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at +/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */ #define HASH_SAX(key,keylen,num_bkts,hashv,bkt) \ do { \ @@ -356,7 +356,7 @@ do { hashv = (hashv * 16777619) ^ _hf_key[_fn_i]; \ bkt = hashv & (num_bkts-1); \ } while(0); - + #define HASH_OAT(key,keylen,num_bkts,hashv,bkt) \ do { \ unsigned _ho_i; \ @@ -485,14 +485,14 @@ do { #ifdef HASH_USING_NO_STRICT_ALIASING /* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads. * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error. - * MurmurHash uses the faster approach only on CPU's where we know it's safe. + * MurmurHash uses the faster approach only on CPU's where we know it's safe. * * Note the preprocessor built-in defines can be emitted using: * * gcc -m64 -dM -E - < /dev/null (on gcc) * cc -## a.c (where a.c is a simple test file) (Sun Studio) */ -#if (defined(__i386__) || defined(__x86_64__)) +#if (defined(__i386__) || defined(__x86_64__)) #define MUR_GETBLOCK(p,i) p[i] #else /* non intel */ #define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0) @@ -562,7 +562,7 @@ do { \ #endif /* HASH_USING_NO_STRICT_ALIASING */ /* key comparison function; return 0 if keys equal */ -#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) +#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) /* iterate over items in a known bucket to find desired item */ #define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out) \ @@ -603,36 +603,36 @@ do { } \ if (hh_del->hh_next) { \ hh_del->hh_next->hh_prev = hh_del->hh_prev; \ - } + } /* Bucket expansion has the effect of doubling the number of buckets * and redistributing the items into the new buckets. Ideally the * items will distribute more or less evenly into the new buckets * (the extent to which this is true is a measure of the quality of - * the hash function as it applies to the key domain). - * + * the hash function as it applies to the key domain). + * * With the items distributed into more buckets, the chain length * (item count) in each bucket is reduced. Thus by expanding buckets - * the hash keeps a bound on the chain length. This bounded chain + * the hash keeps a bound on the chain length. This bounded chain * length is the essence of how a hash provides constant time lookup. - * + * * The calculation of tbl->ideal_chain_maxlen below deserves some * explanation. First, keep in mind that we're calculating the ideal * maximum chain length based on the *new* (doubled) bucket count. * In fractions this is just n/b (n=number of items,b=new num buckets). - * Since the ideal chain length is an integer, we want to calculate + * Since the ideal chain length is an integer, we want to calculate * ceil(n/b). We don't depend on floating point arithmetic in this * hash, so to calculate ceil(n/b) with integers we could write - * + * * ceil(n/b) = (n/b) + ((n%b)?1:0) - * + * * and in fact a previous version of this hash did just that. * But now we have improved things a bit by recognizing that b is * always a power of two. We keep its base 2 log handy (call it lb), * so now we can write this with a bit shift and logical AND: - * + * * ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0) - * + * */ #define HASH_EXPAND_BUCKETS(tbl) \ do { \ @@ -684,7 +684,7 @@ do { /* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */ -/* Note that HASH_SORT assumes the hash handle name to be hh. +/* Note that HASH_SORT assumes the hash handle name to be hh. * HASH_SRT was added to allow the hash handle name to be passed in. */ #define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn) #define HASH_SRT(hh,head,cmpfcn) \ @@ -766,10 +766,10 @@ do { } \ } while (0) -/* This function selects items from one hash into another hash. - * The end result is that the selected items have dual presence - * in both hashes. There is no copy of the items made; rather - * they are added into the new hash through a secondary hash +/* This function selects items from one hash into another hash. + * The end result is that the selected items have dual presence + * in both hashes. There is no copy of the items made; rather + * they are added into the new hash through a secondary hash * hash handle that must be present in the structure. */ #define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \ do { \ @@ -823,7 +823,7 @@ do { #ifdef NO_DECLTYPE #define HASH_ITER(hh,head,el,tmp) \ for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL); \ - el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL)) + el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL)) #else #define HASH_ITER(hh,head,el,tmp) \ for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL); \ @@ -831,7 +831,7 @@ for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL); #endif /* obtain a count of items in the hash */ -#define HASH_COUNT(head) HASH_CNT(hh,head) +#define HASH_COUNT(head) HASH_CNT(hh,head) #define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0) typedef struct UT_hash_bucket { @@ -840,7 +840,7 @@ typedef struct UT_hash_bucket { /* expand_mult is normally set to 0. In this situation, the max chain length * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If - * the bucket's chain exceeds this length, bucket expansion is triggered). + * the bucket's chain exceeds this length, bucket expansion is triggered). * However, setting expand_mult to a non-zero value delays bucket expansion * (that would be triggered by additions to this particular bucket) * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH. @@ -848,7 +848,7 @@ typedef struct UT_hash_bucket { * multiplier is to reduce bucket expansions, since they are expensive, in * situations where we know that a particular bucket tends to be overused. * It is better to let its chain length grow to a longer yet-still-bounded - * value, than to do an O(n) bucket expansion too often. + * value, than to do an O(n) bucket expansion too often. */ unsigned expand_mult; @@ -874,7 +874,7 @@ typedef struct UT_hash_table { * hash distribution; reaching them in a chain traversal takes >ideal steps */ unsigned nonideal_items; - /* ineffective expands occur when a bucket doubling was performed, but + /* ineffective expands occur when a bucket doubling was performed, but * afterward, more than half the items in the hash had nonideal chain * positions. If this happens on two consecutive expansions we inhibit any * further expansion, as it's not helping; this happens when the hash