Merge pull request #1013 from Snell1224/ldms_lib_include_patch

LDMS: fixing lib include
darshan-hpc · Nov 8, 2024 · bddda9d · bddda9d
2 parents f70f09e + 786c7c5
commit bddda9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/darshan_ldms_test_ci.yml b/.github/workflows/darshan_ldms_test_ci.yml
@@ -33,23 +33,23 @@ jobs:
     - name: Clone LDMS
       uses: actions/checkout@v3
       with:
-        repository: ovis-hpc/ovis
-        path: ovis
-        ref: OVIS-4
+        repository: ovis-hpc/ldms
+        path: ldms
+        ref: main
     - name: Install LDMS
       run: |
-        cd ovis
+        cd ldms
         sh autogen.sh
         set -e && mkdir -p build
         pushd build
-        ../configure --prefix=/opt/ovis-latest --enable-etc
+        ../configure --prefix=/opt/ldms-latest --enable-etc
         make && make install
     - name: Install Darshan
       run: |
         git submodule update --init
         # build darshan against LDMS library
         export DARSHAN_INSTALL_PREFIX=/opt/darshan_install
-        export DARSHAN_RUNTIME_CONFIG_ARGS="--enable-ldms-mod --with-ldms=/opt/ovis-latest --with-jobid-env=NONE"
+        export DARSHAN_RUNTIME_CONFIG_ARGS="--enable-ldms-mod --with-ldms=/opt/ldms-latest --with-jobid-env=NONE"
         darshan-test/automated/build-darshan.sh
     - name: Test Preparation and Run
       run : |
@@ -95,7 +95,7 @@ jobs:
         EOF
         echo "---starting ldmsd---"
         cat > ldmsd-latest.sh << EOF
-        . /opt/ovis-latest/etc/profile.d/set-ovis-variables.sh
+        . /opt/ldms-latest/etc/profile.d/set-ovis-variables.sh
         ldmsd \$@ &
         EOF
         chmod 755 ldmsd-latest.sh
@@ -105,7 +105,7 @@ jobs:
         pgrep -a ldmsd
         [[ -n "${STREAM_SAMP_LATEST_PID}" ]] || error "stream-samp-latest.log is not running"
         cat > ldms_ls-latest.sh << EOF
-        . /opt/ovis-latest/etc/profile.d/set-ovis-variables.sh
+        . /opt/ldms-latest/etc/profile.d/set-ovis-variables.sh
         ldms_ls \$@ &
         EOF
         chmod 755 ldms_ls-latest.sh

diff --git a/maint/config/check_ldms.m4 b/maint/config/check_ldms.m4
@@ -34,7 +34,7 @@ ldms_t ldms_xprt_new_with_auth(const char *xprt_name, const char *auth_name, str
   [
     AC_COMPILE_IFELSE(
       [AC_LANG_SOURCE([[
-#include <ldms/ldmsd_stream.h>
+#include <ldms/ldms.h>
 ldms_t ldms_xprt_new_with_auth(const char *xprt_name, ldms_log_fn_t log_fn, const char *auth_name, struct attr_value_list *auth_av_list);
 ]])],
       [AC_DEFINE([LDMS_XPRT_NEW_WITH_AUTH_4], [1], [Define if ldms_xprt_new_with_auth has 4 arguments])],