Skip to content

Commit c6ba212

Browse files
rhc54rhc54
committed
Purge checks for earlier PMIx versions
We now require PMIx v6.1 or above, so no need to protect code areas for earlier versions. Signed-off-by: Ralph Castain <rhc@pmix.org>
1 parent 62bedbd commit c6ba212

29 files changed

+28
-492
lines changed

‎examples/client2.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
1616
* Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
1717
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
18-
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
18+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
1919
* $COPYRIGHT$
2020
*
2121
* Additional copyrights may follow
@@ -128,15 +128,13 @@ int main(int argc, char **argv)
128128
PMIX_VALUE_RELEASE(val);
129129
fprintf(stderr, "Client %s:%d job size %d\n", myproc.nspace, myproc.rank, nprocs);
130130

131-
#ifdef PMIX_GPU_SUPPORT
132131
/* see if we were given a GPU directive */
133132
rc = PMIx_Get(&proc, PMIX_GPU_SUPPORT, NULL, 0, &val);
134133
if (PMIX_SUCCESS == rc) {
135134
fprintf(stderr, "%s:%d GPU support: %s\n", myproc.nspace, myproc.rank, val->data.flag ? "ENABLED" : "DISABLED");
136135
} else {
137136
fprintf(stderr, "%s:%d GPU support: NOT GIVEN\n", myproc.nspace, myproc.rank);
138137
}
139-
#endif
140138

141139
/* put a data array of pmix_value's */
142140
val = (pmix_value_t *) malloc(32 * sizeof(pmix_value_t));

‎examples/debugger/debugger.h‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
1616
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
1717
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
18-
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
18+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
1919
* $COPYRIGHT$
2020
*
2121
* Additional copyrights may follow
@@ -95,74 +95,29 @@ typedef struct {
9595
bool exit_code_given;
9696
} myrel_t;
9797

98-
#if PMIX_NUMERIC_VERSION < 0x00040203
99-
#define PMIX_ARGV_JOIN_COMPAT(a, b) \
100-
pmix_argv_join(a, b)
101-
#else
10298
#define PMIX_ARGV_JOIN_COMPAT(a, b) \
10399
PMIx_Argv_join(a, b)
104-
#endif
105100

106-
#if PMIX_NUMERIC_VERSION < 0x00040203
107-
#define PMIX_ARGV_SPLIT_COMPAT(a, b) \
108-
pmix_argv_split(a, b)
109-
#else
110101
#define PMIX_ARGV_SPLIT_COMPAT(a, b) \
111102
PMIx_Argv_split(a, b)
112-
#endif
113103

114-
#if PMIX_NUMERIC_VERSION < 0x00040203
115-
#define PMIX_ARGV_SPLIT_WITH_EMPTY_COMPAT(a, b) \
116-
pmix_argv_split_with_empty(a, b)
117-
#else
118104
#define PMIX_ARGV_SPLIT_WITH_EMPTY_COMPAT(a, b) \
119105
PMIx_Argv_split_with_empty(a, b)
120-
#endif
121106

122-
#if PMIX_NUMERIC_VERSION < 0x00040203
123-
#define PMIX_ARGV_COUNT_COMPAT(a) \
124-
pmix_argv_count(a)
125-
#else
126107
#define PMIX_ARGV_COUNT_COMPAT(a) \
127108
PMIx_Argv_count(a)
128-
#endif
129109

130-
#if PMIX_NUMERIC_VERSION < 0x00040203
131-
#define PMIX_ARGV_FREE_COMPAT(a) \
132-
pmix_argv_free(a)
133-
#else
134110
#define PMIX_ARGV_FREE_COMPAT(a) \
135111
PMIx_Argv_free(a)
136-
#endif
137112

138-
#if PMIX_NUMERIC_VERSION < 0x00040203
139-
#define PMIX_ARGV_APPEND_UNIQUE_COMPAT(a, b) \
140-
pmix_argv_append_unique_nosize(a, b)
141-
#else
142113
#define PMIX_ARGV_APPEND_UNIQUE_COMPAT(a, b) \
143114
PMIx_Argv_append_unique_nosize(a, b)
144-
#endif
145115

146-
#if PMIX_NUMERIC_VERSION < 0x00040203
147-
#define PMIX_ARGV_APPEND_NOSIZE_COMPAT(a, b) \
148-
pmix_argv_append_nosize(a, b)
149-
#else
150116
#define PMIX_ARGV_APPEND_NOSIZE_COMPAT(a, b) \
151117
PMIx_Argv_append_nosize(a, b)
152-
#endif
153118

154-
#if PMIX_NUMERIC_VERSION < 0x00040203
155-
#define PMIX_ARGV_COPY_COMPAT(a) \
156-
pmix_argv_copy(a)
157-
#else
158119
#define PMIX_ARGV_COPY_COMPAT(a) \
159120
PMIx_Argv_copy(a)
160-
#endif
161121

162-
#if PMIX_NUMERIC_VERSION < 0x00040203
163-
#define PMIX_SETENV_COMPAT(a, b, c, d) \
164-
pmix_setenv(a, b, c, d)
165-
#else
166122
#define PMIX_SETENV_COMPAT(a, b, c, d) \
167123
PMIx_Setenv(a, b, c, d)
168-
#endif

‎examples/debugger/indirect-multi.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
1616
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
1717
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
18-
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
18+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
1919
* Copyright (c) 2021 IBM Corporation. All rights reserved.
2020
* $COPYRIGHT$
2121
*
@@ -404,11 +404,7 @@ int main(int argc, char **argv)
404404
(unsigned long) pid);
405405

406406
/* get server URI as we will need it later */
407-
#ifdef PMIX_MYSERVER_URI
408407
rc = PMIx_Get(&myproc, PMIX_MYSERVER_URI, NULL, 0, &val);
409-
#else
410-
rc = PMIx_Get(&myproc, PMIX_SERVER_URI, NULL, 0, &val);
411-
#endif
412408
if (PMIX_SUCCESS != rc) {
413409
fprintf(stderr, "Failed to retrieve server URI: %s\n", PMIx_Error_string(rc));
414410
PMIx_tool_finalize();

‎examples/debugger/indirect.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
1616
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
1717
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
18-
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
18+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
1919
* Copyright (c) 2021 IBM Corporation. All rights reserved.
2020
* $COPYRIGHT$
2121
*
@@ -205,11 +205,7 @@ int main(int argc, char **argv)
205205
(unsigned long) pid);
206206

207207
/* get our URI as we will need it later */
208-
#ifdef PMIX_MYSERVER_URI
209208
rc = PMIx_Get(&myproc, PMIX_MYSERVER_URI, NULL, 0, &val);
210-
#else
211-
rc = PMIx_Get(&myproc, PMIX_SERVER_URI, NULL, 0, &val);
212-
#endif
213209
if (PMIX_SUCCESS != rc) {
214210
fprintf(stderr, "Failed to retrieve our URI: %s\n", PMIx_Error_string(rc));
215211
PMIx_tool_finalize();

‎examples/examples.h‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
1616
* Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
1717
* Copyright (c) 2015 Mellanox Technologies, Inc. All rights reserved.
18-
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
18+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
1919
* $COPYRIGHT$
2020
*
2121
* Additional copyrights may follow
@@ -139,74 +139,29 @@ static inline void examples_hide_unused_params(int x, ...)
139139
va_end(ap);
140140
}
141141

142-
#if PMIX_NUMERIC_VERSION < 0x00040203
143-
#define PMIX_ARGV_JOIN_COMPAT(a, b) \
144-
pmix_argv_join(a, b)
145-
#else
146142
#define PMIX_ARGV_JOIN_COMPAT(a, b) \
147143
PMIx_Argv_join(a, b)
148-
#endif
149144

150-
#if PMIX_NUMERIC_VERSION < 0x00040203
151-
#define PMIX_ARGV_SPLIT_COMPAT(a, b) \
152-
pmix_argv_split(a, b)
153-
#else
154145
#define PMIX_ARGV_SPLIT_COMPAT(a, b) \
155146
PMIx_Argv_split(a, b)
156-
#endif
157147

158-
#if PMIX_NUMERIC_VERSION < 0x00040203
159-
#define PMIX_ARGV_SPLIT_WITH_EMPTY_COMPAT(a, b) \
160-
pmix_argv_split_with_empty(a, b)
161-
#else
162148
#define PMIX_ARGV_SPLIT_WITH_EMPTY_COMPAT(a, b) \
163149
PMIx_Argv_split_with_empty(a, b)
164-
#endif
165150

166-
#if PMIX_NUMERIC_VERSION < 0x00040203
167-
#define PMIX_ARGV_COUNT_COMPAT(a) \
168-
pmix_argv_count(a)
169-
#else
170151
#define PMIX_ARGV_COUNT_COMPAT(a) \
171152
PMIx_Argv_count(a)
172-
#endif
173153

174-
#if PMIX_NUMERIC_VERSION < 0x00040203
175-
#define PMIX_ARGV_FREE_COMPAT(a) \
176-
pmix_argv_free(a)
177-
#else
178154
#define PMIX_ARGV_FREE_COMPAT(a) \
179155
PMIx_Argv_free(a)
180-
#endif
181156

182-
#if PMIX_NUMERIC_VERSION < 0x00040203
183-
#define PMIX_ARGV_APPEND_UNIQUE_COMPAT(a, b) \
184-
pmix_argv_append_unique_nosize(a, b)
185-
#else
186157
#define PMIX_ARGV_APPEND_UNIQUE_COMPAT(a, b) \
187158
PMIx_Argv_append_unique_nosize(a, b)
188-
#endif
189159

190-
#if PMIX_NUMERIC_VERSION < 0x00040203
191-
#define PMIX_ARGV_APPEND_NOSIZE_COMPAT(a, b) \
192-
pmix_argv_append_nosize(a, b)
193-
#else
194160
#define PMIX_ARGV_APPEND_NOSIZE_COMPAT(a, b) \
195161
PMIx_Argv_append_nosize(a, b)
196-
#endif
197162

198-
#if PMIX_NUMERIC_VERSION < 0x00040203
199-
#define PMIX_ARGV_COPY_COMPAT(a) \
200-
pmix_argv_copy(a)
201-
#else
202163
#define PMIX_ARGV_COPY_COMPAT(a) \
203164
PMIx_Argv_copy(a)
204-
#endif
205165

206-
#if PMIX_NUMERIC_VERSION < 0x00040203
207-
#define PMIX_SETENV_COMPAT(a, b, c, d) \
208-
pmix_setenv(a, b, c, d)
209-
#else
210166
#define PMIX_SETENV_COMPAT(a, b, c, d) \
211167
PMIx_Setenv(a, b, c, d)
212-
#endif

‎src/mca/ess/base/ess_base_bootstrap.c‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1919
* Copyright (c) 2019 Research Organization for Information Science
2020
* and Technology (RIST). All rights reserved.
21-
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
21+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
2222
* Copyright (c) 2023 Triad National Security, LLC. All rights reserved.
2323
* $COPYRIGHT$
2424
*
@@ -68,23 +68,6 @@ static pmix_status_t regex_parse_value_range(char *base, char *range,
6868
char ***names);
6969
static pmix_status_t read_file(char *regexp, char ***names);
7070

71-
#if PMIX_NUMERIC_VERSION < 0x00040205
72-
static char *pmix_getline(FILE *fp)
73-
{
74-
char *ret, *buff;
75-
char input[1024];
76-
77-
ret = fgets(input, 1024, fp);
78-
if (NULL != ret) {
79-
input[strlen(input) - 1] = '\0'; /* remove newline */
80-
buff = strdup(input);
81-
return buff;
82-
}
83-
84-
return NULL;
85-
}
86-
#endif
87-
8871
int prte_ess_base_bootstrap(void)
8972
{
9073
char *path, *line, *ptr;

‎src/mca/grpcomm/direct/grpcomm_direct_group.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,9 @@ static void group(int sd, short args, void *cbdata)
160160
PMIX_ERROR_LOG(rc);
161161
}
162162

163-
#ifdef PMIX_GROUP_FINAL_MEMBERSHIP_ORDER
164163
} else if (PMIX_CHECK_KEY(&cd->directives[i], PMIX_GROUP_FINAL_MEMBERSHIP_ORDER)) {
165164
sig.final_order = (pmix_proc_t*)cd->directives[i].value.data.darray->array;
166165
sig.nfinal = cd->directives[i].value.data.darray->size;
167-
#endif
168166
}
169167
}
170168

‎src/mca/ras/base/ras_base_allocate.c‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2018 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* Copyright (c) 2020 Cisco Systems, Inc. All rights reserved
18-
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
18+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
1919
* Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
2020
* $COPYRIGHT$
2121
*
@@ -59,23 +59,6 @@
5959

6060
#include "src/mca/ras/base/base.h"
6161

62-
#if PMIX_NUMERIC_VERSION < 0x00040205
63-
static char *pmix_getline(FILE *fp)
64-
{
65-
char *ret, *buff;
66-
char input[1024];
67-
68-
ret = fgets(input, 1024, fp);
69-
if (NULL != ret) {
70-
input[strlen(input) - 1] = '\0'; /* remove newline */
71-
buff = strdup(input);
72-
return buff;
73-
}
74-
75-
return NULL;
76-
}
77-
#endif
78-
7962
char *prte_ras_base_flag_string(prte_node_t *node)
8063
{
8164
char *tmp, *t3, **t2 = NULL;

‎src/mca/rmaps/lsf/rmaps_lsf.c‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* and Technology (RIST). All rights reserved.
2020
* Copyright (c) 2016-2022 IBM Corporation. All rights reserved.
2121
*
22-
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
22+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
2323
* $COPYRIGHT$
2424
*
2525
* Additional copyrights may follow
@@ -65,23 +65,6 @@ prte_rmaps_base_module_t prte_rmaps_lsf_module = {
6565

6666
static int file_parse(const char *);
6767

68-
#if PMIX_NUMERIC_VERSION < 0x00040205
69-
static char *pmix_getline(FILE *fp)
70-
{
71-
char *ret, *buff;
72-
char input[1024];
73-
74-
ret = fgets(input, 1024, fp);
75-
if (NULL != ret) {
76-
input[strlen(input) - 1] = '\0'; /* remove newline */
77-
buff = strdup(input);
78-
return buff;
79-
}
80-
81-
return NULL;
82-
}
83-
#endif
84-
8568
/*
8669
* Local variable
8770
*/

‎src/mca/rmaps/rank_file/rmaps_rank_file.c‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* and Technology (RIST). All rights reserved.
2020
* Copyright (c) 2016-2022 IBM Corporation. All rights reserved.
2121
*
22-
* Copyright (c) 2021-2025 Nanook Consulting All rights reserved.
22+
* Copyright (c) 2021-2026 Nanook Consulting All rights reserved.
2323
* $COPYRIGHT$
2424
*
2525
* Additional copyrights may follow
@@ -70,23 +70,6 @@ static char *prte_rmaps_rank_file_parse_string_or_int(void);
7070
static int prte_rmaps_rf_lsf_convert_affinity_to_rankfile(char *affinity_file, char **aff_rankfile);
7171
static int prte_rmaps_rf_process_lsf_affinity_hostfile(prte_job_t *jdata, prte_rmaps_options_t *options, char *affinity_file);
7272

73-
#if PMIX_NUMERIC_VERSION < 0x00040205
74-
static char *pmix_getline(FILE *fp)
75-
{
76-
char *ret, *buff;
77-
char input[1024];
78-
79-
ret = fgets(input, 1024, fp);
80-
if (NULL != ret) {
81-
input[strlen(input) - 1] = '\0'; /* remove newline */
82-
buff = strdup(input);
83-
return buff;
84-
}
85-
86-
return NULL;
87-
}
88-
#endif
89-
9073
/*
9174
* Local variable
9275
*/

0 commit comments

Comments
 (0)