Deep copy from Sidre to Conduit

src/axom/core/execution/internal/omp_exec.hpp

@@ -66,7 +66,7 @@ struct execution_space<OMP_EXEC>
   }
   static bool usesMemorySpace(axom::MemorySpace m) noexcept
   {
-    return m == MemorySpace::Dynamic
+    return m == MemorySpace::Dynamic || m == MemorySpace::Malloc
 #ifdef AXOM_USE_UMPIRE
       || m == MemorySpace::Host || m == MemorySpace::Unified
 #endif

src/axom/quest/IntersectionShaper.hpp

@@ -2799,7 +2799,8 @@ class IntersectionShaper : public Shaper
     // m_bpGrp->createNativeLayout(m_bpNodeInt);
 
     const conduit::Node& topoNode = m_bpNodeInt.fetch_existing("topologies").fetch_existing(m_bpTopo);
-    const std::string coordsetName = topoNode.fetch_existing("coordset").as_string();
+    const conduit::Node& topoCoordsetNode = topoNode.fetch_existing("coordset");
+    const std::string coordsetName = topoCoordsetNode.as_string();
 
     // Assume unstructured and hexahedral
     SLIC_ERROR_IF(topoNode["type"].as_string() != "unstructured",

src/axom/quest/Shaper.cpp

@@ -79,12 +79,6 @@ Shaper::Shaper(RuntimePolicy execPolicy,
   // This may take too long if there are repeated construction.
   m_bpGrp->createNativeLayout(m_bpNodeInt);
 
-#if defined(AXOM_DEBUG)
-  std::string whyBad;
-  bool goodMesh = verifyInputMesh(whyBad);
-  SLIC_ASSERT_MSG(goodMesh, whyBad);
-#endif
-
   m_cellCount = conduit::blueprint::mesh::topology::length(
     m_bpNodeInt.fetch_existing("topologies").fetch_existing(m_bpTopo));
 
@@ -113,8 +107,7 @@ Shaper::Shaper(RuntimePolicy execPolicy,
 {
   AXOM_ANNOTATE_SCOPE("Shaper::Shaper_Node");
   m_bpGrp = m_dataStore.getRoot()->createGroup("internalGrp");
-  m_bpGrp->setDefaultAllocator(m_allocatorId);
-
+  m_bpGrp->setDefaultArrayAllocator(m_allocatorId);
   m_bpGrp->importConduitTreeExternal(bpNode);
 
   // We want unstructured topo but can accomodate structured.
@@ -146,12 +139,6 @@ Shaper::Shaper(RuntimePolicy execPolicy,
 
   m_bpGrp->createNativeLayout(m_bpNodeInt);
 
-#if defined(AXOM_DEBUG)
-  std::string whyBad;
-  bool goodMesh = verifyInputMesh(whyBad);
-  SLIC_ASSERT_MSG(goodMesh, whyBad);
-#endif
-
   m_cellCount = conduit::blueprint::mesh::topology::length(
     bpNode.fetch_existing("topologies").fetch_existing(m_bpTopo));
 

src/axom/quest/examples/quest_shape_in_memory.cpp

@@ -442,10 +442,17 @@ void printMfemMeshInfo(mfem::Mesh* mesh, const std::string& prefixMessage = "")
 }
 #endif
 
+/************************************************************
+ * Shared variables.
+ ************************************************************/
+
 const std::string topoName = "mesh";
 const std::string coordsetName = "coords";
 int cellCount = -1;
 
+const auto hostAllocId = axom::execution_space<axom::SEQ_EXEC>::allocatorID();
+int arrayAllocId = axom::INVALID_ALLOCATOR_ID;
+
 // Computational mesh in different forms, initialized in main
 #if defined(AXOM_USE_MFEM)
 std::shared_ptr<sidre::MFEMSidreDataCollection> shapingDC;
@@ -498,15 +505,13 @@ axom::sidre::Group* createBoxMesh(axom::sidre::Group* meshGrp)
     break;
   }
 
-#if defined(AXOM_DEBUG)
-  conduit::Node meshNode, info;
-  meshGrp->createNativeLayout(meshNode);
-  SLIC_ASSERT(conduit::blueprint::mesh::verify(meshNode, info));
-#endif
-
   // State group is optional to blueprint, and we don't use it, but mint checks for it.
   meshGrp->createGroup("state");
 
+  auto hostAllocForScalarAndStringViews = [](const axom::sidre::View& v) {
+    return (v.isScalar() || v.isString()) ? hostAllocId : axom::INVALID_ALLOCATOR_ID;
+  };
+
   return meshGrp;
 }
 
@@ -1111,9 +1116,9 @@ axom::sidre::View* getElementVolumes(
       constexpr int NUM_COMPS_PER_VERT = 2;
 
       /*
-          Get vertex coordinates.  We use UnstructuredMesh for this,
-          so get it on host first then transfer to device if needed.
-        */
+        Get vertex coordinates.  We use UnstructuredMesh for this,
+        so get it on host first then transfer to device if needed.
+      */
       auto* connData = meshGrp->getGroup("topologies")
                          ->getGroup(topoName)
                          ->getGroup("elements")
@@ -1539,7 +1544,7 @@ int main(int argc, char** argv)
 
   axom::utilities::raii::AnnotationsWrapper annotations_raii_wrapper(params.annotationMode);
 
-  const int allocatorId = axom::policyToDefaultAllocatorID(params.policy);
+  const int arrayAllocId = axom::policyToDefaultAllocatorID(params.policy);
 
   AXOM_ANNOTATE_SCOPE("quest shaping example");
   AXOM_ANNOTATE_BEGIN("init");
@@ -1669,10 +1674,11 @@ int main(int argc, char** argv)
                 "-DAXOM_ENABLE_MFEM_SIDRE_DATACOLLECTION.");
 #endif
 
+  conduit::Node* topoCoordsetNode = nullptr;
   if(params.useBlueprintSidre() || params.useBlueprintConduit())
   {
     compMeshGrp = ds.getRoot()->createGroup("compMesh");
-    compMeshGrp->setDefaultAllocator(allocatorId);
+    compMeshGrp->setDefaultArrayAllocator(arrayAllocId);
 
     createBoxMesh(compMeshGrp);
 
@@ -1721,18 +1727,18 @@ int main(int argc, char** argv)
   if(params.useBlueprintSidre())
   {
     shaper =
-      std::make_shared<quest::IntersectionShaper>(params.policy, allocatorId, shapeSet, compMeshGrp);
+      std::make_shared<quest::IntersectionShaper>(params.policy, arrayAllocId, shapeSet, compMeshGrp);
   }
   if(params.useBlueprintConduit())
   {
     shaper =
-      std::make_shared<quest::IntersectionShaper>(params.policy, allocatorId, shapeSet, *compMeshNode);
+      std::make_shared<quest::IntersectionShaper>(params.policy, arrayAllocId, shapeSet, *compMeshNode);
   }
 #if defined(AXOM_USE_MFEM)
   if(params.useMfem())
   {
     shaper = std::make_shared<quest::IntersectionShaper>(params.policy,
-                                                         allocatorId,
+                                                         arrayAllocId,
                                                          shapeSet,
                                                          shapingDC.get());
   }

src/axom/quest/util/mesh_helpers.cpp

@@ -530,14 +530,6 @@ void convert_blueprint_structured_explicit_to_unstructured_impl_2d(axom::sidre::
     meshGrp->createGroup("fields");
   }
 
-  #if defined(AXOM_DEBUG) && defined(AXOM_USE_CONDUIT)
-  AXOM_ANNOTATE_BEGIN("validate_post");
-  conduit::Node info;
-  bool isValid = verifyBlueprintMesh(meshGrp, info);
-  SLIC_ASSERT_MSG(isValid, "Internal error: Generated mesh is invalid.");
-  AXOM_ANNOTATE_END("validate_post");
-  #endif
-
   return;
 }