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.

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

Hotfix: fixes CI by correcting cpp-logger and DLIO profiler/dftracer stuff #117

Merged

Conversation

ilumsden
Copy link
Collaborator

@ilumsden ilumsden commented Jun 14, 2024

While looking at CI for other PRs, I found that GitHub Actions was failing to build DYAD because it couldn't find cpp-logger. After looking into the issue, I realized that our check for the <PackageName>_FOUND variable after find_package was simply using the wrong variable name. It was using CPP_LOGGER_FOUND, while it should have been using cpp-logger_FOUND. This PR corrects that variable name.

After fixing this issue with cpp-logger, I also discovered that CI was failing due to @hariharan-devarajan's recent renaming of DLIO profiler to dftracer. This PR also modifies the Python bindings to use the new name (and other minor API changes in dftracer).

@ilumsden ilumsden self-assigned this Jun 14, 2024
@ilumsden ilumsden added the bug Something isn't working label Jun 14, 2024
@ilumsden ilumsden force-pushed the cpp_logger_find_package_fix branch from dc75990 to c2a17a6 Compare July 3, 2024 16:31
@ilumsden ilumsden changed the title Hotfix: fixes find_package logic for cpp-logger Hotfix: fixes CI by correcting cpp-logger and DLIO profiler/dftracer stuff Jul 3, 2024
Copy link
Collaborator

@hariharan-devarajan hariharan-devarajan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few small comments.

pydyad/setup.cfg Outdated Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
@hariharan-devarajan
Copy link
Collaborator

@ilumsden We will have to switch DYAD_PROFILER macros to use DFTracer as well.

@ilumsden
Copy link
Collaborator Author

ilumsden commented Jul 3, 2024

Good point. I was only thinking about it from the Python side since that was the only place where things were failing in CI. But, if I'm going to make these changes in the Python API, I should do it in the main body of DYAD too. I'll work on that after lunch

@hariharan-devarajan
Copy link
Collaborator

I recommend doing a search on DLIO_PROFILER and replacing it with DFTRACER.

You will have macros, apis, env variables.

@ilumsden
Copy link
Collaborator Author

ilumsden commented Jul 3, 2024

@hariharan-devarajan I made all the changes you requested.

@@ -286,24 +289,25 @@ dyad_rc_t dyad_init (bool debug,
}

ctx->relative_to_managed_path = relative_to_managed_path;
DYAD_LOG_INFO (ctx, "DYAD_CORE INIT: relative_to_managed_path %s", \
DYAD_LOG_INFO (ctx,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will end up in a compilation error.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the formatting changes

"DYAD_MOD: Failed to load file \"%s\" only read %zd of %zd.", \
fullpath, \
inlen, \
DYAD_LOG_ERROR (mod_ctx->ctx,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bunch of missing ''s

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the formatting changes

if (flux_respond_error (h, msg, ENODATA, NULL) < 0) {
DYAD_LOG_ERROR (mod_ctx->ctx, "DYAD_MOD: %s: flux_respond_error with ENODATA failed\n", __func__ );
DYAD_LOG_ERROR (mod_ctx->ctx,
Copy link
Contributor

@JaeseungYeom JaeseungYeom Jul 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing '\'s

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the formatting changes

@JaeseungYeom
Copy link
Contributor

There are many needless styling modifications in this PR. Refrain from that in the future and focus on what the PR intends to fix.

Copy link
Contributor

@JaeseungYeom JaeseungYeom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the fixes of missing backslashes, all looks good.

@JaeseungYeom JaeseungYeom merged commit fac9b4d into flux-framework:main Jul 30, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants