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

Add the VariableExprStr function in the CampaignReader #4401

Merged
merged 1 commit into from
Nov 17, 2024

Conversation

anagainaru
Copy link
Contributor

@anagainaru anagainaru commented Nov 16, 2024

so that bpls can show the derived expression when applied to aca files.

With this PR:

$ ./bin/bpls -l gray-scott-derived-run1.aca --show-derived
  double   gs-derived.bp/U              200*{128, 128, 128} = 0.0813067 / 1
  double   gs-derived.bp/V              200*{128, 128, 128} = 0 / 0.674805
  double   gs-derived.bp/derived/sumUV  200*{128, 128, 128} = 0.306159 / 1
    Derived variable with expression: ADD({U},{V})
  int32_t  gs-derived.bp/step           200*scalar = 10 / 2000

Before this PR:

$ ./bin/bpls -l gray-scott-derived-run1.aca --show-derived
  double   gs-derived.bp/U              200*{128, 128, 128} = 0.0813067 / 1
  double   gs-derived.bp/V              200*{128, 128, 128} = 0 / 0.674805
  double   gs-derived.bp/derived/sumUV  200*{128, 128, 128} = 0.306159 / 1
  int32_t  gs-derived.bp/step           200*scalar = 10 / 2000

@anagainaru anagainaru requested a review from pnorbert November 16, 2024 23:38
@eisenhauer
Copy link
Member

bpls changes separate?

@anagainaru
Copy link
Contributor Author

bpls changes separate?

bpls.cpp doesn't need to be changed. As long as the VariableExprStr function in the engine returns a string, we print the derived expression. Engines that do not have this function (like the CampaignReader was) fall back to the default function in the base Engine class (which returns an empty string -- meaning there is no derived expression)

@pnorbert
Copy link
Contributor

bpls changes separate?

It was already there for .bp. This is for support in the .aca (campaign reader engine)

@anagainaru
Copy link
Contributor Author

I am re-runing the tests that failed. For future reference this was the test that was failing (in GitHub Actions / ubuntu (ubuntu20.04, clang6, ompi):

ompi/bin/Test.Engine.Staging.OnDemandMPI.MPI" "--gtest_filter=TestOnDemandMPI.ADIOS2OnDemandMPI" "SST" "OnDemandContact"
2024-11-16T23:54:15.7637634Z 731: Working Directory: /__w/ADIOS2/ADIOS2/ubuntu20.04-clang6-ompi/testing/adios2/engine/staging-common
2024-11-16T23:54:15.7638449Z 731: Test timeout computed to be: 120
2024-11-16T23:54:15.8974303Z 731: Note: Google Test filter = TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:15.8975297Z 731: [==========] Running 1 test from 1 test suite.
2024-11-16T23:54:15.8976272Z 731: [----------] Global test environment set-up.
2024-11-16T23:54:15.8977042Z 731: [----------] 1 test from TestOnDemandMPI
2024-11-16T23:54:15.8981675Z 731: [ RUN      ] TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:15.8987432Z 731: Note: Google Test filter = TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:15.8988295Z 731: [==========] Running 1 test from 1 test suite.
2024-11-16T23:54:15.8989165Z 731: [----------] Global test environment set-up.
2024-11-16T23:54:15.8989936Z 731: [----------] 1 test from TestOnDemandMPI
2024-11-16T23:54:15.8996007Z 731: [ RUN      ] TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:15.8996898Z 731: Note: Google Test filter = TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:15.9003355Z 731: Note: Google Test filter = TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:15.9004258Z 731: [==========] Running 1 test from 1 test suite.
2024-11-16T23:54:15.9011555Z 731: [----------] Global test environment set-up.
2024-11-16T23:54:15.9012051Z 731: [----------] 1 test from TestOnDemandMPI
2024-11-16T23:54:15.9015221Z 731: [ RUN      ] TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:15.9018970Z 731: [==========] Running 1 test from 1 test suite.
2024-11-16T23:54:15.9022325Z 731: [----------] Global test environment set-up.
2024-11-16T23:54:15.9025926Z 731: [----------] 1 test from TestOnDemandMPI
2024-11-16T23:54:15.9029309Z 731: [ RUN      ] TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:24.8828673Z 731: The writer exited before the SST Reader Open could be completed.
2024-11-16T23:54:24.8834348Z 731: The writer exited before the SST Reader Open could be completed.
2024-11-16T23:54:24.8835143Z 731: unknown file: Failure
2024-11-16T23:54:24.8837900Z 731: C++ exception with description "�[1;36m[Sat Nov 16 15:54:24 2024]�[1;34m [ADIOS2 EXCEPTION]�[0m <Engine> <SstReader> <SstReader> : SstReader did not find active Writer contact info in file "OnDemandContact.sst".  Timeout or non-current SST contact file?�[0m
2024-11-16T23:54:24.8839971Z 731: " thrown in the test body.
2024-11-16T23:54:24.8840644Z 731: [  FAILED  ] TestOnDemandMPI.ADIOS2OnDemandMPI (8987 ms)
2024-11-16T23:54:24.8841584Z 731: [----------] 1 test from TestOnDemandMPI (8987 ms total)
2024-11-16T23:54:24.8842133Z 731: 
2024-11-16T23:54:24.8842631Z 731: [----------] Global test environment tear-down
2024-11-16T23:54:24.8843138Z 731: [==========] 1 test from 1 test suite ran. (8987 ms total)
2024-11-16T23:54:24.8843807Z 731: [  PASSED  ] 0 tests.
2024-11-16T23:54:24.8844110Z 731: [  FAILED  ] 1 test, listed below:
2024-11-16T23:54:24.8844503Z 731: [  FAILED  ] TestOnDemandMPI.ADIOS2OnDemandMPI
2024-11-16T23:54:24.8844963Z 731: 
2024-11-16T23:54:24.8845180Z 731:  1 FAILED TEST
2024-11-16T23:54:24.8845429Z 731: unknown file: Failure
2024-11-16T23:54:24.8847057Z 731: C++ exception with description "�[1;36m[Sat Nov 16 15:54:24 2024]�[1;34m [ADIOS2 EXCEPTION]�[0m <Engine> <SstReader> <SstReader> : SstReader did not find active Writer contact info in file "OnDemandContact.sst".  Timeout or non-current SST contact file?�[0m
2024-11-16T23:54:24.8848343Z 731: " thrown in the test body.
2024-11-16T23:54:24.8848758Z 731: [  FAILED  ] TestOnDemandMPI.ADIOS2OnDemandMPI (8987 ms)
2024-11-16T23:54:24.8849310Z 731: [----------] 1 test from TestOnDemandMPI (8987 ms total)

@eisenhauer
Copy link
Member

That failure is commonly caused by a test output filename conflict, but I don't see one by inspection.

@eisenhauer
Copy link
Member

MSAN didn't even come close to completing, only finishing 657 of 760 tests. I'm going to merge without waiting for that status.

@eisenhauer eisenhauer merged commit 64218a2 into ornladios:master Nov 17, 2024
37 of 38 checks passed
@anagainaru anagainaru deleted the CampaignDerivedStr branch November 17, 2024 01:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants