From bec20422eedd917be018d971db6ec8f29d943f05 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Mon, 26 Feb 2007 22:20:35 +0000 Subject: [PATCH] Remove the warnings about printf data-type mismatch. This commit was SVN r13804. --- ompi/mca/coll/tuned/coll_tuned_bcast.c | 16 ++++++++-------- ompi/mca/coll/tuned/coll_tuned_decision_fixed.c | 13 ++++++++----- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ompi/mca/coll/tuned/coll_tuned_bcast.c b/ompi/mca/coll/tuned/coll_tuned_bcast.c index 72ad087ccf..7b9e81ba2c 100644 --- a/ompi/mca/coll/tuned/coll_tuned_bcast.c +++ b/ompi/mca/coll/tuned/coll_tuned_bcast.c @@ -252,8 +252,8 @@ ompi_coll_tuned_bcast_intra_bintree ( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binary rank %d ss %5d typelng %uld segcount %d", - ompi_comm_rank(comm), segsize, typelng, segcount)); + OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binary rank %d ss %5d typelng %lu segcount %d", + ompi_comm_rank(comm), segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, segcount, comm->c_coll_selected_data->cached_bintree ); @@ -278,8 +278,8 @@ ompi_coll_tuned_bcast_intra_pipeline( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_pipeline rank %d ss %5d typelng %uld segcount %d", - ompi_comm_rank(comm), segsize, typelng, segcount)); + OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_pipeline rank %d ss %5d typelng %lu segcount %d", + ompi_comm_rank(comm), segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, segcount, comm->c_coll_selected_data->cached_pipeline ); @@ -304,8 +304,8 @@ ompi_coll_tuned_bcast_intra_chain( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_chain rank %d fo %d ss %5d typelng %uld segcount %d", - ompi_comm_rank(comm), chains, segsize, typelng, segcount)); + OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_chain rank %d fo %d ss %5d typelng %lu segcount %d", + ompi_comm_rank(comm), chains, segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, segcount, comm->c_coll_selected_data->cached_chain ); @@ -330,8 +330,8 @@ ompi_coll_tuned_bcast_intra_binomial( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binomial rank %d ss %5d typelng %uld segcount %d", - ompi_comm_rank(comm), segsize, typelng, segcount)); + OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binomial rank %d ss %5d typelng %lu segcount %d", + ompi_comm_rank(comm), segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, segcount, comm->c_coll_selected_data->cached_bmtree ); diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c index 4e6daa3e53..5e92e7fac9 100644 --- a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c +++ b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c @@ -212,8 +212,9 @@ int ompi_coll_tuned_bcast_intra_dec_fixed(void *buff, int count, ompi_ddt_type_size(datatype, &dsize); message_size = dsize * (unsigned long)count; /* needed for decision */ - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_bcast_intra_dec_fixed root %d rank %d com_size %d msg_length %uld", - root, rank, communicator_size, message_size)); + OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_bcast_intra_dec_fixed" + " root %d rank %d com_size %d msg_length %lu", + root, rank, communicator_size, (unsigned long)message_size)); /* Handle messages of small and intermediate size */ if (message_size < small_message_size) { @@ -328,8 +329,8 @@ int ompi_coll_tuned_reduce_intra_dec_fixed( void *sendbuf, void *recvbuf, message_size = dsize * count; /* needed for decision */ OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_reduce_intra_dec_fixed" - "root %d rank %d com_size %d msg_length %uld", - root, rank, communicator_size, message_size)); + "root %d rank %d com_size %d msg_length %lu", + root, rank, communicator_size, (unsigned long)message_size)); if ((communicator_size < 8) && (message_size < 512)){ /* Linear_0K */ @@ -423,7 +424,9 @@ int ompi_coll_tuned_allgather_intra_dec_fixed(void *sbuf, int scount, ompi_ddt_type_size(sdtype, &dsize); total_dsize = dsize * scount * communicator_size; - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgather_intra_dec_fixed rank %d com_size %d msg_length %uld", rank, communicator_size, total_dsize)); + OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgather_intra_dec_fixed" + " rank %d com_size %d msg_length %lu", + rank, communicator_size, (unsigned long)total_dsize)); for (pow2_size = 1; pow2_size <= communicator_size; pow2_size <<=1); pow2_size >>=1;