accelerator/rocm: update configure logic and Makefile

update configure and compile logic to avoid adding hip libraries to the
generic Open MPI LIBS.

Signed-off-by: Edgar Gabriel <[email protected]>
(cherry picked from commit 0254552)

Author: edgargabriel

config/opal_check_rocm.m4

@@ -36,7 +36,7 @@ AC_DEFUN([OPAL_CHECK_ROCM],[
            [ with_rocm="/opt/rocm"] )
 
      rocm_CPPFLAGS="-D__HIP_PLATFORM_AMD__"
-     rocm_LDFLAGS="-L${with_rocm}/lib/hip"
+     rocm_LDFLAGS="-L${with_rocm}/lib/"
 
      AS_IF([ test -n "$with_rocm" && test "$with_rocm" != "no" ],
            [ OPAL_APPEND([CPPFLAGS], [$rocm_CPPFLAGS])
@@ -52,15 +52,11 @@ AC_DEFUN([OPAL_CHECK_ROCM],[
 
      LDFLAGS="$rocm_save_LDFLAGS"
      LIBS="$rocm_save_LIBS"
-     OPAL_APPEND([CPPFLAGS], [${$1_CPPFLAGS}] )
-     OPAL_APPEND([LDFLAGS], [${$1_LDFLAGS}] )
-     OPAL_APPEND([LIBS], [${$1_LIBS}] )
-
-     AS_IF([ test "$opal_check_rocm_happy" = "no" ],
-           [ CPPFLAGS="$rocm_save_CPPFLAGS"])
+     CPPFLAGS="$rocm_save_CPPFLAGS"
 
      AS_IF([ test "$opal_check_rocm_happy" = "yes" ],
-           [ AC_DEFINE_UNQUOTED([OPAL_ROCM_SUPPORT], [1], [Enable ROCm support])
+           [ OPAL_APPEND([$1_CPPFLAGS], [$rocm_CPPFLAGS])
+	     AC_DEFINE_UNQUOTED([OPAL_ROCM_SUPPORT], [1], [Enable ROCm support])
              ROCM_SUPPORT=1 ],
            [ AC_DEFINE_UNQUOTED([OPAL_ROCM_SUPPORT], [0], [Disable ROCm support])
              ROCM_SUPPORT=0 ])

opal/mca/accelerator/rocm/Makefile.am

@@ -13,7 +13,7 @@
 #
 
 
-AM_CPPFLAGS = $(common_rocm_CPPFLAGS)
+AM_CPPFLAGS = $(opal_rocm_CPPFLAGS)
 
 sources = \
         accelerator_rocm.h \

opal/mca/accelerator/rocm/configure.m4

@@ -24,4 +24,5 @@ AC_DEFUN([MCA_opal_accelerator_rocm_CONFIG],[
 	  [$2])
     AC_SUBST([opal_rocm_LDFLAGS])
     AC_SUBST([opal_rocm_LIBS])
+    AC_SUBST([opal_rocm_CPPFLAGS])
 ])dnl