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 CURL function to derived variables #4114

Merged
merged 31 commits into from
Apr 3, 2024
Merged

Conversation

lizdulac
Copy link
Collaborator

@lizdulac lizdulac commented Mar 28, 2024

This PR adds CURL to the supported expressions for the derived variables.

    bpOut.DefineDerivedVariable(derivedname,
                                "Vx =sim\vx \n"
                                "Vy =sim\vy \n"
                                "Vz =sim\vz \n"
                                "curl(Vx,Vy,Vz)",
                                adios2::DerivedVarType::StoreData);

@@ -185,7 +185,7 @@ adios_option(Sodium "Enable support for Sodium for encryption" AUTO)
adios_option(Catalyst "Enable support for in situ visualization plugin using ParaView Catalyst" AUTO)
adios_option(Campaign "Enable support for Campaigns (requires SQLite3 and ZLIB)" AUTO)
adios_option(AWSSDK "Enable support for S3 compatible storage using AWS SDK's S3 module" OFF)
adios_option(Derived_Variable "Enable support for derived variables" OFF)
adios_option(Derived_Variable "Enable support for derived variables" ON)
Copy link
Contributor

Choose a reason for hiding this comment

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

Just checking whether we are turning ON derived variables for 2.10.

Copy link
Contributor

Choose a reason for hiding this comment

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

We are not, I am reviewing this today and we turn it off before we merge

@vicentebolea vicentebolea added this to the v2.10.0 milestone Apr 2, 2024
@anagainaru anagainaru changed the title Curl Add the Curl function to derived variables Apr 3, 2024
@anagainaru anagainaru changed the title Add the Curl function to derived variables Add the CURL function to derived variables Apr 3, 2024
@anagainaru anagainaru merged commit 732fff4 into ornladios:master Apr 3, 2024
39 checks passed
@anagainaru
Copy link
Contributor

Ah I forgot to set the derived variables OFF, @vicentebolea instead of reverting this I will create a new PR

@lizdulac lizdulac deleted the curl branch April 3, 2024 17:55
vicentebolea pushed a commit to vicentebolea/ADIOS2 that referenced this pull request Apr 3, 2024
* Derived Expressions Curl function with correctness test

* Fixing index bug for internal boundaries

* Curl Correctness Test Cleanup

* Remove debug statements in Test

* Merging Bison3.8 parser into ADIOS (ERRORS - cannot build)

* CMake Tweaks

* whoops, missed the cmake file.

* Updated parser merged with adios, updated error message for missing operation, missing curl implementation

* Clean up

* Removed 'var' keyword from grammar and correctness test, and minor changes: ensured only one expression in grammar, turned off scanner debugging, resolved shift/reduce conflicts, ASTNode prettyprint can be called without operand.

* Set Derived_Variable flag to ON (for CI testing)

* Remove unnecessary files

* Cleanup curl code

* Formatting

* Formatting

* Restore examples CMakeLists.txt file

* Restore cmake compile flags

* Unused variable curlV in testing

* Implicit type conversion warnings

* Formatting

* Use float specific math, remove infinity check

* Convert size_t iterator to float math

* Default to DerivedVariables OFF

* Default to DerivedVariables ON

* Change the way to check for dimension equality and function rename

* format

---------

Co-authored-by: lizdulac <lizadulac@gmail.com>
Co-authored-by: Greg Eisenhauer <eisen@cc.gatech.edu>
Co-authored-by: anagainaru <ana.gainaru@gmail.com>
vicentebolea added a commit that referenced this pull request Apr 3, 2024
* origin/release_210: (124 commits)
  Bump version to v2.10.0
  Setting the derived variable support OFF by default
  Add the CURL function to derived variables (#4114)
  Add -f file1 [file2...] option to process adios files from a list instead of a campaign recording
  DataPlane Configuration changes (#4121)
  update doc
  Add attribute support to campaign
  Add a random string to each database name to avoid collision when running multiple applications in the same directory at the same time. Fixes issues with CI that runs ctest in parallel
  Initialize ADIOS::m_UserOption before tentaively calling ProcessUserConfig()
  - set ACA version to  0.1 - remove debug prints - add doc on Campaign Management in Advanced section - change static struct of UserOptions to class member of ADIOS class to make it work with gcc 4.8
  used size_t not int for map indexing to avoid type conversion
  fix remote server test, use the new binary name
  clang-format
  Use the name of the campaign in the cache path to avoid name collision
  rename remote_server to adios2_remote_server
  bug fix: the order of entries in bpdataset table is undefined but the campaign data reader relied on calculating the index as if it was sorted by the insertion order. Use a map instead to store the rowid and use that as index for the bpfile elements.
  Use yaml parser in campaign manager python script
  change a long variable to int64_t to avoid size confusion on windows
  do not include unistd.h
  Fix compiler error Remove extra file not needed
  ...
dmitry-ganyushin added a commit to dmitry-ganyushin/ADIOS2 that referenced this pull request Apr 16, 2024
* origin/adios-xrootd: (164 commits)
  Fixes for FreeBSD, including upstream (ornladios#4138)
  Bump version to v2.10.0
  Setting the derived variable support OFF by default
  Add the CURL function to derived variables (ornladios#4114)
  Add -f file1 [file2...] option to process adios files from a list instead of a campaign recording
  DataPlane Configuration changes (ornladios#4121)
  update doc
  Add attribute support to campaign
  Add a random string to each database name to avoid collision when running multiple applications in the same directory at the same time. Fixes issues with CI that runs ctest in parallel
  Initialize ADIOS::m_UserOption before tentaively calling ProcessUserConfig()
  - set ACA version to  0.1 - remove debug prints - add doc on Campaign Management in Advanced section - change static struct of UserOptions to class member of ADIOS class to make it work with gcc 4.8
  used size_t not int for map indexing to avoid type conversion
  fix remote server test, use the new binary name
  clang-format
  Use the name of the campaign in the cache path to avoid name collision
  rename remote_server to adios2_remote_server
  bug fix: the order of entries in bpdataset table is undefined but the campaign data reader relied on calculating the index as if it was sorted by the insertion order. Use a map instead to store the rowid and use that as index for the bpfile elements.
  Use yaml parser in campaign manager python script
  change a long variable to int64_t to avoid size confusion on windows
  do not include unistd.h
  Fix compiler error Remove extra file not needed
  Add support for user options in ~/.config/adios2/adios2.yaml Currently supported options:
  cmake: add sqlite3 and zlib dep in adios2 cmake pkg
  Different names for MPI and Serial tests (ornladios#4118)
  EVpath upstream to make NO_RDMA more robust (ornladios#4116)
  Warnings (ornladios#4113)
  Don't use assert() in tests (ornladios#4108)
  - Only add campaign store to file name if that is not absolute path - list command supports second argument as path
  flake8 fixes
  Update campaign manager script to handle config file, time in nanosecond format, and avoiding conflict when updating database
  dill 2024-03-12 (ebc98c4d) (ornladios#4091)
  Don't run derived test in MPI mode, it's not written for that (ornladios#4104)
  Fix static blosc2 build (ornladios#4093)
  ci: add ccache job summary (ornladios#4101)
  Fix typo in fortran.rst (ornladios#4102)
  WIP: Make Fortran tests fail with a non-zero exit code (ornladios#4097)
  Bison 3.8 Parser (ornladios#4062)
  Do not create adios-campaign/ unless there is something to record
  Add setup for Aurora (load adios2 as e4s package)
  Completely hide derived variables in C API if not enabled. Print warning inside Fortran F2C function.
  adios2_define_derived_variable C/Fortran API. C is compiled conditionally, like the C++ API. The Fortran function is always available, it will print a WARNING if derived variable is not supported. Added Fortran test for magnitude().
  Fix links to tutorial materials (ornladios#4086)
  BlockIndex.Evaluate() made branch based on BP5 vs BP4. To support CampaignReader engine, decision is made based on whether MinBlocksInfo is supported by engine.
  Update documentation for 2.10 changes to the GPU-backend (ornladios#4083)
  Add test for single string attribute vs string array attribute with a single element
  - Python: fix for scalar reading. If a global value has 1 step (i.e. always in streaming), read returns a 0-dim numpy array (single value). If the variable has multiple steps (only in ReadRandomAccess mode), read returns a 1-dim numpy array even if the step selection is a single step. This way, read of a certain variable always results in the same type of array no matter the number of steps selected. - Python: fix for string attributes: return a string, not a list of one element which is a string, to be consistent with string global values and with other APIs.
  format more
  format
  Python: add the same treatment to attributes as to variables before: return scalars (0-dim ndarray) for single value attributes.
  Raise an exception if remote open fails (ornladios#4069)
  Fortran bindings for memory space related functions (ornladios#4077)
  consolidate (ornladios#4078)
  Making the Detect memory space available regardless of the backend used
  Testing code for the C bindings with memory space API
  Adding c bindings for getting the shape of a variable based on a memory space
  Adding c bindings for setting and getting the memory space
  Small typo fixes
  - Restructure python API doc in separate main topic, add working example to it. - What's new for 2.10 - Usage on DOE machines
  Fix Reord to use MinBlocksInfo where appropriate (ornladios#4071)
  Using the correct flag to detect the CUDA backend in ZFP
  clang-format fix
  fixed warning
  added support to read back from H5T_STRING VARIABLES it turns out strings written out through h5py are all variable strings
  format
  fixes to still be able to build with gcc 4.8.2. Needed for OLCF DTN nodes
  Add minmax and shape functions to CampaignReader, so that per-block info is complete when listing campaign archives
  do not flush io and adios in read mode. BP5 reader does not like it.
  Campaign engine is recognized by file extension.
  WIP. Changed the name of the campaign config file.
  Added reading of configuration parametyers from ./config/adios2
  Use GetEstimatedSize in encryption operator plugin
  Allow plugin operators to take advantage of the estimated size API
  Setting the derived variable support OFF by default
  Add the CURL function to derived variables (ornladios#4114)
  Add -f file1 [file2...] option to process adios files from a list instead of a campaign recording
  DataPlane Configuration changes (ornladios#4121)
  update doc
  Add attribute support to campaign
  Add a random string to each database name to avoid collision when running multiple applications in the same directory at the same time. Fixes issues with CI that runs ctest in parallel
  Initialize ADIOS::m_UserOption before tentaively calling ProcessUserConfig()
  - set ACA version to  0.1 - remove debug prints - add doc on Campaign Management in Advanced section - change static struct of UserOptions to class member of ADIOS class to make it work with gcc 4.8
  used size_t not int for map indexing to avoid type conversion
  fix remote server test, use the new binary name
  clang-format
  Use the name of the campaign in the cache path to avoid name collision
  rename remote_server to adios2_remote_server
  bug fix: the order of entries in bpdataset table is undefined but the campaign data reader relied on calculating the index as if it was sorted by the insertion order. Use a map instead to store the rowid and use that as index for the bpfile elements.
  Use yaml parser in campaign manager python script
  change a long variable to int64_t to avoid size confusion on windows
  do not include unistd.h
  Fix compiler error Remove extra file not needed
  Add support for user options in ~/.config/adios2/adios2.yaml Currently supported options:
  cmake: add sqlite3 and zlib dep in adios2 cmake pkg
  Different names for MPI and Serial tests (ornladios#4118)
  EVpath upstream to make NO_RDMA more robust (ornladios#4116)
  Warnings (ornladios#4113)
  Don't use assert() in tests (ornladios#4108)
  - Only add campaign store to file name if that is not absolute path - list command supports second argument as path
  flake8 fixes
  Update campaign manager script to handle config file, time in nanosecond format, and avoiding conflict when updating database
  ...
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.

5 participants