Skip to content

Commit f1295ba

Browse files
hppritchahppritcha
authored
Merge pull request #3237 from rhc54/cmr3x/cray
Silence a flood of warnings when compiling with gcc on Cray
2 parents 9d52c26 + b9294d5 commit f1295ba

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

‎opal/mca/btl/ugni/btl_ugni_component.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (c) 2011-2017 Los Alamos National Security, LLC. All rights
44
* reserved.
55
* Copyright (c) 2011 UT-Battelle, LLC. All rights reserved.
6+
* Copyright (c) 2017 Intel, Inc. All rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -511,7 +512,7 @@ int mca_btl_ugni_progress_datagram (mca_btl_ugni_device_t *device)
511512
return rc;
512513
}
513514

514-
BTL_VERBOSE(("remote datagram completion on handle %p", handle));
515+
BTL_VERBOSE(("remote datagram completion on handle %p", (void*)handle));
515516

516517
/* if this is a wildcard endpoint lookup the remote peer by the proc id we received */
517518
if (handle == ugni_module->wildcard_ep) {
@@ -630,7 +631,7 @@ static inline int mca_btl_ugni_progress_rdma (mca_btl_ugni_module_t *ugni_module
630631
BTL_VERBOSE(("got %d completed rdma descriptors", rc));
631632

632633
for (int i = 0 ; i < rc ; ++i) {
633-
BTL_VERBOSE(("post descriptor %p complete. GNI_CQ_STATUS_OK(): %d", post_desc[i],
634+
BTL_VERBOSE(("post descriptor %p complete. GNI_CQ_STATUS_OK(): %d", (void*)post_desc[i],
634635
GNI_CQ_STATUS_OK(event_data[i])));
635636

636637
if (OPAL_UNLIKELY(!GNI_CQ_STATUS_OK(event_data[i]))) {

‎opal/mca/btl/ugni/btl_ugni_device.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Copyright (c) 2011 UT-Battelle, LLC. All rights reserved.
66
* Copyright (c) 2014 Research Organization for Information Science
77
* and Technology (RIST). All rights reserved.
8+
* Copyright (c) 2017 Intel, Inc. All rights reserved.
89
* $COPYRIGHT$
910
*
1011
* Additional copyrights may follow
@@ -121,7 +122,7 @@ static inline intptr_t mca_btl_ugni_post_fma_device (mca_btl_ugni_device_t *devi
121122
}
122123

123124
BTL_VERBOSE(("Posting FMA descriptor %p with op_type %d, amo %d, ep_handle %p, remote_addr 0x%lx, "
124-
"length %lu", desc, desc->desc.type, desc->desc.amo_cmd, desc->ep_handle,
125+
"length %lu", (void*)desc, desc->desc.type, desc->desc.amo_cmd, (void*)desc->ep_handle,
125126
desc->desc.remote_addr, desc->desc.length));
126127

127128
rc = GNI_PostFma (desc->ep_handle->gni_handle, &desc->desc);
@@ -160,7 +161,7 @@ static inline intptr_t mca_btl_ugni_post_rdma_device (mca_btl_ugni_device_t *dev
160161
desc->desc.src_cq_hndl = desc->cq->gni_handle;
161162

162163
BTL_VERBOSE(("Posting RDMA descriptor %p with op_type %d, ep_handle %p, remote_addr 0x%lx, "
163-
"length %lu", desc, desc->desc.type, desc->ep_handle, desc->desc.remote_addr,
164+
"length %lu", (void*)desc, desc->desc.type, (void*)desc->ep_handle, desc->desc.remote_addr,
164165
desc->desc.length));
165166

166167
rc = GNI_PostRdma (desc->ep_handle->gni_handle, &desc->desc);

‎opal/mca/btl/ugni/btl_ugni_endpoint.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (c) 2011-2017 Los Alamos National Security, LLC. All rights
44
* reserved.
55
* Copyright (c) 2011-2013 UT-Battelle, LLC. All rights reserved.
6+
* Copyright (c) 2017 Intel, Inc. All rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -51,7 +52,7 @@ static int mca_btl_ugni_endpoint_get_modex (mca_btl_base_endpoint_t *ep)
5152
ep->ep_rem_id = modex->id;
5253

5354

54-
BTL_VERBOSE(("received modex for ep %p. addr: %d, id: %d", ep, ep->ep_rem_addr, ep->ep_rem_id));
55+
BTL_VERBOSE(("received modex for ep %p. addr: %d, id: %d", (void*)ep, ep->ep_rem_addr, ep->ep_rem_id));
5556

5657
free (modex);
5758

@@ -301,7 +302,6 @@ static inline int mca_btl_ugni_ep_connect_finish (mca_btl_base_endpoint_t *ep) {
301302
static int mca_btl_ugni_directed_ep_post (mca_btl_base_endpoint_t *ep)
302303
{
303304
mca_btl_ugni_module_t *ugni_module = mca_btl_ugni_ep_btl (ep);
304-
mca_btl_ugni_device_t *device = ep->smsg_ep_handle->device;
305305
gni_return_t rc;
306306

307307
BTL_VERBOSE(("posting directed datagram to remote id: %d for endpoint %p", ep->ep_rem_id, (void *)ep));
@@ -351,8 +351,8 @@ int mca_btl_ugni_ep_connect_progress (mca_btl_base_endpoint_t *ep)
351351
}
352352
}
353353

354-
BTL_VERBOSE(("ep->remote_attr->smsg_attr = {.msg_type = %d, .msg_buffer = 0x%lx}", ep->remote_attr->smsg_attr.msg_type,
355-
ep->remote_attr->smsg_attr.msg_buffer));
354+
BTL_VERBOSE(("ep->remote_attr->smsg_attr = {.msg_type = %d, .msg_buffer = %p}", ep->remote_attr->smsg_attr.msg_type,
355+
(void*)ep->remote_attr->smsg_attr.msg_buffer));
356356

357357
if (GNI_SMSG_TYPE_INVALID == ep->remote_attr->smsg_attr.msg_type) {
358358
/* use datagram to exchange connection information with the remote peer */

‎opal/mca/btl/ugni/btl_ugni_module.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Copyright (c) 2011 UT-Battelle, LLC. All rights reserved.
66
* Copyright (c) 2014-2016 Research Organization for Information Science
77
* and Technology (RIST). All rights reserved.
8+
* Copyright (c) 2017 Intel, Inc. All rights reserved.
89
* $COPYRIGHT$
910
*
1011
* Additional copyrights may follow
@@ -61,7 +62,7 @@ mca_btl_ugni_module_t mca_btl_ugni_module = {
6162
}
6263
};
6364

64-
static void *mca_btl_ugni_datagram_event (int foo, short bar, void *arg)
65+
static void mca_btl_ugni_datagram_event (int foo, short bar, void *arg)
6566
{
6667
mca_btl_ugni_module_t *ugni_module = (mca_btl_ugni_module_t *) arg;
6768
mca_btl_ugni_device_t *device = ugni_module->devices;

‎opal/mca/btl/ugni/btl_ugni_send.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
1+
/* -*- Mode: C; c-basic-offset:3 ; indent-tabs-mode:nil -*- */
22
/*
33
* Copyright (c) 2011-2017 Los Alamos National Security, LLC. All rights
44
* reserved.
55
* Copyright (c) 2011 UT-Battelle, LLC. All rights reserved.
66
* Copyright (c) 2014 Research Organization for Information Science
77
* and Technology (RIST). All rights reserved.
8+
* Copyright (c) 2017 Intel, Inc. All rights reserved.
89
* $COPYRIGHT$
910
*
1011
* Additional copyrights may follow
@@ -20,7 +21,7 @@
2021
void mca_btl_ugni_wait_list_append (mca_btl_ugni_module_t *ugni_module, mca_btl_base_endpoint_t *endpoint,
2122
mca_btl_ugni_base_frag_t *frag)
2223
{
23-
BTL_VERBOSE(("wait-listing fragment %p to %s. endpoint state %d\n", frag, OPAL_NAME_PRINT(endpoint->peer_proc->proc_name), endpoint->state));
24+
BTL_VERBOSE(("wait-listing fragment %p to %s. endpoint state %d\n", (void*)frag, OPAL_NAME_PRINT(endpoint->peer_proc->proc_name), endpoint->state));
2425

2526
frag->base.des_flags |= MCA_BTL_DES_SEND_ALWAYS_CALLBACK;
2627

‎orte/mca/ras/alps/ras_alps_module.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2008 UT-Battelle, LLC. All rights reserved.
1414
* Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014 Intel, Inc. All rights reserved.
16+
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
1717
* $COPYRIGHT$
1818
*
1919
* Additional copyrights may follow
@@ -585,7 +585,11 @@ orte_ras_alps_read_appinfo_file(opal_list_t *nodes, char *filename,
585585
orte_set_attribute(&node->attributes, ORTE_NODE_LAUNCH_ID, ORTE_ATTR_LOCAL, &apNodes[ix].nid, OPAL_INT32);
586586
node->slots_inuse = 0;
587587
node->slots_max = 0;
588-
node->slots = opal_hwloc_use_hwthreads_as_cpus ? apNodes[ix].cpuCnt : apNodes[ix].numPEs;
588+
if (opal_hwloc_use_hwthreads_as_cpus) {
589+
node->slots = apNodes[ix].cpuCnt;
590+
} else {
591+
node->slots = apNodes[ix].numPEs;
592+
}
589593
node->state = ORTE_NODE_STATE_UP;
590594
/* need to order these node ids so the regex generator
591595
* can properly function

0 commit comments

Comments
 (0)