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

Adding I/O type for ADIOS compression & Updating SCORPIO to v1.6.6 #6738

Merged
merged 4 commits into from
Nov 13, 2024
Merged

Adding I/O type for ADIOS compression & Updating SCORPIO to v1.6.6 #6738

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bedfbb
Adding support for PIO_IOTYPE_ADIOSC
jayeshkrishna Nov 5, 2024
a1c1f07
Adding a testmod to force ADIOS BP compression
jayeshkrishna Nov 5, 2024
d9691e6
Updating to SCORPIO v1.6.6
jayeshkrishna Nov 5, 2024
9331f79
Adding support for ADIOS builds with BLOSC
jayeshkrishna Nov 11, 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
3 changes: 2 additions & 1 deletion cime_config/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1987,7 +1987,8 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
<env name="PERL5LIB">/nfs/gce/projects/climate/software/perl5/lib/perl5</env>
</environment_variables>
<environment_variables compiler="gnu" mpilib="mpich">
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/adios2/2.9.1/mpich-4.1.2/gcc-12.1.0; else echo "$ADIOS2_ROOT"; fi}</env>
<env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/adios2/2.10.1/mpich-4.1.2/gcc-12.1.0; else echo "$ADIOS2_ROOT"; fi}</env>
<env name="BLOSC2_ROOT">$SHELL{if [ -z "$BLOSC2_ROOT" ]; then echo /nfs/gce/projects/climate/software/linux-ubuntu22.04-x86_64/c-blosc2/2.15.1/gcc-12.1.0; else echo "$BLOSC2_ROOT"; fi}</env>
</environment_variables>
</machine>

Expand Down
2 changes: 2 additions & 0 deletions cime_config/testmods_dirs/io/force_adiosc/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
./xmlchange PIO_TYPENAME="adiosc"
2 changes: 1 addition & 1 deletion driver-mct/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2628,7 +2628,7 @@

<entry id="PIO_TYPENAME">
<type>char</type>
<valid_values>netcdf,pnetcdf,netcdf4p,netcdf4c,adios,hdf5,default</valid_values>
<valid_values>netcdf,pnetcdf,netcdf4p,netcdf4c,adios,adiosc,hdf5,default</valid_values>
<group>run_pio</group>
<file>env_run.xml</file>
<desc>pio io type</desc>
Expand Down
2 changes: 1 addition & 1 deletion driver-moab/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2620,7 +2620,7 @@

<entry id="PIO_TYPENAME">
<type>char</type>
<valid_values>netcdf,pnetcdf,netcdf4p,netcdf4c,adios,hdf5,default</valid_values>
<valid_values>netcdf,pnetcdf,netcdf4p,netcdf4c,adios,adiosc,hdf5,default</valid_values>
<group>run_pio</group>
<file>env_run.xml</file>
<desc>pio io type</desc>
Expand Down
2 changes: 1 addition & 1 deletion externals/scorpio
Open in desktop
Submodule scorpio updated 461 files
8 changes: 8 additions & 0 deletions share/build/buildlib.spio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ def buildlib(bldroot, installpath, case):
# ADIOS2_ROOT. This is a workaround
if "ADIOS2_ROOT" in os.environ:
os.environ["ADIOS2_DIR"] = os.environ["ADIOS2_ROOT"]
if "BLOSC2_ROOT" in os.environ:
os.environ["Blosc2_DIR"] = os.environ["BLOSC2_ROOT"]

# If variable PIO_VERSION_MAJOR is defined in the environment then
# we assume that PIO is installed on the system
Expand Down Expand Up @@ -105,10 +107,14 @@ def buildlib(bldroot, installpath, case):
else:
cmake_opts += f"-DGENF90_PATH={scorpio_src_dir}/src/genf90 "

adiosc_found = False
if "ADIOS2_ROOT" in os.environ:
cmake_opts += "-DWITH_ADIOS2:BOOL=ON "
if "FROM_CREATE_TEST" in os.environ and os.environ["FROM_CREATE_TEST"] == "True":
cmake_opts += "-DADIOS_BP2NC_TEST:BOOL=ON "
if "BLOSC2_ROOT" in os.environ:
cmake_opts += "-DADIOS_USE_COMPRESSION:BOOL=ON "
adiosc_found = True

if debug:
cmake_opts += "-DPIO_ENABLE_LOGGING=ON "
Expand Down Expand Up @@ -281,6 +287,8 @@ def buildlib(bldroot, installpath, case):
valid_values += ",netcdf4p,netcdf4c"
if adios_found:
valid_values += ",adios"
if adiosc_found:
valid_values += ",adiosc"
if hdf5_found:
valid_values += ",hdf5"

Expand Down
2 changes: 2 additions & 0 deletions share/util/shr_pio_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,8 @@ subroutine shr_pio_getiotypefromname(typename, iotype, defaulttype)
#ifndef PIO1
else if ( typename .eq. 'ADIOS') then
iotype = pio_iotype_adios
else if ( typename .eq. 'ADIOSC') then
iotype = pio_iotype_adiosc
else if ( typename .eq. 'HDF5') then
iotype = pio_iotype_hdf5
#endif
Expand Down