Skip to content

Commit

Permalink
ch4/ipc: remove xpmem_stub.c
Browse files Browse the repository at this point in the history
The xpmem functions are now always guarded by #ifdef
MPIDI_CH4_SHM_ENABLE_XPMEM.
  • Loading branch information
hzhou committed Jul 6, 2023
1 parent b0e8d40 commit d7cb5ea
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 37 deletions.
5 changes: 0 additions & 5 deletions src/mpid/ch4/shm/ipc/xpmem/Makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@
noinst_HEADERS += src/mpid/ch4/shm/ipc/xpmem/xpmem_pre.h \
src/mpid/ch4/shm/ipc/xpmem/xpmem_post.h

if BUILD_SHM_IPC_XPMEM
noinst_HEADERS += src/mpid/ch4/shm/ipc/xpmem/xpmem_seg.h \
src/mpid/ch4/shm/ipc/xpmem/xpmem_types.h

mpi_core_sources += src/mpid/ch4/shm/ipc/xpmem/globals.c \
src/mpid/ch4/shm/ipc/xpmem/xpmem_init.c \
src/mpid/ch4/shm/ipc/xpmem/xpmem_mem.c \
src/mpid/ch4/shm/ipc/xpmem/xpmem_seg.c

else
mpi_core_sources += src/mpid/ch4/shm/ipc/xpmem/xpmem_stub.c
endif
7 changes: 2 additions & 5 deletions src/mpid/ch4/shm/ipc/xpmem/subconfigure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[
[test "x$shm" = "xauto"],[build_ch4_shm_ipc_xpmem=auto])
done
])dnl end AM_COND_IF(BUILD_CH4,...)
AM_CONDITIONAL([BUILD_SHM_IPC_XPMEM],[test -n "$build_ch4_shm_ipc_xpmem"])
])dnl end _PREREQ

AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
AM_COND_IF([BUILD_SHM_IPC_XPMEM],[
if test -n "$build_ch4_shm_ipc_xpmem"; then
AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch4:shm:xpmem])
PAC_CHECK_HEADER_LIB_OPTIONAL([xpmem],[xpmem.h],[xpmem],[xpmem_make])
if test "$pac_have_xpmem" = "yes" ; then
Expand All @@ -25,8 +23,7 @@ AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
elif test "$build_ch4_shm_ipc_xpmem" = "yes" ; then
AC_MSG_ERROR(['xpmem.h or libxpmem library not found.'])
fi
AM_CONDITIONAL([BUILD_SHM_IPC_XPMEM],[test "$pac_have_xpmem" = "yes"])
])dnl end AM_COND_IF(BUILD_SHM_IPC_XPMEM,...)
fi
])dnl end _BODY

[#] end of __file__
27 changes: 0 additions & 27 deletions src/mpid/ch4/shm/ipc/xpmem/xpmem_stub.c

This file was deleted.

0 comments on commit d7cb5ea

Please sign in to comment.