Skip to content

Commit 7d8992d

Browse files
janjustjanjust
committed
coll: Bump framework version to 3.1.0
This commit updates the collective framework version from 3.0.0 to 3.1.0 to address backward compatibility concerns introduced by the hcoll component removal. The hcoll removal changed the tag space management in coll_base_allgather.c and coll_base_allgatherv.c, switching from MCA_COLL_BASE_TAG_HCOLL_BASE to MCA_COLL_BASE_TAG_NEIGHBOR_BASE. While the numeric values happen to be identical, this represents a semantic protocol change in how the base collective implementations allocate and use message tags. Changes include: - Added MCA_COLL_BASE_VERSION_3_1_0 macro definition in coll.h - Updated all collective component declarations to use version 3.1.0 - Modified coll_base_comm_select.c to accept both 3.0.0 and 3.1.0 components during transition period Components updated: accelerator, acoll, adapt, basic, ftagree, han, inter, libnbc, monitoring, portals4, self, sync, tuned, ucc, xhc Signed-off-by: Tomislav Janjusic <[email protected]>
1 parent 87335ba commit 7d8992d

17 files changed

+21
-17
lines changed

‎ompi/mca/coll/accelerator/coll_accelerator_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ mca_coll_accelerator_component_t mca_coll_accelerator_component = {
4949
* about the component itself */
5050

5151
.collm_version = {
52-
MCA_COLL_BASE_VERSION_3_0_0,
52+
MCA_COLL_BASE_VERSION_3_1_0,
5353

5454
/* Component name and version */
5555
.mca_component_name = "accelerator",

‎ompi/mca/coll/acoll/coll_acoll_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const mca_coll_base_component_3_0_0_t mca_coll_acoll_component = {
7070
* about the component itself */
7171

7272
.collm_version = {
73-
MCA_COLL_BASE_VERSION_3_0_0,
73+
MCA_COLL_BASE_VERSION_3_1_0,
7474

7575
/* Component name and version */
7676
.mca_component_name = "acoll",

‎ompi/mca/coll/adapt/coll_adapt_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mca_coll_adapt_component_t mca_coll_adapt_component = {
4242
/* First, the mca_component_t struct containing meta
4343
information about the component itself */
4444
.collm_version = {
45-
MCA_COLL_BASE_VERSION_3_0_0,
45+
MCA_COLL_BASE_VERSION_3_1_0,
4646

4747
/* Component name and version */
4848
.mca_component_name = "adapt",

‎ompi/mca/coll/base/coll_base_comm_select.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,10 @@ static int query(const mca_base_component_t * component,
565565
{
566566
*module = NULL;
567567
if (3 == component->mca_type_major_version &&
568-
0 == component->mca_type_minor_version &&
569-
0 == component->mca_type_release_version) {
568+
((0 == component->mca_type_minor_version &&
569+
0 == component->mca_type_release_version) ||
570+
(1 == component->mca_type_minor_version &&
571+
0 == component->mca_type_release_version))) {
570572

571573
return query_3_0_0((const mca_coll_base_component_3_0_0_t *)component, comm, priority, module);
572574
}

‎ompi/mca/coll/basic/coll_basic_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const mca_coll_base_component_3_0_0_t mca_coll_basic_component = {
6262
* about the component itself */
6363

6464
.collm_version = {
65-
MCA_COLL_BASE_VERSION_3_0_0,
65+
MCA_COLL_BASE_VERSION_3_1_0,
6666

6767
/* Component name and version */
6868
.mca_component_name = "basic",

‎ompi/mca/coll/coll.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,8 @@ typedef struct mca_coll_base_comm_coll_t mca_coll_base_comm_coll_t;
816816
*/
817817
#define MCA_COLL_BASE_VERSION_3_0_0 \
818818
OMPI_MCA_BASE_VERSION_2_1_0("coll", 3, 0, 0)
819+
#define MCA_COLL_BASE_VERSION_3_1_0 \
820+
OMPI_MCA_BASE_VERSION_2_1_0("coll", 3, 1, 0)
819821

820822

821823
/* ******************************************************************** */

‎ompi/mca/coll/ftagree/coll_ftagree_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const mca_coll_base_component_3_0_0_t mca_coll_ftagree_component = {
5454
* about the component itself */
5555

5656
{
57-
MCA_COLL_BASE_VERSION_3_0_0,
57+
MCA_COLL_BASE_VERSION_3_1_0,
5858

5959
/* Component name and version */
6060
"ftagree",

‎ompi/mca/coll/han/coll_han_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ mca_coll_han_component_t mca_coll_han_component = {
7575
information about the component itself */
7676

7777
.collm_version = {
78-
MCA_COLL_BASE_VERSION_3_0_0,
78+
MCA_COLL_BASE_VERSION_3_1_0,
7979

8080
/* Component name and version */
8181
.mca_component_name = "han",

‎ompi/mca/coll/inter/coll_inter_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const mca_coll_base_component_3_0_0_t mca_coll_inter_component = {
6363
about the component itself */
6464

6565
.collm_version = {
66-
MCA_COLL_BASE_VERSION_3_0_0,
66+
MCA_COLL_BASE_VERSION_3_1_0,
6767

6868
/* Component name and version */
6969
.mca_component_name = "inter",

‎ompi/mca/coll/libnbc/coll_libnbc_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ ompi_coll_libnbc_component_t mca_coll_libnbc_component = {
120120
/* First, the mca_component_t struct containing meta information
121121
* about the component itself */
122122
.collm_version = {
123-
MCA_COLL_BASE_VERSION_3_0_0,
123+
MCA_COLL_BASE_VERSION_3_1_0,
124124

125125
/* Component name and version */
126126
.mca_component_name = "libnbc",

0 commit comments

Comments
 (0)