Skip to content
Open
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
3 changes: 1 addition & 2 deletions examples/ring-reduce.cu
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,7 @@ int main(int argc, char **argv) {
abort();
}
}
size_t min_ints = min_size / sizeof(int);
assert(min_ints % num_blocks == 0);
assert((min_size / sizeof(int)) % num_blocks == 0);

nvshmem_init();

Expand Down
2 changes: 1 addition & 1 deletion src/include/bootstrap_host_transport/env_defs_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ typedef const char *nvshmemi_env_string;
#define NVSHFMT_long(_v) _v
#define NVSHFMT_size(_v) _v
#define NVSHFMT_bool(_v) (_v) ? "true" : "false"
#define NVSHFMT_string(_v) _v
#define NVSHFMT_string(_v) ((_v) ? (_v) : "")

struct nvshmemi_options_s {
#define NVSHMEMI_ENV_DEF(NAME, KIND, DEFAULT, CATEGORY, SHORT_DESC) nvshmemi_env_##KIND NAME;
Expand Down
4 changes: 2 additions & 2 deletions src/modules/bootstrap/pmix/bootstrap_pmix.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ static struct nvshmemi_options_s env_attr;
desc_wrapped = bootstrap_util_wrap_string(SHORT_DESC, 80, "\t", 1); \
printf(" NVSHMEM_%-20s " BOOTPRI_##KIND " (type: %s, default: " BOOTPRI_##KIND \
")\n\t%s\n", \
#NAME, NVSHFMT_##KIND(env_attr.NAME), #KIND, NVSHFMT_##KIND(DEFAULT), \
desc_wrapped); \
#NAME, NVSHFMT_##KIND(env_attr.NAME) ? NVSHFMT_##KIND(env_attr.NAME) : "", \
#KIND, NVSHFMT_##KIND(DEFAULT), desc_wrapped); \
free(desc_wrapped); \
break; \
case BOOTSTRAP_OPTIONS_STYLE_RST: \
Expand Down