Merge branch 'develop' into feature/taylor/shroud-0.14.0

Author: ltaylor16

RELEASE-NOTES.md

@@ -21,6 +21,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 ### Added
 - Adds the `AXOM_ENABLE_TUTORIALS` configuration variable (`ON` by default)
 - Adds a tutorial on shaping in Axom and associated infrastructure in `quest`, `klee`, `inlet` and `sidre`.
+- Added iterators and Attribute class to the Python interface for sidre.
 
 ###  Changed
 - Treatment of materials on strided-structured Blueprint meshes has changed in `axom::mir`.

scripts/spack/packages/axom/package.py

@@ -378,23 +378,20 @@ def initconfig_hardware_entries(self):
             )
             hip_link_flags += "-lmpi_gtl_hsa "
 
+            if spec.satisfies("^[email protected]:"):
+                hip_link_flags += "-L{0}/lib/llvm/lib -Wl,-rpath,{0}/lib/llvm/lib ".format(rocm_root)
+            else:
+                hip_link_flags += "-L{0}/llvm/lib -Wl,-rpath,{0}/llvm/lib ".format(rocm_root)
+            # Only amdclang requires this path; cray compiler fails if this is included
+            if spec.satisfies("%llvm-amdgpu"):
+                hip_link_flags += "-L{0}/lib -Wl,-rpath,{0}/lib ".format(rocm_root)
+            hip_link_flags += "-lpgmath -lompstub "
+
             # Fixes for mpi for rocm until wrapper paths are fixed
             # These flags are already part of the wrapped compilers on TOSS4 systems
             if spec.satisfies("+fortran") and self.is_fortran_compiler("amdflang"):
-
                 hip_link_flags += "-Wl,--disable-new-dtags "
-
-                if spec.satisfies("^[email protected]:"):
-                    hip_link_flags += "-L{0}/lib/llvm/lib -Wl,-rpath,{0}/lib/llvm/lib ".format(
-                        rocm_root
-                    )
-                else:
-                    hip_link_flags += "-L{0}/llvm/lib -Wl,-rpath,{0}/llvm/lib ".format(rocm_root)
-
-                # Only amdclang requires this path; cray compiler fails if this is included
-                hip_link_flags += "-L{0}/lib -Wl,-rpath,{0}/lib ".format(rocm_root)
-
-                hip_link_flags += "-lpgmath -lflang -lflangrti -lompstub "
+                hip_link_flags += "-lflang -lflangrti "
 
             # Additional library path for cray compiler
             if self.spec.satisfies("%cce"):

src/axom/sidre/examples/CMakeLists.txt

@@ -157,11 +157,15 @@ if(NANOBIND_FOUND)
     foreach(example_source ${Py_example_sources})
         get_filename_component(exe_name ${example_source} NAME_WE)
 
+        # Copy python example file to build
+        axom_configure_file ("${example_source}"
+                             "${EXAMPLE_OUTPUT_DIRECTORY}/${example_source}" COPYONLY)
+
         # Use convenience script to run python examples
         if(AXOM_ENABLE_PYTHON_TESTS)
             axom_add_test (
                 NAME    ${exe_name}
-                COMMAND ${PROJECT_BINARY_DIR}/bin/run_python_with_axom.sh ${CMAKE_CURRENT_SOURCE_DIR}/${example_source}
+                COMMAND ${PROJECT_BINARY_DIR}/bin/run_python_with_axom.sh ${EXAMPLE_OUTPUT_DIRECTORY}/${example_source}
             )
         endif()
     endforeach()

src/axom/sidre/examples/sidre_createdatastore_Py.py

@@ -14,8 +14,9 @@ def create_datastore(region):
 	ds = pysidre.DataStore()
 	root = ds.getRoot()
 
-	# TODO - Implement Attributes for python
 	# Create two attributes
+	ds.createAttributeScalar("vis", 0)
+	ds.createAttributeScalar("restart", 1)
 
 	# Create group children of root group
 	state = root.createGroup("state")
@@ -56,6 +57,10 @@ def create_datastore(region):
 	temp = fields.createViewAndAllocate("temp", pysidre.TypeID.DOUBLE_ID, eltcount)
 	rho = fields.createViewAndAllocate("rho", pysidre.TypeID.DOUBLE_ID, eltcount)
 
+	# Explicitly set values for the "vis" Attribute on the "temp" and "rho" buffers.
+	temp.setAttributeScalar("vis", 1)
+	rho.setAttributeScalar("vis", 1)
+
 	# The "fields" Group also contains a child Group "ext" which holds a pointer
 	# to an externally owned integer array.  Although Sidre does not own the
 	# data, the data can still be described to Sidre.
@@ -101,8 +106,48 @@ def access_datastore(ds):
 
 	return ds
 
+def iterate_datastore(ds):
+	fill_line = "=" * 80
+	print(fill_line)
+
+	# iterate through the attributes in ds
+	print("The datastore has the following attributes:")
+	for attr in ds.attributes():
+		print(f"* [{attr.getIndex()}] '{attr.getName()}' of type "
+			  f"{attr.getTypeID()} "
+
+			  # Requires conduit::Node information
+			  # f"and default value: {attr.getDefaultNodeRef().to_yaml()}\n"
+			  )
+
+	# iterate through the buffers in ds
+	print(fill_line)
+	print("The datastore has the following buffers:")
+	for buff in ds.buffers():
+		print(f"* [{buff.getIndex()}] "
+			  f"{'Allocated' if buff.isAllocated() else 'Unallocated'} buffer with "
+			  f"{buff.getNumElements()} elements of type {buff.getTypeID()} with "
+			  f"{buff.getNumViews()} views")
+	print(fill_line)
+
+	# iterate through the groups of the root group
+	print("The root group has the following groups:")
+	for grp in ds.getRoot().groups():
+		print(f"* [{grp.getIndex()}] '{grp.getName()}' with "
+			  f"{grp.getNumGroups()} groups and {grp.getNumViews()} views")
+	print(fill_line)
+
+	# iterate through the views of the 'state' group
+	print("The 'state' group has the following views:")
+	for view in ds.getRoot().getGroup("state").views():
+		print(f"* [{view.getIndex()}] '{view.getName()}' -- "
+			  f"{'Allocated' if view.isAllocated() else 'Unallocated'} view of type "
+			  f"{view.getTypeID()} and {view.getNumElements()} elements")
+	print(fill_line)
+
 
 if __name__=="__main__":
 	region = np.zeros(3375, dtype = int)
 	ds = create_datastore(region)
 	access_datastore(ds)
+	iterate_datastore(ds)