Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LDMS: fixing lib include #1013

Merged
merged 2 commits into from
Nov 8, 2024
Merged

LDMS: fixing lib include #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e161d24
fixing lib include
Snell1224 Oct 30, 2024
786c7c5
updating ldms github url
Snell1224 Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/darshan_ldms_test_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 : |
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion maint/config/check_ldms.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])],
Expand Down
Loading