Skip to content

Commit f0101dc

Browse files
authored
Merge pull request #10607 from luzpaz/typos/ompi
Fix typos in ompi/ subdirectory
2 parents 5cd9972 + d88da19 commit f0101dc

File tree

106 files changed

+185
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+185
-185
lines changed

ompi/attribute/attribute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ static int set_value(ompi_attribute_type_t type, void *object,
13331333
ret = opal_hash_table_set_value_uint32(*attr_hash, key, new_attr);
13341334

13351335
/* Increase the reference count of the object, only if there was no
1336-
old atribute/no old entry in the object's key hash */
1336+
old attribute/no old entry in the object's key hash */
13371337
if (OMPI_SUCCESS == ret && !had_old) {
13381338
OBJ_RETAIN(keyval);
13391339
}

ompi/attribute/attribute_predefined.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
*
5353
* MPI_HOST is set to MPI_PROC_NULL (per MPI-1, see 7.1.1, p192).
5454
*
55-
* MPI_IO is set to MPI_ANY_SOURCE. We may need to revist this.
55+
* MPI_IO is set to MPI_ANY_SOURCE. We may need to revisit this.
5656
*
5757
* MPI_WTIME_IS_GLOBAL is set to 0 (a conservative answer).
5858
*
@@ -78,7 +78,7 @@
7878
* integer-valued attributes, *BUT* at least the MPI_WIN_SIZE is an
7979
* MPI_Aint, so in terms of consistency, both should be the same --
8080
* hence, we treat them as MPI-2 Fortran integer-valued attributes.
81-
* All three of these atrributes have NULL_COPY_FN copy functions; it
81+
* All three of these attributes have NULL_COPY_FN copy functions; it
8282
* doesn't make sense to copy them to new windows (because they're
8383
* values specific and unique to each window) -- especially when
8484
* WIN_CREATE will explicitly set them on new windows anyway.

ompi/communicator/comm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,7 @@ int ompi_comm_get_rprocs (ompi_communicator_t *local_comm, ompi_communicator_t *
20492049
PMIX_DATA_BUFFER_RELEASE(sbuf);
20502050
}
20512051

2052-
/* broadcast name list to all proceses in local_comm */
2052+
/* broadcast name list to all processes in local_comm */
20532053
rc = local_comm->c_coll->coll_bcast( recvbuf, rlen, MPI_BYTE,
20542054
local_leader, local_comm,
20552055
local_comm->c_coll->coll_bcast_module);

ompi/communicator/comm_cid.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ static int ompi_comm_activate_complete (ompi_communicator_t **newcomm, ompi_comm
725725
/**
726726
* Check to see if this process is in the new communicator.
727727
*
728-
* Specifically, this function is invoked by all proceses in the
728+
* Specifically, this function is invoked by all processes in the
729729
* old communicator, regardless of whether they are in the new
730730
* communicator or not. This is because it is far simpler to use
731731
* MPI collective functions on the old communicator to determine
@@ -736,7 +736,7 @@ static int ompi_comm_activate_complete (ompi_communicator_t **newcomm, ompi_comm
736736
*
737737
* That being said, only processes in the new communicator need to
738738
* select a coll module for the new communicator. More
739-
* specifically, proceses who are not in the new communicator
739+
* specifically, processes who are not in the new communicator
740740
* should *not* select a coll module -- for example,
741741
* ompi_comm_rank(newcomm) returns MPI_UNDEFINED for processes who
742742
* are not in the new communicator. This can cause errors in the

ompi/communicator/comm_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ OBJ_CLASS_INSTANCE(ompi_communicator_t, opal_infosubscriber_t,
8484
ompi_comm_destruct);
8585

8686
/* This is the counter for the number of communicators, which contain
87-
process with more than one jobid. This counter is a usefull
87+
process with more than one jobid. This counter is a useful
8888
shortcut for finalize and abort. */
8989
int ompi_comm_num_dyncomm=0;
9090

@@ -231,7 +231,7 @@ int ompi_comm_init_mpi3 (void)
231231
ompi_attr_get_ref();
232232

233233
/* We have to create a hash (although it is legal to leave this
234-
filed NULL -- the attribute accessor functions will intepret
234+
filed NULL -- the attribute accessor functions will interpret
235235
this as "there are no attributes cached on this object")
236236
because MPI_COMM_WORLD has some predefined attributes. */
237237
ompi_attr_hash_init(&ompi_mpi_comm_world.comm.c_keyhash);

ompi/communicator/communicator.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ struct ompi_communicator_t {
273273
to a child*/
274274
int c_id_start_index; /* the starting index of the block of cids
275275
allocated to this communicator*/
276-
uint32_t c_epoch; /* Identifier used to differenciate between two communicators
276+
uint32_t c_epoch; /* Identifier used to differentiate between two communicators
277277
using the same c_contextid (not at the same time, obviously) */
278278

279279
ompi_group_t *c_local_group;
@@ -346,7 +346,7 @@ struct ompi_communicator_t {
346346
typedef struct ompi_communicator_t ompi_communicator_t;
347347

348348
/**
349-
* Padded struct to maintain back compatibiltiy.
349+
* Padded struct to maintain back compatibility.
350350
*
351351
* The following ompi_predefined_xxx_t structure is used to maintain
352352
* backwards binary compatibility for MPI applications compiled
@@ -395,7 +395,7 @@ typedef struct ompi_communicator_t ompi_communicator_t;
395395
*
396396
* - union of struct and padding - Similar to current implementation
397397
* except using a union for the parent. This worked except in cases
398-
* where the compilers did not support C99 union static initalizers.
398+
* where the compilers did not support C99 union static initializers.
399399
* It would have been a pain to convert a bunch of the code to use
400400
* non-static initializers (e.g., MPI datatypes).
401401
*/
@@ -452,7 +452,7 @@ OMPI_DECLSPEC extern ompi_predefined_communicator_t ompi_mpi_comm_null;
452452

453453
/*
454454
* These variables are for the MPI F03 bindings (F03 must bind Fortran
455-
* varaiables to symbols; it cannot bind Fortran variables to the
455+
* variables to symbols; it cannot bind Fortran variables to the
456456
* address of a C variable).
457457
*/
458458
OMPI_DECLSPEC extern ompi_predefined_communicator_t *ompi_mpi_comm_world_addr;
@@ -480,7 +480,7 @@ OMPI_DECLSPEC extern ompi_predefined_communicator_t *ompi_mpi_comm_null_addr;
480480
* ompi_comm_invalid() as originally coded -- per the MPI-1
481481
* definition, where MPI_COMM_NULL is an invalid communicator.
482482
* The MPI_Comm_c2f() function, therefore, calls
483-
* ompi_comm_invalid() but also explictily checks to see if the
483+
* ompi_comm_invalid() but also explicitly checks to see if the
484484
* handle is MPI_COMM_NULL.
485485
*/
486486
static inline int ompi_comm_invalid (const ompi_communicator_t* comm)
@@ -1072,7 +1072,7 @@ int ompi_comm_determine_first ( ompi_communicator_t *intercomm,
10721072
int high );
10731073

10741074
/**
1075-
* This is a routine determining wether the local or the
1075+
* This is a routine determining whether the local or the
10761076
* remote group will be first in the new intra-comm.
10771077
* It does not communicate to exchange the "high" values; used in Agree
10781078
*/

ompi/communicator/ft/comm_ft_reliable_bcast.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static void ompi_comm_rbcast_bml_recv_cb(
170170
msg = (ompi_comm_rbcast_message_t*) descriptor->des_segments->seg_addr.pval;
171171

172172
OPAL_OUTPUT_VERBOSE((10, ompi_ftmpi_output_handle,
173-
"%s %s: Info: Recieved rbcast tag for communicator with CID %3d:%d",
173+
"%s %s: Info: Received rbcast tag for communicator with CID %3d:%d",
174174
OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), __func__, msg->cid, msg->epoch));
175175

176176
/* Find the target comm */
@@ -190,7 +190,7 @@ static void ompi_comm_rbcast_bml_recv_cb(
190190
/* Check if this is a delayed rbcast for an old communicator whose CID has been reused */
191191
if(OPAL_UNLIKELY( comm->c_epoch != msg->epoch )) {
192192
OPAL_OUTPUT_VERBOSE((2, ompi_ftmpi_output_handle,
193-
"%s %s: Info: Received a late rbcast order for the communicator with CID %3d:%d when is is now at epoch %d - ignoring, nothing to do",
193+
"%s %s: Info: Received a late rbcast order for the communicator with CID %3d:%d when it is now at epoch %d - ignoring, nothing to do",
194194
OMPI_NAME_PRINT(OMPI_PROC_MY_NAME), __func__, msg->cid, msg->epoch, comm->c_epoch));
195195
return;
196196
}
@@ -204,7 +204,7 @@ static void ompi_comm_rbcast_bml_recv_cb(
204204
}
205205
}
206206
else {
207-
/* During finalize, we loosly synchronize so it may happen
207+
/* During finalize, we loosely synchronize so it may happen
208208
* that we keep receiving messages after we deregistered the type.
209209
* Any other time, this is indicative of a problem.
210210
*/

ompi/datatype/ompi_datatype.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ typedef struct ompi_datatype_t ompi_datatype_t;
9191
OMPI_DECLSPEC OBJ_CLASS_DECLARATION(ompi_datatype_t);
9292

9393
/**
94-
* Padded struct to maintain back compatibiltiy.
94+
* Padded struct to maintain back compatibility.
9595
* See opal/communicator/communicator.h comments with struct opal_communicator_t
9696
* for full explanation why we chose the following padding construct for predefines.
9797
*/
@@ -423,7 +423,7 @@ OMPI_DECLSPEC int ompi_datatype_pack_external_size( const char datarep[], int in
423423
* converted to (1,larger_datatype). This comes up in pack/unpack if
424424
* the datatype is [int4b,empty4b] for example. With that datatype the
425425
* (count,datatype) path has to loop over the count processing each
426-
* occurrance of the datatype, but a larger type created via
426+
* occurrence of the datatype, but a larger type created via
427427
* MPI_Type_contiguous(count,datatype,) will have a single description
428428
* entry describing the whole vector and go through pack/unpack much
429429
* faster.

ompi/datatype/ompi_datatype_args.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ int32_t ompi_datatype_copy_args( const ompi_datatype_t* source_data,
365365
{
366366
ompi_datatype_args_t* pArgs = (ompi_datatype_args_t*)source_data->args;
367367

368-
/* Increase the reference count of the datatype enveloppe. This
369-
* prevent us from making extra copies for the enveloppe (which is mostly
368+
/* Increase the reference count of the datatype envelope. This
369+
* prevent us from making extra copies for the envelope (which is mostly
370370
* a read only memory).
371371
*/
372372
if( NULL != pArgs ) {
@@ -391,7 +391,7 @@ int32_t ompi_datatype_release_args( ompi_datatype_t* pData )
391391
OPAL_THREAD_ADD_FETCH32(&pArgs->ref_count, -1);
392392
if( 0 == pArgs->ref_count ) {
393393
/* There are some duplicated datatypes around that have a pointer to this
394-
* args. We will release them only when the last datatype will dissapear.
394+
* args. We will release them only when the last datatype will disappear.
395395
*/
396396
for( i = 0; i < pArgs->cd; i++ ) {
397397
if( !(ompi_datatype_is_predefined(pArgs->d[i])) ) {
@@ -448,7 +448,7 @@ static inline int __ompi_datatype_pack_description( ompi_datatype_t* datatype,
448448
position = (int*)next_packed;
449449
next_packed += sizeof(int) * args->cd;
450450

451-
/* copy the aray of counts (32 bits aligned) */
451+
/* copy the array of counts (32 bits aligned) */
452452
memcpy( next_packed, args->i, sizeof(int) * args->ci );
453453
next_packed += args->ci * sizeof(int);
454454

ompi/datatype/ompi_datatype_external.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int ompi_datatype_pack_external(const char datarep[], const void *inbuf, int inc
5757
return MPI_ERR_TRUNCATE;
5858
}
5959

60-
/* Prepare the iovec with all informations */
60+
/* Prepare the iovec with all information */
6161
invec.iov_base = (char*) outbuf + (*position);
6262
invec.iov_len = size;
6363

@@ -97,7 +97,7 @@ int ompi_datatype_unpack_external (const char datarep[], const void *inbuf, MPI_
9797
return MPI_ERR_TRUNCATE;
9898
}
9999

100-
/* Prepare the iovec with all informations */
100+
/* Prepare the iovec with all information */
101101
outvec.iov_base = (char*) inbuf + (*position);
102102
outvec.iov_len = size;
103103

0 commit comments

Comments
 (0)