Skip to content

Commit

Permalink
Minor tweak to CUDA op configury
Browse files Browse the repository at this point in the history
Signed-off-by: Joseph Schuchart <schuchart@icl.utk.edu>
  • Loading branch information
devreal committed Nov 7, 2023
1 parent 85a1a51 commit 11e6d2a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ompi/mca/op/cuda/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# First, list all .h and .c sources. It is necessary to list all .h
# files so that they will be picked up in the distribution tarball.

AM_CPPFLAGS = $(common_cuda_CPPFLAGS)
AM_CPPFLAGS = $(op_cuda_CPPFLAGS) $(op_cudart_CPPFLAGS)

dist_ompidata_DATA = help-ompi-mca-op-cuda.txt

Expand Down Expand Up @@ -67,7 +67,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
mca_op_cuda_la_SOURCES = $(sources)
mca_op_cuda_la_LIBADD = $(cu_sources:.cu=.lo)
mca_op_cuda_la_LDFLAGS = -module -avoid-version $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
$(accelerator_cuda_LIBS) $(accelerator_cudart_LIBS)
$(op_cuda_LIBS) $(op_cudart_LIBS)
EXTRA_mca_op_cuda_la_SOURCES = $(cu_sources)

# Specific information for static builds.
Expand All @@ -79,6 +79,6 @@ noinst_LTLIBRARIES = $(component_noinst)
libmca_op_cuda_la_SOURCES = $(sources)
libmca_op_cuda_la_LIBADD = $(cu_sources:.cu=.lo)
libmca_op_cuda_la_LDFLAGS = -module -avoid-version\
$(accelerator_cuda_LIBS) $(accelerator_cudart_LIBS)
$(op_cuda_LIBS) $(op_cudart_LIBS)
EXTRA_libmca_op_cuda_la_SOURCES = $(cu_sources)

5 changes: 5 additions & 0 deletions ompi/mca/op/cuda/configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ AC_DEFUN([MCA_ompi_op_cuda_CONFIG],[
AC_CONFIG_FILES([ompi/mca/op/cuda/Makefile])

OPAL_CHECK_CUDA([op_cuda])
OPAL_CHECK_CUDART([op_cudart])

AS_IF([test "x$CUDA_SUPPORT" = "x1"],
[$1],
Expand All @@ -33,4 +34,8 @@ AC_DEFUN([MCA_ompi_op_cuda_CONFIG],[
AC_SUBST([op_cuda_LDFLAGS])
AC_SUBST([op_cuda_LIBS])

AC_SUBST([op_cudart_CPPFLAGS])
AC_SUBST([op_cudart_LDFLAGS])
AC_SUBST([op_cudart_LIBS])

])dnl

0 comments on commit 11e6d2a

Please sign in to comment.