diff --git a/autogen.pl b/autogen.pl index 480d69518de..a2cecd6ffcf 100755 --- a/autogen.pl +++ b/autogen.pl @@ -984,7 +984,7 @@ sub patch_autotools_output { $c =~ s/$search_string/$replace_string/; # Newer versions of Libtool have the previous patch already. Therefore, - # we add the support for convenience libraries separetly + # we add the support for convenience libraries separately my $search_string = "whole_archive_flag_spec${tag}=" . '\n\s+' . "tmp_sharedflag='--shared' ;;" . '\n\s+' . 'nagfor\052.*# NAGFOR 5.3\n\s+' . @@ -1344,7 +1344,7 @@ sub replace_config_sub_guess { #--------------------------------------------------------------------------- -# Verify that we're in the OMPI root directorty by checking for a token file. +# Verify that we're in the OMPI root directory by checking for a token file. my_die "Not at the root directory of an OMPI source tree" if (! -f "config/opal_mca.m4"); diff --git a/config/ompi_setup_mpi_fortran.m4 b/config/ompi_setup_mpi_fortran.m4 index d9a3a5089a2..693089848dc 100644 --- a/config/ompi_setup_mpi_fortran.m4 +++ b/config/ompi_setup_mpi_fortran.m4 @@ -644,7 +644,7 @@ end type test_mpi_handle], AC_SUBST(OMPI_FC_ABSOLUTE) AC_DEFINE_UNQUOTED(OMPI_FC, ["$OMPI_FC"], [Underlying Fortran compiler]) AC_DEFINE_UNQUOTED(OMPI_FC_ABSOLUTE, ["$OMPI_FC_ABSOLUTE"], - [Absolutey path to the underlying Fortran compiler found by configure]) + [Absolute path to the underlying Fortran compiler found by configure]) # These go into ompi/info/param.c AC_DEFINE_UNQUOTED([OMPI_FORTRAN_BUILD_SIZEOF], diff --git a/config/opal_mca.m4 b/config/opal_mca.m4 index 251cce134a1..8f1363650c1 100644 --- a/config/opal_mca.m4 +++ b/config/opal_mca.m4 @@ -872,7 +872,7 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but # MCA_PROCESS_DEAD_COMPONENT(project_name (1), framework_name (2), # component_name (3)) # ---------------------------------------------------------------- -# Finall setup work for a component that can not be built. Do the +# Final setup work for a component that can not be built. Do the # last minute checks to make sure the user isn't doing something # stupid. # diff --git a/config/opal_setup_ft.m4 b/config/opal_setup_ft.m4 index 447d3adcb0b..c80c9858fe2 100644 --- a/config/opal_setup_ft.m4 +++ b/config/opal_setup_ft.m4 @@ -21,8 +21,8 @@ dnl # - LAM (synonym for 'cr' currently) # - cr # /* General FT sections */ -# #if OPAL_ENABLE_FT == 0 /* FT Disabled globaly */ -# #if OPAL_ENABLE_FT == 1 /* FT Enabled globaly */ +# #if OPAL_ENABLE_FT == 0 /* FT Disabled globally */ +# #if OPAL_ENABLE_FT == 1 /* FT Enabled globally */ # /* ULFM Specific sections */ # #if OPAL_ENABLE_FT_MPI == 0 /* FT ULFM Disabled */ # #if OPAL_ENABLE_FT_MPI == 1 /* FT ULFM Enabled */ diff --git a/configure.ac b/configure.ac index 397e368f373..a4acfba3569 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,7 @@ OPAL_CONFIGURE_SETUP opal_show_title "Configuring project_name_long" opal_show_subtitle "Prerequisites" -# compatability for oac_check_package +# compatibility for oac_check_package m4_copy([OPAL_LOG_COMMAND], [OAC_LOG_COMMAND]) m4_copy([OPAL_LOG_MSG], [OAC_LOG_MSG]) m4_copy([OPAL_APPEND], [OAC_APPEND]) @@ -187,7 +187,7 @@ acversion=`grep "Generated by GNU Autoconf" $0 | head -n 1 | awk '{ print $6 }'` AC_MSG_RESULT([$acversion]) AC_MSG_CHECKING([for bootstrap Automake version]) AC_MSG_RESULT([$am__api_version]) -AC_MSG_CHECKING([for boostrap Libtool version]) +AC_MSG_CHECKING([for bootstrap Libtool version]) ltversion=`grep VERSION= $srcdir/config/ltmain.sh | head -n 1 | cut -d= -f2` AC_MSG_RESULT([$ltversion]) @@ -998,7 +998,7 @@ OPAL_CHECK_CUDA OPAL_CHECK_ROCM([opal_rocm], [opal_rocm_happy="yes"], [opal_rocm_happy="no"]) -OPAL_SUMMARY_ADD([Miscellaneous], [ROCm suport], [], [$opal_rocm_happy]) +OPAL_SUMMARY_ADD([Miscellaneous], [ROCm support], [], [$opal_rocm_happy]) AS_IF([test "$OPAL_CUDA_SUPPORT" = "1" && test "$OPAL_ROCM_SUPPORT" = "1"], [AC_MSG_WARN([Cannot support both CUDA and ROCm.]) diff --git a/contrib/amca-param-sets/ft-mpi b/contrib/amca-param-sets/ft-mpi index 82382529f5e..45eac4c39ee 100644 --- a/contrib/amca-param-sets/ft-mpi +++ b/contrib/amca-param-sets/ft-mpi @@ -39,7 +39,7 @@ btl_base_warn_peer_error=false # # The following frameworks/components are TESTED -# They handle faults amd should be prefered when running with FT. +# They handle faults amd should be preferred when running with FT. # pml ob1 # btl tcp, self, sm(+xpmem,+cma), ugni, uct # coll base/basic, tuned, ftagree, libnbc @@ -49,7 +49,7 @@ threads=pthreads # # The following frameworks/components are UNTESTED, but **may** work. # They should run without faults, and **may** work with faults. -# You may try and report if successfull. +# You may try and report if successful. # btl ofi, portals4, smcuda, usnic, sm(+knem) # coll inter, sm, sync, cuda, monitoring # pml monitoring, v/vprotocol @@ -79,9 +79,9 @@ coll=^hcoll,portals4 # mtl (all) # pml cm, crcpw, ucx mtl=^ofi,portals4,psm2 -# allready enforced by pml=ob1 above +# already enforced by pml=ob1 above #pml=^cm,crcpw,ucx -# allready enforced by threads=pthreads above +# already enforced by threads=pthreads above #threads=^argobots,qthreads # There is a bug in libevent with the "select" backend that causes an infinite loop # when an unplanned disconnect happens. Use something else, or bail. diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c index fe612bd8fe4..ddd7ba1a9e9 100644 --- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c +++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2.c @@ -309,7 +309,7 @@ mca_btl_base_descriptor_t* mca_btl_tcp2_prepare_src( /** * Prepare a descriptor for send/rdma using the supplied - * convertor. If the convertor references data that is contigous, + * convertor. If the convertor references data that is contiguous, * the descriptor may simply point to the user buffer. Otherwise, * this routine is responsible for allocating buffer space and * packing if required. @@ -359,7 +359,7 @@ mca_btl_base_descriptor_t* mca_btl_tcp2_prepare_dst( * * @param btl (IN) BTL module * @param endpoint (IN) BTL addressing information - * @param descriptor (IN) Description of the data to be transfered + * @param descriptor (IN) Description of the data to be transferred * @param tag (IN) The tag value used to notify the peer. */ diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c index 72582a8e6de..b4bc0d00357 100644 --- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c +++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_component.c @@ -740,7 +740,7 @@ static int mca_btl_tcp2_component_create_listen(uint16_t af_family) return OMPI_ERROR; } socket_binded: - /* resolve system assignend port */ + /* resolve system assigned port */ if(getsockname(sd, (struct sockaddr*)&inaddr, &addrlen) < 0) { BTL_ERROR(("getsockname() failed: %s (%d)", strerror(opal_socket_errno), opal_socket_errno)); diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c index a1998de71af..385f645d062 100644 --- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c +++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_endpoint.c @@ -748,7 +748,7 @@ static void mca_btl_tcp2_endpoint_recv_handler(int sd, short flags, void* user) frag = NULL; #else /* If the cache still contain some data we can reuse the same fragment - * until we flush it completly. + * until we flush it completely. */ MCA_BTL_TCP_FRAG_INIT_DST(frag, btl_endpoint); #endif /* MCA_BTL_TCP_USES_PROGRESS_THREAD */ diff --git a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c index 30563f65966..daabece3570 100644 --- a/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c +++ b/contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c @@ -190,7 +190,7 @@ static void evaluate_assignment(int *a) { } /* - * check wether current solution beats all previous solutions + * check whether current solution beats all previous solutions */ if(assignment_cardinality > max_assignment_cardinality || (assignment_cardinality == max_assignment_cardinality @@ -692,7 +692,7 @@ int mca_btl_tcp2_proc_remove(mca_btl_tcp2_proc_t* btl_proc, mca_btl_base_endpoin OBJ_RELEASE(btl_proc); return OMPI_SUCCESS; } - /* The endpoint_addr may still be NULL if this enpoint is + /* The endpoint_addr may still be NULL if this endpoint is being removed early in the wireup sequence (e.g., if it is unreachable by all other procs) */ if (NULL != btl_endpoint->endpoint_addr) { diff --git a/contrib/check_unnecessary_headers.sh b/contrib/check_unnecessary_headers.sh index cc845feff3e..399465049a9 100644 --- a/contrib/check_unnecessary_headers.sh +++ b/contrib/check_unnecessary_headers.sh @@ -37,7 +37,7 @@ function del_header() # # In Subdirectory DIR, search for headers provided in array SEARCH_HEADER -# SEARCH_HEADER must initilized with a[0]="header_file.h typdefs macros functions" +# SEARCH_HEADER must be initialized with a[0]="header_file.h typdefs macros functions" # # If any of the typedefs, macros or functions show up, then # including the header is valid required, otherwise del_header @@ -232,7 +232,7 @@ echo "# for i in *.c ; do grep -q '#include \"ompi/runtime/params.h\"' $$i || ad # Finally erase a header that has been introduced for the STCI replacement -# and is not necessary, if no occurences of #include "orte..." reside... +# and is not necessary, if no occurrences of #include "orte..." reside... SEARCH_HEADER[0]="rte.h orte" SEARCH_HEADER[1]="" diff --git a/contrib/dist/linux/README.md b/contrib/dist/linux/README.md index 6705ed919c6..5ab9db102fe 100644 --- a/contrib/dist/linux/README.md +++ b/contrib/dist/linux/README.md @@ -19,7 +19,7 @@ filename pointing to an Open MPI tarball (may be either `.gz` or * `openmpi-devel` * `openmpi-docs` -The folowing arguments could be used to affect script behaviour. +The following arguments could be used to affect script behaviour. Please, do NOT set the same settings with parameters and config vars. * `-b`: @@ -32,7 +32,7 @@ Please, do NOT set the same settings with parameters and config vars. This option will change the name of the produced RPM to the "name". It is useful to use with "-o" and "-m" options if you want to have multiple Open MPI versions installed simultaneously in the same - enviroment. Requires use of option `-b`. + environment. Requires use of option `-b`. * `-o`: With this option the install path of the binary RPM will be changed @@ -77,7 +77,7 @@ Please, do NOT set the same settings with parameters and config vars. the script will look for the specfile in the current directory. * `-R directory`: - Specifies the top level RPM build direcotry. + Specifies the top level RPM build directory. * `-h`: Prints script usage information. diff --git a/contrib/dist/linux/buildrpm.sh b/contrib/dist/linux/buildrpm.sh index 1669e8b3bf9..c5daec67188 100755 --- a/contrib/dist/linux/buildrpm.sh +++ b/contrib/dist/linux/buildrpm.sh @@ -8,7 +8,7 @@ # # External script parameters -# The folowing parameters could be used to affect script behaviour. +# The following parameters could be used to affect script behaviour. # Please, do NOT set the same settings with parameters and config vars. # # -b @@ -21,7 +21,7 @@ # This option will change the name of the produced RPM to the "name". # It is useful to use with "-o" and "-m" options if you want to have # multiple Open MPI versions installed simultaneously in the same -# enviroment. Requires use of option "-b". +# environment. Requires use of option "-b". # # -o # With this option the install path of the binary RPM will be changed @@ -59,7 +59,7 @@ # the script will look for the specfile in the current directory. # # -R directory -# Specifies the top level RPM build direcotry. +# Specifies the top level RPM build directory. # # -h # Prints script usage information. @@ -149,7 +149,7 @@ usage="Usage: $0 [-b][-o][-m][-d][-u][-s][-h] [-n name][-f lf_location][-t tm_lo add custom RPM build parameter -R directory - Specifies the top level RPM build direcotry. + Specifies the top level RPM build directory. -h print this message and exit diff --git a/contrib/dist/linux/ompi-spec-generator.py b/contrib/dist/linux/ompi-spec-generator.py index 95168accd16..3882ec17c95 100644 --- a/contrib/dist/linux/ompi-spec-generator.py +++ b/contrib/dist/linux/ompi-spec-generator.py @@ -209,7 +209,7 @@ puts stderr \"This module adds Open MPI v%(ompi_version)s to various paths\" } -module-whatis \"Sets up Open MPI v%(ompi_version)s in your enviornment\" +module-whatis \"Sets up Open MPI v%(ompi_version)s in your environment\" append-path PATH \"%%{_prefix}/bin/\" append-path LD_LIBRARY_PATH %%{_libdir} @@ -628,7 +628,7 @@ def write_specfile(build_packages): global params # create output file print "--> Create output file" - verbose(" Open outout file : %(filename)s" % {"filename":params.output}) + verbose(" Open output file : %(filename)s" % {"filename":params.output}) specfile = open(params.output, 'w') verbose(" Write copyright header") specfile.write(copyright_template) @@ -705,7 +705,7 @@ def write_specfile(build_packages): # ###################################################################### def main(): - # parse comand line parameters + # parse command line parameters global params param_parser = optparse.OptionParser() param_parser.add_option("-r", "--root", action="store", dest="root", default="../../../",help="Specify the top root directory of the Open MPI Sources.") diff --git a/contrib/dist/linux/openmpi.spec b/contrib/dist/linux/openmpi.spec index d5512e9fdee..cfaae7f1fe4 100644 --- a/contrib/dist/linux/openmpi.spec +++ b/contrib/dist/linux/openmpi.spec @@ -56,7 +56,7 @@ # This specfile expects to find all required 3rd party packages # (Libevent, Hwloc, PMIx, PRRTE) externally, and will not use the # internal/embedded copies of these packages. This behavior is -# strongly recomended for packagers. However, if you want to override +# strongly recommended for packagers. However, if you want to override # this behavior, change the definition below to 0. # # NOTE: This option will cause "--with-libevent=external @@ -105,7 +105,7 @@ %{!?mpi_selector_rpm_name: %define mpi_selector_rpm_name mpi-selector} # The location of the mpi-selector executable (can be a relative path # name if "mpi-selector" can be found in the path) -# type: string (path to mpi-selector exectuable) +# type: string (path to mpi-selector executable) %{!?mpi_selector: %define mpi_selector mpi-selector} # Should we build a debuginfo RPM or not? @@ -159,7 +159,7 @@ %global _binary_filedigest_algorithm 1 %global _source_filedigest_algorithm 1 -# Define this to 1 if you want to keep libtool achive files +# Define this to 1 if you want to keep libtool archive files # Default is 0 (remove *.la files) # type: bool (0/1) %{!?install_libtool_archive: %define install_libtool_archive 0} @@ -398,7 +398,7 @@ This subpackage provides the documentation for Open MPI/OpenSHMEM. ############################################################################# # -# Prepatory Section +# Preparatory Section # ############################################################################# %prep @@ -539,7 +539,7 @@ proc ModulesHelp { } { puts stderr "This module adds Open MPI/SHMEM v%{version} to various paths" } -module-whatis "Sets up Open MPI/SHMEM v%{version} in your enviornment" +module-whatis "Sets up Open MPI/SHMEM v%{version} in your environment" prepend-path PATH "%{_prefix}/bin/" prepend-path LD_LIBRARY_PATH %{_libdir} @@ -722,7 +722,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %if !%{sysconfdir_in_prefix} %{_sysconfdir} %endif -# If install_in_opt, then we're instaling OMPI to +# If install_in_opt, then we're installing OMPI to # /opt/openmpi/. But be sure to also explicitly mention # /opt/openmpi so that it can be removed by RPM when everything under # there is also removed. @@ -761,7 +761,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %endif %endif -# If install_in_opt, then we're instaling OMPI to +# If install_in_opt, then we're installing OMPI to # /opt/openmpi/. But be sure to also explicitly mention # /opt/openmpi so that it can be removed by RPM when everything under # there is also removed. Also list /opt/openmpi//share so @@ -871,11 +871,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT * Tue Sep 8 2009 Jeff Squyres - Change shell_scripts_basename to not include version number to - accomodate what mpi-selector expects. + accommodate what mpi-selector expects. * Mon Feb 4 2008 Jeff Squyres - OFED 1.3 has a much better installer; remove all the - leave_build_root kludge nastyness. W00t! + leave_build_root kludge nastiness. W00t! * Fri Jan 18 2008 Jeff Squyres - Remove the hard-coded "openmpi" name from two Requires statements @@ -918,7 +918,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT shell script files be %{_bindir}/mpivars.{sh|csh} - Add %{munge_build_into_install} option for OFED 1.2 installer on SLES - Change shell script files and modulefile to *pre*pend all the OMPI paths -- Make shell script and modulefile installation indepdendent of +- Make shell script and modulefile installation independent of %{install_in_opt} (they're really separate issues) - Add more "ofed" shortcut qualifiers - Slightly better test for basename CC in the fortify source section diff --git a/contrib/doc-ft-components/DEVEL.FT-REQUIREMENTS.md b/contrib/doc-ft-components/DEVEL.FT-REQUIREMENTS.md index f6f0306a2b4..863f3c1ad20 100644 --- a/contrib/doc-ft-components/DEVEL.FT-REQUIREMENTS.md +++ b/contrib/doc-ft-components/DEVEL.FT-REQUIREMENTS.md @@ -2,7 +2,7 @@ ULFM OPEN MPI COMPONENTS DESIGN AND REQUIREMENTS FOR FAULT TOLERANT OPERATION ============================================================================= This documents the requirements and best practices for Open MPI -components to support operating accross failures with the +components to support operating across failures with the **User Level Failure Mitigation (ULFM)** Open MPI implementation. ___________________________________________________________________________ [TOC] @@ -62,11 +62,11 @@ in the following figure: with the peer (send, recv, atomic operation, etc.). The network transport component (BTL, MTL) should report the failure to the PML, so that the PML has a chance of reacting, performing necessary cleanup, and initiate recovery - actions as needed by trigerring the `errhandler_proc_failed_internal` function. + actions as needed by triggering the `errhandler_proc_failed_internal` function. 2. The runtime environment (PRTE) has identified a peer failure. A PMIx event notification containing the identification of the impacted processes will be - received from the PMIx thread, and transitionned as an event in the main + received from the PMIx thread, and transitioned as an event in the main OMPI progress loop. This event will cause the OMPI errhandler function `errhandler_proc_failed_internal` to be called. @@ -130,7 +130,7 @@ whose state is failed will complete in error and return control to the user. The `sync->status` field will contain the reason for interrupting the sync object. Modifications to the wait-sync logic must pay attention to not damage the error path. -That is, a meaningfull error must be present in `sync->status` when an error condition is +That is, a meaningful error must be present in `sync->status` when an error condition is found, and the `wait_sync_global_wakeup()` function does require tracking of all currently active `sync` objects. In the `pthreads` sync implementation, the management of multiple threads each using a different `sync` object also uses a list of active `sync`, which is @@ -205,7 +205,7 @@ of OB1 over the OFI BTL, and thus fault recovery. + return OPAL_ERR_UNREACH; } #ifdef FI_EINTR - /* sometimes, sockets provider complain about interupt. We do nothing. */ + /* sometimes, sockets provider complain about interrupt. We do nothing. */ Complete affected fragments --------------------------- @@ -221,7 +221,7 @@ Use the error callback mechanism -------------------------------- The BTL should invoke the error callback registered by the PML when a process error is -produced within the component. The BTL module contains the API funcion `btl_register_error`. +produced within the component. The BTL module contains the API function `btl_register_error`. The PML will attach a callback for managing the error at the PML level. A good example of using the error callback is found in the TCP BTL. When an error is produced within the TCP BTL, the endpoint is marked with a special internal flag, and is then closed. Upon @@ -316,13 +316,13 @@ case: its pending operation does not necessarily peer with a failed process, thu not be interrupted with an `MPI_ERR_PROC_FAILED` error. Yet, that operation will not be matched, hence it may never complete. The solution is for the rank that initially experienced the process fault error to call the `MPIX_COMM_REVOKE` operation when it -is intent in abandonning an ongoing communication pattern. +is intent in abandoning an ongoing communication pattern. The `MPIX_COMM_REVOKE` operation will cause all operations on `comm` (pending or future) to be interrupted with the specific error class `MPI_ERR_REVOKED`. This in turn will ensure that no process deadlock on unmatched operations. -It is unlikely that a developper will need to concern himself with the reliable +It is unlikely that a developer will need to concern himself with the reliable broadcast algorithm that propagates the revoke order between the processes of a communicator. On the other hand, when a communicator is revoked, the PML needs to identify which requests need to be interrupted, and do so in an orderly fashion. @@ -366,7 +366,7 @@ Again, different PML/MTL may have different implementation for stopping ongoing communication when a revoke occurs. The described implementation has the major advantage that it does not require the BTL/network driver to be able to cancel or interrupt ongoing RDMA operations. Another implementation may be able -to close an endpoint, thus causing all ongoing operations to implicitely terminate. +to close an endpoint, thus causing all ongoing operations to implicitly terminate. Note that legacy components may use static initializers to fill-in the component module structure. This practice should be avoided in general, because it will @@ -436,7 +436,7 @@ tags to the range of reserved collective tags that are non-interruptible (see th function `ompi_request_tag_is_ft()` for details). 2. The second approach, which is provided by the shared Open MPI infrastructure, -is for the occurence of a fault at any rank to cause the interruption of all +is for the occurrence of a fault at any rank to cause the interruption of all collective operations at all ranks on the communicator. This feature is implemented by the `errhandler_proc_failed_internal()` calling the `ompi_comm_revoke()` operation internally, with the special mode `coll_only`. This call will cause the @@ -463,7 +463,7 @@ updates from the network receiving message fragments, or RDMA updates. Instead, the cleanup of such requests must wait that they complete in error (as they will, due to the mechanism discussed in the above paragrah). Note -that only process failure errors are garanteed to complete in error. Other +that only process failure errors are guaranteed to complete in error. Other types of errors may deadlock if the request is waited. An example of the appropriate cleanup of fault-interrupted requests is found in `coll_base_util.c` @@ -487,7 +487,7 @@ appropriate cleanup of fault-interrupted requests is found in `coll_base_util.c` + if( MPI_ERR_PROC_FAILED_PENDING == err ) { + err = MPI_ERR_PROC_FAILED; + } - + } else /* this 'else' intentionaly spills outside the ifdef */ + + } else /* this 'else' intentionally spills outside the ifdef */ +#endif /* OPAL_ENABLE_FT_MPI */ + ompi_request_free(&req); + } @@ -514,7 +514,7 @@ Other ranks will also experience an error in operations that are blocking thus ensuring that no deadlock arises. A good example of that mode of operation can be found in the -`libnbc` collective communication component progres in `mca/coll/libnb/nbc.c`: +`libnbc` collective communication component progress in `mca/coll/libnb/nbc.c`: @@ -334,8 +336,20 @@ int NBC_Progress(NBC_Handle *handle) { /* don't call ompi_request_test_all as it causes a recursive call into opal_progress */ @@ -542,7 +542,7 @@ Changing CID algorithms ----------------------- This section describes some specificities of the allocation of CID under fault -tolerant operations, and is addressed to developpers intending to modify the CID +tolerant operations, and is addressed to developers intending to modify the CID algorithm. The `MPI_COMM_REVOKE` operation interrupts all calls on the communicator. Because it is @@ -566,7 +566,7 @@ period at which the revoke notification is received. In order to associate an unique couple (CID,epoch) to communicators, the CID allocation algorithm has been expanded to integrate the computation of the epoch as a byproduct -of the normal operation of hte CID algorithm. The way the normal CID algorihm operates +of the normal operation of the CID algorithm. The way the normal CID algorithm operates is based on a multi-step non-blocking allreduce operation to select the best global CID. At each round, every rank proposes one (or many) CID that are locally available. A non-blocking allreduce then identifies the best among all propositions (if any). If @@ -574,8 +574,8 @@ a good CID is found, a second allreduce confirms the choice. If no good CID is f that second allreduce will trigger another round of propositions and the algorithm repeats. In order to not increase the complexity of that algorithm, the selection of the epoch is integrated into the second allreduce that flags the successful selection of a -proposed CID. A developper that wants to modify the CID algorithm must pay attention to -the computation of teh epoch. Ideally the two numbers can be computed in a combined fashion. +proposed CID. A developer that wants to modify the CID algorithm must pay attention to +the computation of the epoch. Ideally the two numbers can be computed in a combined fashion. Testing Fault Tolerant Operation ================================ @@ -625,7 +625,7 @@ and thus the cleanup code for fragments of requests whose peer with a failed pro This test executes a ring-like neighbor pattern that is repeated for a long-enough period of time that the network driver will reach the maximum retry-count timeout. This will verify that errors are reported quickly from the failure detector, and that -the occurence of retry timeout at the BTL level do not cause issues (like unexpected +the occurrence of retry timeout at the BTL level do not cause issues (like unexpected aborts in the BTL, or crash due to orphaned fragments cleanup). Stress test for MPI_COMM_SPAWN diff --git a/contrib/find_occurence.pl b/contrib/find_occurence.pl index 0e9e1ce1bd0..f4de3256330 100755 --- a/contrib/find_occurence.pl +++ b/contrib/find_occurence.pl @@ -18,7 +18,7 @@ # if (scalar(@ARGV) != 2) { - print "Usage: #find_occurence \n"; + print "Usage: #find_occurrence \n"; exit(3); } @@ -28,7 +28,7 @@ open (SOURCE_FILES, "find $source_path -name *.c |") || print "could not open the pipe\n"; while () { - #open the file and delete the occurence + #open the file and delete the occurrence $file_name = $_; diff --git a/contrib/fix_headers.pl b/contrib/fix_headers.pl index c2527678f5d..04bbc09becb 100755 --- a/contrib/fix_headers.pl +++ b/contrib/fix_headers.pl @@ -78,7 +78,7 @@ while () { if (/$header_string/) { print TEMP $string_to_replace; - print "Replacing defintion ---- $c_file"; + print "Replacing definition ---- $c_file"; if ($written_to_file == 0) { print MOD_FILES $c_file; $written_to_file = 1; @@ -121,7 +121,7 @@ while () { if (/$header_string/) { print TEMP $string_to_replace; - print "Replacing defintion ---- $h_file"; + print "Replacing definition ---- $h_file"; if ($written_to_file == 0) { print MOD_FILES $h_file; $written_to_file = 1; diff --git a/contrib/gen_stats.pl b/contrib/gen_stats.pl index 82252196633..8d652c493b0 100755 --- a/contrib/gen_stats.pl +++ b/contrib/gen_stats.pl @@ -213,7 +213,7 @@ sub generate_stats { while () { #generate the gcov file for this particular file - #1. Get the directory name and filename seperately + #1. Get the directory name and filename separately #2. Invoke gcov on the file #3. Print the statistic onto a file diff --git a/contrib/header_replacement.sh b/contrib/header_replacement.sh index 1bf873143fa..918caec80be 100755 --- a/contrib/header_replacement.sh +++ b/contrib/header_replacement.sh @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. # -# orte_show_help_replacement.sh Script to detect occurences of +# orte_show_help_replacement.sh Script to detect occurrences of # #include "orte/util/show_help.h", where actually either # 1. #include "opal/util/output.h" # 2. #include "orte/mca/rml/rml_types.h" @@ -50,7 +50,7 @@ function add_header() { file=$1 # File to add header to header=$2 # E.g. opal/util/output.h for #include "opal/util/output.h" - after_header_pattern=$3 # Add after occurences of pattern, e.g. opal/util + after_header_pattern=$3 # Add after occurrences of pattern, e.g. opal/util line=`grep -n "#include \"$after_header_pattern" $file | cut -f1 -d':' | head -n1` if [ $# -gt 3 -a "x$line" = "x" ] ; then after_header_pattern=$4 # If above pattern is not found, try more generic, e.g. opal/ diff --git a/contrib/nightly/reports/check_devel_headers.pl b/contrib/nightly/reports/check_devel_headers.pl index 3e647de8d18..b18e45177af 100755 --- a/contrib/nightly/reports/check_devel_headers.pl +++ b/contrib/nightly/reports/check_devel_headers.pl @@ -52,7 +52,7 @@ } sub wanted { - # don't process directories or links, and dont' recurse down + # don't process directories or links, and don't recurse down # "special" directories if ( -l $_ ) { return; } if ( -d $_ ) { diff --git a/contrib/nightly/reports/illegal_symbols_report.pl b/contrib/nightly/reports/illegal_symbols_report.pl index e8c44930bdd..9f97a1ccb50 100755 --- a/contrib/nightly/reports/illegal_symbols_report.pl +++ b/contrib/nightly/reports/illegal_symbols_report.pl @@ -300,7 +300,7 @@ sub mail_symbols { if ($$bad_compsymbols || $$bad_libsymbols) { open MAIL, "|$mail -s \"$subject\" \"$email_arg\"" || - die "Could ot open pipe to output e-mail\n"; + die "Could not open pipe to output e-mail\n"; print MAIL "Found global symbols with missing or illegal prefixes\n\n"; if ($$bad_compsymbols) { diff --git a/contrib/ompi-time.sh b/contrib/ompi-time.sh index ea12644e4f5..7ba4b4233c1 100644 --- a/contrib/ompi-time.sh +++ b/contrib/ompi-time.sh @@ -264,7 +264,7 @@ function do_checksync_mpiperf() { } # $1 - sync filename -# $2 - verbose mode: on - exit in case synchronization values exceed a treshold and off - silent mode (default: off) +# $2 - verbose mode: on - exit in case synchronization values exceed a threshold and off - silent mode (default: off) # $3+ - application additional options function do_checksync() { if [ -z "$1" ]; then diff --git a/contrib/ompi_cplusplus.sed b/contrib/ompi_cplusplus.sed index df2c8ca637c..4af63fd37c8 100644 --- a/contrib/ompi_cplusplus.sed +++ b/contrib/ompi_cplusplus.sed @@ -1,6 +1,6 @@ # # Best attempt at a sed script to remove (almost) all combinations -# of C++ namespace occurences: While std. 3-line occurences with any +# of C++ namespace occurrences: While std. 3-line occurrences with any # combination of spaces and ordering of [c_plusplus,__cplusplus] can # be detected, sed does not allow multi-line (here >3 lines) parsing. # This all depends on the number of "N" the macro swallows. diff --git a/contrib/ompi_cplusplus.sh b/contrib/ompi_cplusplus.sh index 693867a4336..637fe3f7549 100755 --- a/contrib/ompi_cplusplus.sh +++ b/contrib/ompi_cplusplus.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Change all occurences of #if defined(c_plusplus) and variations +# Change all occurrences of #if defined(c_plusplus) and variations # to BEGIN_C_DECLS and END_C_DECLS using sed. # # List of files grepped are in XXX, sed script is in XXX diff --git a/contrib/purge-tab-indents.pl b/contrib/purge-tab-indents.pl index f5d115309c5..015e32e9cb4 100755 --- a/contrib/purge-tab-indents.pl +++ b/contrib/purge-tab-indents.pl @@ -10,7 +10,7 @@ # Will exit with status 111 if there are out of date copyrights which this # script can correct. my $CHECK_ONLY = 0; -# used by $CHECK_ONLY logic for bookeeping +# used by $CHECK_ONLY logic for bookkeeping my $would_replace = 0; # Set to true to suppress most informational messages. Only out of date files diff --git a/contrib/purge-trailing-blank-lines.pl b/contrib/purge-trailing-blank-lines.pl index 2880c5afb97..451a476e843 100755 --- a/contrib/purge-trailing-blank-lines.pl +++ b/contrib/purge-trailing-blank-lines.pl @@ -8,7 +8,7 @@ # Will exit with status 111 if there are out of date copyrights which this # script can correct. my $CHECK_ONLY = 0; -# used by $CHECK_ONLY logic for bookeeping +# used by $CHECK_ONLY logic for bookkeeping my $would_replace = 0; # Set to true to suppress most informational messages. Only out of date files diff --git a/contrib/search_replace.pl b/contrib/search_replace.pl index 3d23c63848c..f2131c5ae22 100755 --- a/contrib/search_replace.pl +++ b/contrib/search_replace.pl @@ -31,7 +31,7 @@ print "replace: $replace_string\n"; sub replace { - # don't process directories or links, and dont' recurse down + # don't process directories or links, and don't recurse down # "special" directories if ( -l $_ ) { return; } if ( -d $_ ) { diff --git a/contrib/test_headers_in_ompi.pl b/contrib/test_headers_in_ompi.pl index 16595e1f01a..d780535dc4f 100755 --- a/contrib/test_headers_in_ompi.pl +++ b/contrib/test_headers_in_ompi.pl @@ -122,7 +122,7 @@ sub parse_header_files { close(HEADER); close(TEMP); - #remove duplicate occurences of the file + #remove duplicate occurrences of the file system("sort temp.txt | uniq > $test_file"); return 0; diff --git a/contrib/uncrustify_open_mpi.cfg b/contrib/uncrustify_open_mpi.cfg index ca03062e7e0..2bd87b7b0fa 100644 --- a/contrib/uncrustify_open_mpi.cfg +++ b/contrib/uncrustify_open_mpi.cfg @@ -297,10 +297,10 @@ sp_before_semi = ignore # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements sp_before_semi_for = ignore # ignore/add/remove/force -# Add or remove space before a semicolon of an empty part of a for statment. +# Add or remove space before a semicolon of an empty part of a for statement. sp_before_semi_for_empty = ignore # ignore/add/remove/force -# Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). +# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') @@ -517,7 +517,7 @@ sp_cmt_cpp_start = ignore # ignore/add/remove/force # Whether to keep non-indenting tabs align_keep_tabs = false # false/true -# Whether to use tabs for alinging +# Whether to use tabs for aligning align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning @@ -1014,7 +1014,7 @@ mod_full_brace_do = add # ignore/add/remove/force # Add or remove braces on single-line 'for' statement mod_full_brace_for = add # ignore/add/remove/force -# Add or remove braces on single-line function defintions. (Pawn) +# Add or remove braces on single-line function definitions. (Pawn) mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement. Will not remove the braces if they contain an 'else'. @@ -1117,20 +1117,20 @@ cmt_sp_after_star_cont = 0 # number cmt_multi_check_last = true # false/true # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. -# Will substitue $(filename) with the current file's name. +# Will substitute $(filename) with the current file's name. cmt_insert_file_header = "" # string # The filename that contains text to insert at the end of a file if the file doesn't end with a C/C++ comment. -# Will substitue $(filename) with the current file's name. +# Will substitute $(filename) with the current file's name. cmt_insert_file_footer = "" # string -# The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. -# Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. +# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. +# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } cmt_insert_func_header = "" # string -# The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. -# Will substitue $(class) with the class name. +# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. +# Will substitute $(class) with the class name. cmt_insert_class_header = "" # string # If a preprocessor is encountered when stepping backwards from a function name, then diff --git a/contrib/update-my-copyright.pl b/contrib/update-my-copyright.pl index 9900ff0654c..2bfe9f36a49 100755 --- a/contrib/update-my-copyright.pl +++ b/contrib/update-my-copyright.pl @@ -10,7 +10,7 @@ # # This script automates the tedious task of updating copyright notices # in the tops of OMPI/ORTE/OPAL source files before committing back to -# the respository. Set the environment variable +# the repository. Set the environment variable # OMPI_COPYRIGHT_SEARCH_NAME to a short (case-insensitive) name that # indicates your copyright line (e.g., "cisco"), and set the env # variable OMPI_COPYRIGHT_FORMAL_NAME with your organization's formal @@ -54,7 +54,7 @@ # Will exit with status 111 if there are out of date copyrights which this # script can correct. my $CHECK_ONLY = 0; -# used by $CHECK_ONLY logic for bookeeping +# used by $CHECK_ONLY logic for bookkeeping my $would_replace = 0; # Set to true to suppress most informational messages. Only out of date files diff --git a/docs/networking/cuda.rst b/docs/networking/cuda.rst index 6db5eb00e8d..0c9be00bbce 100644 --- a/docs/networking/cuda.rst +++ b/docs/networking/cuda.rst @@ -235,7 +235,7 @@ GPUs that are the same distance away. This is dependent on having /** * Test program to show the use of hwloc to select the GPU closest to the CPU * that the MPI program is running on. Note that this works even without - * any libpciacces or libpci support as it keys off the NVIDIA vendor ID. + * any libpciaccess or libpci support as it keys off the NVIDIA vendor ID. * There may be other ways to implement this but this is one way. * January 10, 2014 */ diff --git a/docs/release-notes/compilers.rst b/docs/release-notes/compilers.rst index 76804e203a2..f25317026e2 100644 --- a/docs/release-notes/compilers.rst +++ b/docs/release-notes/compilers.rst @@ -182,7 +182,7 @@ Compiler Notes * The Portland Group compilers prior to version 7.0 require the ``-Msignextend`` compiler flag to extend the sign bit when converting - from a shorter to longer integer. This is is different than other + from a shorter to longer integer. This is different than other compilers (such as GNU). When compiling Open MPI with the Portland compiler suite, the following flags should be passed to Open MPI's ``configure`` script: diff --git a/examples/spc_example.c b/examples/spc_example.c index e5e0735ec1f..1c25d9e2148 100644 --- a/examples/spc_example.c +++ b/examples/spc_example.c @@ -70,7 +70,7 @@ int main(int argc, char **argv) MPI_Abort(MPI_COMM_WORLD, -1); } - /* Determine the MPI_T pvar indices for the OMPI_BYTES_SENT/RECIEVED_USER SPCs */ + /* Determine the MPI_T pvar indices for the OMPI_BYTES_SENT/RECEIVED_USER SPCs */ index = -1; MPI_T_pvar_get_num(&num); for (i = 0; i < num; i++) { diff --git a/ompi/communicator/comm_request.c b/ompi/communicator/comm_request.c index 876c1f4e4d1..89ff7fff7af 100644 --- a/ompi/communicator/comm_request.c +++ b/ompi/communicator/comm_request.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights - * reseved. + * reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2004-2016 The University of Tennessee and The University diff --git a/ompi/communicator/comm_request.h b/ompi/communicator/comm_request.h index 6b11d149252..5f85aa6ed4f 100644 --- a/ompi/communicator/comm_request.h +++ b/ompi/communicator/comm_request.h @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013-2016 Los Alamos National Security, LLC. All rights - * reseved. + * reserved. * Copyright (c) 2021 Triad National Security, LLC. All rights * reserved. * $COPYRIGHT$ diff --git a/ompi/errhandler/errcode-internal.c b/ompi/errhandler/errcode-internal.c index dd90cca6b95..e1b8a0abf27 100644 --- a/ompi/errhandler/errcode-internal.c +++ b/ompi/errhandler/errcode-internal.c @@ -13,7 +13,7 @@ * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights - * reseved. + * reserved. * Copyright (c) 2018 Cisco Systems, Inc. All rights reserved * Copyright (c) 2018 Triad National Security, LLC. All rights * reserved. diff --git a/ompi/file/file.h b/ompi/file/file.h index 5eb4d96971a..512560aecb7 100644 --- a/ompi/file/file.h +++ b/ompi/file/file.h @@ -157,7 +157,7 @@ int ompi_file_open(struct ompi_communicator_t *comm, const char *filename, ompi_file_t **fh); /** - * Atomicly set a name on a file handle. + * Atomically set a name on a file handle. * * @param file MPI_File handle to set the name on * @param name NULL-terminated string to use diff --git a/ompi/mca/io/ompio/io_ompio_component.c b/ompi/mca/io/ompio/io_ompio_component.c index df682152e7f..19cce279d27 100644 --- a/ompi/mca/io/ompio/io_ompio_component.c +++ b/ompi/mca/io/ompio/io_ompio_component.c @@ -224,7 +224,7 @@ static int register_component(void) mca_io_ompio_aggregators_cutoff_threshold=3; (void) mca_base_component_var_register(&mca_io_ompio_component.io_version, "aggregators_cutoff_threshold", - "Relativ cutoff threshold for incrementing the number of aggregators " + "Relative cutoff threshold for incrementing the number of aggregators " "in the simple aggregator selection algorithm (5). Lower value " "for this parameter will lead to higher no. of aggregators.", MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, diff --git a/ompi/mca/pml/base/pml_base_frame.c b/ompi/mca/pml/base/pml_base_frame.c index 463f8bb6ff2..a0872f31f7d 100644 --- a/ompi/mca/pml/base/pml_base_frame.c +++ b/ompi/mca/pml/base/pml_base_frame.c @@ -147,7 +147,7 @@ static int mca_pml_base_register(mca_base_register_flag_t flags) mca_base_var_enum_create("pml_base_deprecate_warnings", ompi_pml_base_warn_dep_cancel_send_values, &ompi_pml_base_warn_dep_cancel_send_enum); rc = mca_base_var_register("ompi", "pml", "base", "warn_dep_cancel_send", - "How often to issue warnings for deprecated cancelation of send requests", + "How often to issue warnings for deprecated cancellation of send requests", MCA_BASE_VAR_TYPE_INT, ompi_pml_base_warn_dep_cancel_send_enum, 0, 0, OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, &ompi_pml_base_warn_dep_cancel_send_level); diff --git a/opal/class/opal_cstring.h b/opal/class/opal_cstring.h index 1ad45247fd6..87c8f43f262 100644 --- a/opal/class/opal_cstring.h +++ b/opal/class/opal_cstring.h @@ -60,7 +60,7 @@ * The string is eventually free'd by calling \c OBJ_RELEASE on it. * * If allocated using \c OBJ_NEW the object will contain an empty string. - * The member field \c _ignored is used to force the existance of padding bytes + * The member field \c _ignored is used to force the existence of padding bytes * that can be used to write the null-terminator even if no additional memory * was allocated succeeding the object itself and is ignored. */ diff --git a/opal/datatype/opal_datatype_add.c b/opal/datatype/opal_datatype_add.c index 1d32718b32c..2618ad3ba5b 100644 --- a/opal/datatype/opal_datatype_add.c +++ b/opal/datatype/opal_datatype_add.c @@ -250,7 +250,7 @@ int32_t opal_datatype_add(opal_datatype_t *pdtBase, const opal_datatype_t *pdtAd /* Now that we have the new ub and the alignment we should update the ub to match * the new alignment. We have to add an epsilon that is the least nonnegative - * increment needed to roung the extent to the next multiple of the alignment. + * increment needed to round the extent to the next multiple of the alignment. * This rule apply only if there is user specified upper bound as stated in the * MPI standard MPI 1.2 page 71. */ diff --git a/opal/mca/base/mca_base_var.h b/opal/mca/base/mca_base_var.h index 6fec0019e51..517d5de6e73 100644 --- a/opal/mca/base/mca_base_var.h +++ b/opal/mca/base/mca_base_var.h @@ -321,7 +321,7 @@ typedef struct mca_base_var_t mca_base_var_t; BEGIN_C_DECLS /** - * Object declarayion for mca_base_var_t + * Object declaration for mca_base_var_t */ OPAL_DECLSPEC OBJ_CLASS_DECLARATION(mca_base_var_t); diff --git a/opal/util/path.c b/opal/util/path.c index 227bda986cd..6931de8756b 100644 --- a/opal/util/path.c +++ b/opal/util/path.c @@ -211,7 +211,7 @@ char *opal_path_findv(char *fname, int mode, char **envv, char *wrkdir) } /** - * Forms a complete pathname and checks it for existance and + * Forms a complete pathname and checks it for existence and * permissions * * Accepts: diff --git a/opal/util/path.h b/opal/util/path.h index 64674e4e886..32e5a6edf57 100644 --- a/opal/util/path.h +++ b/opal/util/path.h @@ -110,7 +110,7 @@ OPAL_DECLSPEC bool opal_path_is_absolute(const char *path); OPAL_DECLSPEC char *opal_find_absolute_path(char *app_name) __opal_attribute_warn_unused_result__; /** - * Forms a complete pathname and checks it for existance and + * Forms a complete pathname and checks it for existence and * permissions * * @param fname File name diff --git a/opal/util/stacktrace.c b/opal/util/stacktrace.c index 5c3a342ab7c..9a71de16bc2 100644 --- a/opal/util/stacktrace.c +++ b/opal/util/stacktrace.c @@ -266,7 +266,7 @@ static void show_stackframe(int signo, siginfo_t *info, void *p) # endif # ifdef BUS_ADRERR case BUS_ADRERR: - si_code_str = "Non-existant physical address"; + si_code_str = "Non-existent physical address"; break; # endif # ifdef BUS_OBJERR diff --git a/test/class/ompi_rb_tree.c b/test/class/ompi_rb_tree.c index 0ce02f83e2a..a09cdbacf55 100644 --- a/test/class/ompi_rb_tree.c +++ b/test/class/ompi_rb_tree.c @@ -353,7 +353,7 @@ void test2(void) #if 0 i = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_usec - start.tv_usec); - printf("In a %d node tree, %d lookups took %f microseonds each\n", + printf("In a %d node tree, %d lookups took %f microseconds each\n", NUM_ALLOCATIONS, NUM_ALLOCATIONS * 2, (float) i / (float) (NUM_ALLOCATIONS * 2)); #endif diff --git a/test/class/opal_bitmap.c b/test/class/opal_bitmap.c index 8bbaf221ea4..b878a97dcb6 100644 --- a/test/class/opal_bitmap.c +++ b/test/class/opal_bitmap.c @@ -16,7 +16,7 @@ #define PRINT_VALID_ERR \ fprintf(error_out, "================================ \n"); \ - fprintf(error_out, "This is suppossed to throw error \n"); \ + fprintf(error_out, "This is supposed to throw error \n"); \ fprintf(error_out, "================================ \n") static void test_bitmap_set(opal_bitmap_t *bm); @@ -300,7 +300,7 @@ int set_all(opal_bitmap_t *bm) } for (i = 0; i < bm->array_size; ++i) if (bm->bitmap[i] != 0xffffffffffffffffUL) { - fprintf(error_out, "ERROR: set_all for bitmap arry entry %d\n\n", i); + fprintf(error_out, "ERROR: set_all for bitmap array entry %d\n\n", i); return ERR_CODE; } return 0; diff --git a/test/datatype/reduce_local.c b/test/datatype/reduce_local.c index cc0063be2f9..17259cd2b18 100644 --- a/test/datatype/reduce_local.c +++ b/test/datatype/reduce_local.c @@ -349,7 +349,7 @@ int main(int argc, char **argv) MPI_OP_MINMAX_TEST(max, mpi_op, MPI_INT8_T, int8_t, in_int8, inout_int8, inout_int8_for_check, count, PRId8); } - if (0 == strcmp(op, "min")) { // intentionly reversed in and out + if (0 == strcmp(op, "min")) { // intentionally reversed in and out MPI_OP_MINMAX_TEST(min, mpi_op, MPI_INT8_T, int8_t, in_int8, inout_int8, inout_int8_for_check, count, PRId8); } @@ -390,7 +390,7 @@ int main(int argc, char **argv) MPI_OP_MINMAX_TEST(max, mpi_op, MPI_INT16_T, int16_t, in_int16, inout_int16, inout_int16_for_check, count, PRId16); } - if (0 == strcmp(op, "min")) { // intentionly reversed in and out + if (0 == strcmp(op, "min")) { // intentionally reversed in and out MPI_OP_MINMAX_TEST(min, mpi_op, MPI_INT16_T, int16_t, in_int16, inout_int16, inout_int16_for_check, count, PRId16); } @@ -431,7 +431,7 @@ int main(int argc, char **argv) MPI_OP_MINMAX_TEST(max, mpi_op, MPI_INT32_T, int32_t, in_int32, inout_int32, inout_int32_for_check, count, PRId32); } - if (0 == strcmp(op, "min")) { // intentionly reversed in and out + if (0 == strcmp(op, "min")) { // intentionally reversed in and out MPI_OP_MINMAX_TEST(min, mpi_op, MPI_INT32_T, int32_t, in_int32, inout_int32, inout_int32_for_check, count, PRId32); } @@ -472,7 +472,7 @@ int main(int argc, char **argv) MPI_OP_MINMAX_TEST(max, mpi_op, MPI_INT64_T, int64_t, in_int64, inout_int64, inout_int64_for_check, count, PRId64); } - if (0 == strcmp(op, "min")) { // intentionly reversed in and out + if (0 == strcmp(op, "min")) { // intentionally reversed in and out MPI_OP_MINMAX_TEST(min, mpi_op, MPI_INT64_T, int64_t, in_int64, inout_int64, inout_int64_for_check, count, PRId64); } @@ -516,7 +516,7 @@ int main(int argc, char **argv) MPI_OP_MINMAX_TEST(max, mpi_op, MPI_UINT8_T, uint8_t, in_uint8, inout_uint8, inout_uint8_for_check, count, PRIu8); } - if (0 == strcmp(op, "min")) { // intentionly reversed in and out + if (0 == strcmp(op, "min")) { // intentionally reversed in and out MPI_OP_MINMAX_TEST(min, mpi_op, MPI_UINT8_T, uint8_t, in_uint8, inout_uint8, inout_uint8_for_check, count, PRIu8); } @@ -557,7 +557,7 @@ int main(int argc, char **argv) MPI_OP_MINMAX_TEST(max, mpi_op, MPI_UINT16_T, uint16_t, in_uint16, inout_uint16, inout_uint16_for_check, count, PRIu16); } - if (0 == strcmp(op, "min")) { // intentionly reversed in and out + if (0 == strcmp(op, "min")) { // intentionally reversed in and out MPI_OP_MINMAX_TEST(min, mpi_op, MPI_UINT16_T, uint16_t, in_uint16, inout_uint16, inout_uint16_for_check, count, PRIu16); } @@ -598,7 +598,7 @@ int main(int argc, char **argv) MPI_OP_MINMAX_TEST(max, mpi_op, MPI_UINT32_T, uint32_t, in_uint32, inout_uint32, inout_uint32_for_check, count, PRIu32); } - if (0 == strcmp(op, "min")) { // intentionly reversed in and out + if (0 == strcmp(op, "min")) { // intentionally reversed in and out MPI_OP_MINMAX_TEST(min, mpi_op, MPI_UINT32_T, uint32_t, in_uint32, inout_uint32, inout_uint32_for_check, count, PRIu32); } diff --git a/test/monitoring/check_monitoring.c b/test/monitoring/check_monitoring.c index d6e7c17c3ae..c6510928237 100644 --- a/test/monitoring/check_monitoring.c +++ b/test/monitoring/check_monitoring.c @@ -158,7 +158,7 @@ static inline void pvar_all_init(MPI_T_pvar_session *session, int world_size) int MPIT_result, provided; MPIT_result = MPI_T_init_thread(MPI_THREAD_SINGLE, &provided); if (MPIT_result != MPI_SUCCESS) { - fprintf(stderr, "Failed to initialiaze MPI_Tools sub-system.\n"); + fprintf(stderr, "Failed to initialize MPI_Tools sub-system.\n"); MPI_Abort(MPI_COMM_WORLD, MPIT_result); } MPIT_result = MPI_T_pvar_session_create(session); diff --git a/test/monitoring/test_overhead.sh b/test/monitoring/test_overhead.sh index 96814ba0bad..f6a3cd2b8c1 100755 --- a/test/monitoring/test_overhead.sh +++ b/test/monitoring/test_overhead.sh @@ -18,7 +18,7 @@ # results in order to create heatmaps. To work properly, this scripts # needs sqlite3, sed, awk and gnuplot. It also needs the rights to # write/create directories in the working path. Temporary files can be -# found in $resdir/.tmp. They are cleaned between two executions fo +# found in $resdir/.tmp. They are cleaned between two executions for # this script. # # This file create as an output one heatmap per operation diff --git a/test/simple/crisscross.c b/test/simple/crisscross.c index 50668d69bd2..0f2f544ebb0 100644 --- a/test/simple/crisscross.c +++ b/test/simple/crisscross.c @@ -243,9 +243,9 @@ int main(int argc, char *argv[]) if (rank == 0) { mbs = sum_avg_mbs / sum_xfers; - printf("\n average tranfer rate for %d transfers: %9.1f mbs\n", sum_xfers, mbs); - printf(" minimum tranfer rate for %d transfers: %9.1f mbs\n", sum_xfers, r_min_mbs); - printf(" maximum tranfer rate for %d transfers: %9.1f mbs\n", sum_xfers, r_max_mbs); + printf("\n average transfer rate for %d transfers: %9.1f mbs\n", sum_xfers, mbs); + printf(" minimum transfer rate for %d transfers: %9.1f mbs\n", sum_xfers, r_min_mbs); + printf(" maximum transfer rate for %d transfers: %9.1f mbs\n", sum_xfers, r_max_mbs); fflush(stdout); } diff --git a/test/simple/initial_errh.c b/test/simple/initial_errh.c index 7e86de97787..430437d8546 100644 --- a/test/simple/initial_errh.c +++ b/test/simple/initial_errh.c @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) if (MPI_SUCCESS != rc) { MPI_Error_string(rc, estr, &slen); fprintf(stderr, - " UNEXPECTED: An error occured during MPI_COMM_SETERRHANDLER(SELF) rc=%d: %s\n", + " UNEXPECTED: An error occurred during MPI_COMM_SETERRHANDLER(SELF) rc=%d: %s\n", rc, estr); return rc; } @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) rc = MPI_Finalize(); if (MPI_SUCCESS != rc) { MPI_Error_string(rc, estr, &slen); - fprintf(stderr, " UNEXPECTED: An error occured during MPI_FINALIZE rc=%d: %s\n", rc, estr); + fprintf(stderr, " UNEXPECTED: An error occurred during MPI_FINALIZE rc=%d: %s\n", rc, estr); return rc; } @@ -202,7 +202,7 @@ int main_child(int argc, char *argv[]) rc = MPI_Init(&argc, &argv); if (MPI_SUCCESS != rc) { MPI_Error_string(rc, estr, &slen); - fprintf(stderr, " UNEXPECTED: An error occured during MPI_INIT rc=%d: %s\n", rc, estr); + fprintf(stderr, " UNEXPECTED: An error occurred during MPI_INIT rc=%d: %s\n", rc, estr); return rc; } @@ -212,7 +212,7 @@ int main_child(int argc, char *argv[]) if (MPI_SUCCESS != rc) { MPI_Error_string(rc, estr, &slen); fprintf(stderr, - " UNEXPECTED: An error occured during MPI_COMM_SETERRHANDLER(PARENT) rc=%d: %s\n", + " UNEXPECTED: An error occurred during MPI_COMM_SETERRHANDLER(PARENT) rc=%d: %s\n", rc, estr); return rc; } diff --git a/test/simple/no-disconnect.c b/test/simple/no-disconnect.c index f1998b8572b..d493a1bd946 100644 --- a/test/simple/no-disconnect.c +++ b/test/simple/no-disconnect.c @@ -108,7 +108,7 @@ int main(int argc, char **argv) printf("Skipping, because the orte cannot handle concurrent MPI_Comm_spawns\n"); return 77; } else { - printf("Verify that this test is truly working because conncurrent MPI_Comm_spawns" + printf("Verify that this test is truly working because concurrent MPI_Comm_spawns" " has not worked before.\n"); } #endif diff --git a/test/spc/spc_test.c b/test/spc/spc_test.c index e9fe839b0cc..4f1ad84523b 100644 --- a/test/spc/spc_test.c +++ b/test/spc/spc_test.c @@ -62,7 +62,7 @@ int main(int argc, char **argv) MPI_Abort(MPI_COMM_WORLD, -1); } - /* Determine the MPI_T pvar indices for the OMPI_BYTES_SENT/RECIEVED_USER SPCs */ + /* Determine the MPI_T pvar indices for the OMPI_BYTES_SENT/RECEIVED_USER SPCs */ index = -1; MPI_result = MPI_T_pvar_get_num(&num); if (MPI_result != MPI_SUCCESS) { diff --git a/test/util/opal_argv.c b/test/util/opal_argv.c index 11044d590e8..7335d46cb1b 100644 --- a/test/util/opal_argv.c +++ b/test/util/opal_argv.c @@ -106,7 +106,7 @@ static bool test1(void) /* Test basic functionality. Start with a NULL argv and add the contents of the a array. - Set argc to be an initiall bogus number -- opal_argv_add() should + Set argc to be an initial bogus number -- opal_argv_add() should reset it back to zero after the first iteration. After adding the a[i], ensure that argv[0 - (i-1)] are the same