1
1

Merge pull request #7455 from rhc54/topic/warn

Silence a bunch of warnings
Этот коммит содержится в:
Geoff Paulsen 2020-02-24 08:55:30 -06:00 коммит произвёл GitHub
родитель 6f28a18f4e a01884a6a0
Коммит 207b267135
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 111 добавлений и 192 удалений

250
.gitignore поставляемый
Просмотреть файл

@ -448,188 +448,74 @@ opal/tools/wrappers/opal.pc
opal/util/show_help_lex.c
opal/util/keyval/keyval_lex.c
orte/doxygen
orte/include/orte/version.h
orte/include/orte/frameworks.h
orte/mca/filem/orte_filem.7
orte/mca/rmaps/rank_file/rmaps_rank_file_lex.c
orte/mca/rmaps/rank_file/rankfile_lex.c
orte/mca/snapc/orte_snapc.7
orte/mca/sstore/orte_sstore.7
orte/test/mpi/abort
orte/test/mpi/accept
orte/test/mpi/attach
orte/test/mpi/bad_exit
orte/test/mpi/bcast_loop
orte/test/mpi/binding
orte/test/mpi/concurrent_spawn
orte/test/mpi/connect
orte/test/mpi/crisscross
orte/test/mpi/delayed_abort
orte/test/mpi/hello_barrier
orte/test/mpi/hello_nodename
orte/test/mpi/hello_output
orte/test/mpi/hello_show_help
orte/test/mpi/hello
orte/test/mpi/hello++
orte/test/mpi/interlib
orte/test/mpi/loop_child
orte/test/mpi/loop_spawn
orte/test/mpi/mpi_barrier
orte/test/mpi/mpi_no_op
orte/test/mpi/mpi_spin
orte/test/mpi/multi_abort
orte/test/mpi/parallel_r8
orte/test/mpi/parallel_r64
orte/test/mpi/parallel_w8
orte/test/mpi/parallel_w64
orte/test/mpi/pinterlib
orte/test/mpi/pmix
orte/test/mpi/pubsub
orte/test/mpi/read_write
orte/test/mpi/reduce-hang
orte/test/mpi/ring
orte/test/mpi/segv
orte/test/mpi/simple_spawn
orte/test/mpi/slave
orte/test/mpi/spawn_multiple
orte/test/mpi/xlib
orte/test/mpi/ziaprobe
orte/test/mpi/ziatest
orte/test/mpi/*.dwarf
orte/test/mpi/junk*
orte/test/mpi/sio
orte/test/mpi/sendrecv_blaster
orte/test/mpi/early_abort
orte/test/mpi/spawn_problem/ch_rec
orte/test/mpi/spawn_problem/output
orte/test/mpi/spawn_problem/start
orte/test/mpi/debugger
orte/test/mpi/server_port_name.txt
orte/test/mpi/singleton_client_server
orte/test/mpi/intercomm_create
orte/test/mpi/spawn_tree
orte/test/mpi/init-exit77
orte/test/mpi/mpi_info
orte/test/mpi/info_spawn
orte/test/mpi/client
orte/test/mpi/server
orte/test/mpi/paccept
orte/test/mpi/pconnect
orte/test/mpi/thread_init
orte/test/mpi/memcached-dummy
orte/test/mpi/coll_test
orte/test/mpi/badcoll
orte/test/mpi/iof
orte/test/mpi/no-disconnect
orte/test/mpi/nonzero
orte/test/mpi/add_host
orte/test/system/radix
orte/test/system/sigusr_trap
orte/test/system/orte_no_op
orte/test/system/no_op
orte/test/system/hello
orte/test/system/hello_nodename
orte/test/system/hello_null
orte/test/system/spin
orte/test/system/orte_nodename
orte/test/system/orte_proc_subscribe
orte/test/system/orte_spawn
orte/test/system/orte_stage_gate
orte/test/system/orte_loop_spawn
orte/test/system/orte_loop_child
orte/test/system/orte_abort
orte/test/system/get_limits
orte/test/system/orte_ring
orte/test/system/spawn_child
orte/test/system/orte_tool
orte/test/system/binom
orte/test/system/iof_stress
orte/test/system/oob_stress
orte/test/system/iof_delay
orte/test/system/orte_barrier
orte/test/system/orte_mcast
orte/test/system/mcast
orte/test/system/mcast_recv
orte/test/system/opal_interface
orte/test/system/orte_spin
orte/test/system/segfault
orte/test/system/sysinfo
orte/test/system/orte_exit
orte/test/system/orte_db
orte/test/system/orte_state
orte/test/system/orte_sensor
orte/test/system/event-threads
orte/test/system/test-time
orte/test/system/psm_keygen
orte/test/system/pspawn
orte/test/system/regex
orte/test/system/orte_errors
orte/test/system/evthread-test
orte/test/system/evpri-test
orte/test/system/opal-evpri-test
orte/test/system/evpri-test2
orte/test/system/mapper
orte/test/system/reducer
orte/test/system/opal_hotel
orte/test/system/orte_dfs
orte/test/system/orte_allocate
orte/test/system/getenv_pmi
orte/test/system/pmi_abort
orte/test/system/opal_hwloc
orte/test/system/opal_db
orte/test/system/ulfm
orte/test/system/pmixtool
orte/test/system/orte_notify
orte/test/system/threads
orte/tools/orte-checkpoint/orte-checkpoint
orte/tools/orte-checkpoint/orte-checkpoint.1
orte/tools/orte-checkpoint/ompi-checkpoint.1
orte/tools/orte-clean/orte-clean
orte/tools/orte-clean/orte-clean.1
orte/tools/orte-dvm/orte-dvm
orte/tools/orte-dvm/orte-dvm.1
ompi/mca/rte/orte/ompi-dvm.1
orte/tools/orte-info/orte-info
orte/tools/orte-info/orte-info.1
orte/tools/orte-migrate/orte-migrate
orte/tools/orte-migrate/orte-migrate.1
orte/tools/orte-migrate/ompi-migrate.1
orte/tools/orte-ps/orte-ps
orte/tools/orte-ps/orte-ps.1
orte/tools/orte-restart/orte-restart
orte/tools/orte-restart/orte-restart.1
orte/tools/orte-restart/ompi-restart.1
orte/tools/orte-server/orte-server
orte/tools/orte-server/orte-server.1
orte/tools/orte-submit/orte-submit
orte/tools/orte-submit/orte-submit.1
ompi/mca/rte/orte/ompi-submit.1
orte/tools/orte-top/orte-top
orte/tools/orte-top/orte-top.1
orte/tools/orted/orted
orte/tools/orted/orted.1
orte/tools/orterun/orterun
orte/tools/orterun/orterun.1
orte/tools/ompi-prun/ompi-prun
orte/tools/ompi-prun/ompi-prun.1
orte/tools/wrappers/ortecc-wrapper-data.txt
orte/tools/wrappers/ortec++-wrapper-data.txt
orte/tools/wrappers/ortecc.1
orte/tools/wrappers/ortec++.1
orte/tools/wrappers/orte_wrapper_script
orte/tools/wrappers/orte.pc
orte/util/hostfile/hostfile_lex.c
orte/util/hostfile/orte_hosts.7
test/simple/abort
test/simple/accept
test/simple/attach
test/simple/bad_exit
test/simple/bcast_loop
test/simple/binding
test/simple/concurrent_spawn
test/simple/connect
test/simple/crisscross
test/simple/delayed_abort
test/simple/hello_barrier
test/simple/hello_nodename
test/simple/hello_output
test/simple/hello_show_help
test/simple/hello
test/simple/hello++
test/simple/interlib
test/simple/loop_child
test/simple/loop_spawn
test/simple/mpi_barrier
test/simple/mpi_no_op
test/simple/mpi_spin
test/simple/multi_abort
test/simple/parallel_r8
test/simple/parallel_r64
test/simple/parallel_w8
test/simple/parallel_w64
test/simple/pinterlib
test/simple/pmix
test/simple/pubsub
test/simple/read_write
test/simple/reduce-hang
test/simple/ring
test/simple/segv
test/simple/simple_spawn
test/simple/slave
test/simple/spawn_multiple
test/simple/xlib
test/simple/ziaprobe
test/simple/ziatest
test/simple/*.dwarf
test/simple/junk*
test/simple/sio
test/simple/sendrecv_blaster
test/simple/early_abort
test/simple/spawn_problem/ch_rec
test/simple/spawn_problem/output
test/simple/spawn_problem/start
test/simple/debugger
test/simple/server_port_name.txt
test/simple/singleton_client_server
test/simple/intercomm_create
test/simple/spawn_tree
test/simple/init-exit77
test/simple/mpi_info
test/simple/info_spawn
test/simple/client
test/simple/server
test/simple/paccept
test/simple/pconnect
test/simple/thread_init
test/simple/memcached-dummy
test/simple/coll_test
test/simple/badcoll
test/simple/iof
test/simple/no-disconnect
test/simple/nonzero
test/simple/add_host
oshmem/include/shmem.h
oshmem/include/shmem_portable_platform.h

Просмотреть файл

@ -3,6 +3,7 @@
* Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2020 Google, LLC. All rights reserved.
* Copyright (c) 2020 Intel, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -100,7 +101,7 @@ static ompi_osc_rdma_region_t *find_insertion_point (ompi_osc_rdma_region_t *reg
return (ompi_osc_rdma_region_t *)((intptr_t) regions + min_index * region_size);
}
if (region->base > base || (region->base == base && region->len > region_size)) {
if (region->base > base || (region->base == base && (size_t)region->len > region_size)) {
return find_insertion_point (regions, min_index, mid_index-1, base, region_size, region_index);
}
@ -113,8 +114,8 @@ static bool ompi_osc_rdma_find_conflicting_attachment (ompi_osc_rdma_handle_t *h
OPAL_LIST_FOREACH(attachment, &handle->attachments, ompi_osc_rdma_attachment_t) {
intptr_t region_bound = attachment->base + attachment->len;
if (base >= attachment->base && base < region_bound ||
bound > attachment->base && bound <= region_bound) {
if ((base >= attachment->base && base < region_bound) ||
(bound > attachment->base && bound <= region_bound)) {
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "existing region {%p, %p} overlaps region {%p, %p}",
(void *) attachment->base, (void *) region_bound, (void *) base, (void *) bound);
return true;
@ -295,8 +296,7 @@ int ompi_osc_rdma_detach (struct ompi_win_t *win, const void *base)
ompi_osc_rdma_handle_t *rdma_region_handle;
osc_rdma_counter_t region_count, region_id;
ompi_osc_rdma_region_t *region;
void *bound;
int start_index = INT_MAX, region_index;
int region_index;
if (module->flavor != MPI_WIN_FLAVOR_DYNAMIC) {
return OMPI_ERR_WIN;
@ -313,9 +313,9 @@ int ompi_osc_rdma_detach (struct ompi_win_t *win, const void *base)
rdma_region_handle = module->dynamic_handles[region_index];
region = (ompi_osc_rdma_region_t *) ((intptr_t) module->state->regions + region_index * module->region_size);
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_INFO, "checking attachments at index %d {.base=%p, len=%lu} for attachment %p"
", region handle=%p", region_index, (void *) region->base, region->len, base, rdma_region_handle);
", region handle=%p", region_index, (void *) region->base, (unsigned long)region->len, base, (void*)rdma_region_handle);
if (region->base > (uintptr_t) base || (region->base + region->len) < (uintptr_t) base) {
if ((uintptr_t)region->base > (uintptr_t) base || (uintptr_t)(region->base + region->len) < (uintptr_t) base) {
continue;
}

Просмотреть файл

@ -14,7 +14,7 @@
* Copyright (c) 2010-2011 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
* Copyright (c) 2019 Triad National Security, LLC. All rights
* reserved.
*
@ -91,8 +91,6 @@ shmem_posix_shm_open(char *posix_file_name_buff, size_t size)
* of here. we can't be selected :-(.
*/
else {
const char *hn;
hn = opal_gethostname();
opal_output_verbose(10, opal_shmem_base_framework.framework_output,
"shmem_posix_shm_open: disqualifying posix because "
"shm_open(2) failed with error: %s (errno %d)\n",

35
test/simple/Makefile Обычный файл
Просмотреть файл

@ -0,0 +1,35 @@
PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn \
concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child \
bad_exit pubsub hello_barrier segv accept connect hello_output hello_show_help \
crisscross read_write ziatest slave reduce-hang ziaprobe ziatest bcast_loop \
parallel_w8 parallel_w64 parallel_r8 parallel_r64 sio sendrecv_blaster early_abort \
debugger singleton_client_server intercomm_create spawn_tree init-exit77 mpi_info \
info_spawn server client ring binding badcoll attach xlib \
no-disconnect nonzero interlib pinterlib add_host
all: $(PROGS)
# These guys need additional -I flags
hello_output: hello_output.c
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@
hello_show_help: hello_show_help.c
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@
xlib: xlib.c
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@ -lpmix
pinterlib: pinterlib.c
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@ -lpmix
CC = mpicc
CFLAGS = -g --openmpi:linkall
CFLAGS_INTERNAL = -I../../.. -I../../../orte/include -I../../../opal/include
CXX = mpic++ --openmpi:linkall
CXXFLAGS = -g
FC = mpifort -openmpi:linkall
FCFLAGS = -g
clean:
rm -f $(PROGS) *~