Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autogen.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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+' .
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion config/ompi_setup_mpi_fortran.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion config/opal_mca.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
4 changes: 2 additions & 2 deletions config/opal_setup_ft.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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])

Expand Down Expand Up @@ -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.])
Expand Down
8 changes: 4 additions & 4 deletions contrib/amca-param-sets/ft-mpi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions contrib/build-mca-comps-outside-of-tree/btl_tcp2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions contrib/build-mca-comps-outside-of-tree/btl_tcp2_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions contrib/check_unnecessary_headers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]=""

Expand Down
6 changes: 3 additions & 3 deletions contrib/dist/linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`:
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions contrib/dist/linux/buildrpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions contrib/dist/linux/ompi-spec-generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.")
Expand Down
20 changes: 10 additions & 10 deletions contrib/dist/linux/openmpi.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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?
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -398,7 +398,7 @@ This subpackage provides the documentation for Open MPI/OpenSHMEM.

#############################################################################
#
# Prepatory Section
# Preparatory Section
#
#############################################################################
%prep
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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/<version>. But be sure to also explicitly mention
# /opt/openmpi so that it can be removed by RPM when everything under
# there is also removed.
Expand Down Expand Up @@ -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/<version>. 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/<version>/share so
Expand Down Expand Up @@ -871,11 +871,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT

* Tue Sep 8 2009 Jeff Squyres <jsquyres@cisco.com>
- 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 <jsquyres@cisco.com>
- 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 <jsquyres@cisco.com>
- Remove the hard-coded "openmpi" name from two Requires statements
Expand Down Expand Up @@ -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
Expand Down
Loading