add the kripke

scripts/uberenv/spack_configs/llnl/pascal_openmp/packages.yaml

@@ -61,7 +61,7 @@ packages:
 # LLNL toss3 mvapich2
   mvapich2:
     paths:
-      mvapich2@2.2%[email protected]:  /usr/tce/packages/mvapich2/mvapich2-2.2-gcc-4.9.3
+      mvapich2@2.3%[email protected]:  /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-4.9.3
       [email protected]%[email protected]: /usr/tce/packages/mvapich2/mvapich2-2.2-intel-17.0.0
       [email protected]%[email protected]: /usr/tce/packages/mvapich2/mvapich2-2.2-clang-4.0.0
     buildable: False

src/CMakeLists.txt

@@ -13,6 +13,7 @@ option(BUILD_SHARED_LIBS  "Build shared libraries"    OFF)
 option(DRAY_ENABLE_TESTS  "Build tests"               ON)
 option(DRAY_ENABLE_UTILS  "Build utilities"           ON)
 option(ENABLE_OPENMP      "Build OpenMP Support"      ON)
+option(ENABLE_EXAMPLES    "Build Examples"            ON)
 option(ENABLE_MPI         "Build MPI Support"         ON)
 option(ENABLE_CUDA        "Build CUDA Support"        ON)
 option(ENABLE_MFEM        "Build MFEM Support"        ON)
@@ -85,6 +86,13 @@ else()
   message(STATUS "Dray Tests Disabled")
 endif()
 
+if(ENABLE_EXAMPLES)
+  message(STATUS "Dray Examples Enabled")
+  add_subdirectory(examples)
+else()
+  message(STATUS "Dray Examples Disabled")
+endif()
+
 add_subdirectory(config)
 add_subdirectory(docs)
 

src/dray/CMakeLists.txt

@@ -6,13 +6,26 @@ set(dray_headers dray.hpp
                  array_internals_base.hpp
                  array_registry.hpp
                  array_utils.hpp
+                 device_array.hpp
+                 host_array.hpp
                  color_map.hpp
                  color_table.hpp
+                 graph/cpu_graph.hpp
+                 graph/topological_order.hpp
+                 uniform_topology.hpp
+                 uniform_faces.hpp
+                 uniform_indexer.hpp
+                 quadtree.hpp
+                 integrate.hpp
+                 pagani.hpp
+                 sign_vec.hpp
+                 face_location.hpp
                  dray_node_to_dataset.hpp
                  exports.hpp
                  error.hpp
                  error_check.hpp
                  halton.hpp
+                 lazy_prop.hpp
                  linear_bvh_builder.hpp
                  location.hpp
                  math.hpp
@@ -30,6 +43,7 @@ set(dray_headers dray.hpp
                  ray_hit.hpp
                  ref_point.hpp
                  simple_tensor.hpp
+                 spherical_harmonics.hpp
                  template_tag.hpp
                  types.hpp
                  transform_3d.hpp
@@ -40,6 +54,9 @@ set(dray_headers dray.hpp
                  io/mfem_reader.hpp
                  io/blueprint_reader.hpp
                  io/blueprint_low_order.hpp
+                 io/blueprint_moments.hpp
+                 io/blueprint_uniform_topology.hpp
+                 io/array_mapping.hpp
                  import_order_policy.hpp
 
                  rendering/annotator.hpp
@@ -56,9 +73,11 @@ set(dray_headers dray.hpp
                  rendering/point_light.hpp
                  rendering/traceable.hpp
                  rendering/renderer.hpp
+                 rendering/path_data.hpp
                  rendering/scalar_buffer.hpp
                  rendering/scalar_renderer.hpp
                  rendering/slice_plane.hpp
+                 rendering/sphere_light.hpp
                  rendering/surface.hpp
                  rendering/text_annotator.hpp
                  rendering/volume.hpp
@@ -78,6 +97,7 @@ set(dray_headers dray.hpp
                  utils/mpi_utils.hpp
                  utils/timer.hpp
                  utils/yaml_writer.hpp
+                 utils/point_writer.hpp
 
                  ambient_occlusion.hpp
                  intersection_context.hpp
@@ -106,6 +126,7 @@ set(dray_headers dray.hpp
                  data_model/subpatch.hpp
                  data_model/mesh_utils.hpp
                  data_model/field.hpp
+                 data_model/low_order_field.hpp
                  data_model/unstructured_field.hpp
                  data_model/grid_function.hpp
                  data_model/unstructured_mesh.hpp
@@ -122,6 +143,13 @@ set(dray_headers dray.hpp
 
                  #filters/attractor_map.hpp
                  filters/surface_triangle.hpp
+                 filters/path_lengths.hpp
+                 filters/first_scatter.hpp
+                 filters/matt_scatter.hpp
+
+                 transport/dda.hpp
+                 transport/uniform_partials.hpp
+                 transport/compose_domain_segment.hpp
 
                  synthetic/affine_radial.hpp
                  synthetic/spiral_sample.hpp
@@ -135,13 +163,19 @@ set(dray_sources dray.cpp
                  array_registry.cpp
                  color_map.cpp
                  color_table.cpp
+                 uniform_topology.cpp
+                 uniform_faces.cpp
+                 quadtree.cpp
+                 integrate.cpp
+                 face_location.cpp
                  dray_node_to_dataset.cpp
                  linear_bvh_builder.cpp
                  location.cpp
                  matrix.cpp
                  subdivision_search.cpp
                  ray.cpp
                  ray_hit.cpp
+                 spherical_harmonics.cpp
                  triangle_mesh.cpp
                  vec.cpp
                  utils/color_buffer_utils.cpp
@@ -150,6 +184,7 @@ set(dray_sources dray.cpp
                  utils/png_decoder.cpp
                  utils/png_compare.cpp
                  utils/ray_utils.cpp
+                 utils/point_writer.cpp
                  utils/string_utils.cpp
                  utils/mpi_utils.cpp
 
@@ -163,6 +198,9 @@ set(dray_sources dray.cpp
                  io/mfem_reader.cpp
                  io/blueprint_reader.cpp
                  io/blueprint_low_order.cpp
+                 io/blueprint_moments.cpp
+                 io/blueprint_uniform_topology.cpp
+                 io/array_mapping.cpp
 
                  rendering/annotator.cpp
                  rendering/camera.cpp
@@ -175,10 +213,12 @@ set(dray_sources dray.cpp
                  rendering/traceable.cpp
                  rendering/point_light.cpp
                  rendering/renderer.cpp
+                 rendering/path_data.cpp
                  rendering/scalar_buffer.cpp
                  rendering/scalar_renderer.cpp
                  rendering/slice_plane.cpp
                  rendering/surface.cpp
+                 rendering/sphere_light.cpp
                  rendering/text_annotator.cpp
                  rendering/volume.cpp
                  rendering/volume_partial.cpp
@@ -199,6 +239,7 @@ set(dray_sources dray.cpp
                  data_model/unstructured_mesh.cpp
                  data_model/mesh_utils.cpp
                  data_model/unstructured_field.cpp
+                 data_model/low_order_field.cpp
 
                  filters/mesh_boundary.cpp
                  filters/reflect.cpp
@@ -211,6 +252,12 @@ set(dray_sources dray.cpp
 
                  #filters/attractor_map.cpp
                  filters/surface_triangle.cpp
+                 filters/path_lengths.cpp
+                 filters/first_scatter.cpp
+                 filters/matt_scatter.cpp
+
+                 transport/uniform_partials.cpp
+                 transport/compose_domain_segment.cpp
 
                  synthetic/affine_radial.cpp
                  synthetic/spiral_sample.cpp

src/dray/aabb.hpp

@@ -33,13 +33,23 @@ template <int32 dim = 3> class AABB
       m_ranges[d].reset ();
   }
 
-  // return true if all ranges are empty
+  // return true if all ranges are initial
+  DRAY_EXEC
+  bool is_initial() const
+  {
+    bool initial = true;
+    for (int32 d = 0; d < dim; d++)
+      initial &= m_ranges[d].is_initial();
+    return initial;
+  }
+
+  // return true if any range is empty
   DRAY_EXEC
   bool is_empty() const
   {
-    bool empty = true;
+    bool empty = false;
     for (int32 d = 0; d < dim; d++)
-      empty &= m_ranges[d].is_empty();
+      empty |= m_ranges[d].is_empty();
     return empty;
   }
 
@@ -74,7 +84,7 @@ template <int32 dim = 3> class AABB
   }
 
   DRAY_EXEC
-  bool contains (const AABB &other)
+  bool contains (const AABB &other) const
   {
     bool ret = true;
     for (int32 d = 0; d < dim; d++)
@@ -83,14 +93,21 @@ template <int32 dim = 3> class AABB
   }
 
   DRAY_EXEC
-  bool contains (const Vec<Float,dim> &point)
+  bool contains (const Vec<Float,dim> &point) const
   {
     bool ret = true;
     for (int32 d = 0; d < dim; d++)
       ret &= m_ranges[d].contains (point[d]);
     return ret;
   }
 
+  DRAY_EXEC
+  void clamp(Vec<Float, dim> &point) const
+  {
+    for (int32 d = 0; d < dim; ++d)
+      m_ranges[d].clamp(point[d]);
+  }
+
   DRAY_EXEC
   void expand (const float32 &epsilon)
   {
@@ -170,6 +187,21 @@ template <int32 dim = 3> class AABB
     return max_length;
   }
 
+  DRAY_EXEC
+  float32 min_length () const
+  {
+    float32 min_length = m_ranges[0].length ();
+    for (int32 d = 1; d < dim; d++)
+    {
+      float32 length = m_ranges[d].length ();
+      if (length < min_length)
+      {
+        min_length = length;
+      }
+    }
+    return min_length;
+  }
+
   DRAY_EXEC
   float32 volume() const
   {

src/dray/array.cpp

@@ -6,19 +6,30 @@
 #include <dray/array.hpp>
 #include <dray/array_internals.hpp>
 
+#include <iostream>
+
 namespace dray
 {
 
 template <typename T>
-Array<T>::Array () : m_internals (new ArrayInternals<T> ()){};
+Array<T>::Array ()
+: m_internals (new ArrayInternals<T> ()),
+  m_size(0),
+  m_ncomp(0)
+{ }
 
 template <typename T>
-Array<T>::Array (const T *data, const int32 size)
-: m_internals (new ArrayInternals<T> (data, size)){};
+Array<T>::Array (const T *data, const int32 size, const int32 ncomp)
+: m_internals (new ArrayInternals<T> (data, size * ncomp)),
+  m_size(size),
+  m_ncomp(ncomp)
+{ };
 
-template <typename T> void Array<T>::set (const T *data, const int32 size)
+template <typename T> void Array<T>::set (const T *data, const int32 size, const int32 ncomp)
 {
-  m_internals->set (data, size);
+  m_internals->set (data, size * ncomp);
+  m_size = size;
+  m_ncomp = ncomp;
 };
 
 template <typename T> Array<T>::~Array ()
@@ -28,16 +39,30 @@ template <typename T> Array<T>::~Array ()
 template <typename T> void Array<T>::operator= (const Array<T> &other)
 {
   m_internals = other.m_internals;
+  m_size = other.m_size;
+  m_ncomp = other.m_ncomp;
+}
+
+template <typename T> size_t Array<T>::size() const
+{
+  return m_size;
+}
+
+template <typename T> int32 Array<T>::ncomp() const
+{
+  return m_ncomp;
 }
 
-template <typename T> size_t Array<T>::size () const
+template <typename T> size_t Array<T>::total_size () const
 {
   return m_internals->size ();
 }
 
-template <typename T> void Array<T>::resize (const size_t size)
+template <typename T> void Array<T>::resize (const size_t size, const int32 ncomp)
 {
-  m_internals->resize (size);
+  m_internals->resize (size * ncomp);
+  m_size = size;
+  m_ncomp = ncomp;
 }
 
 template <typename T> T *Array<T>::get_host_ptr ()
@@ -62,14 +87,20 @@ template <typename T> const T *Array<T>::get_device_ptr_const () const
 
 template <typename T> void Array<T>::summary ()
 {
-  m_internals->summary ();
+  m_internals->summary (std::cout);
+}
+
+template <typename T> void Array<T>::summary (std::ostream &out)
+{
+  m_internals->summary (out);
 }
 
 template <typename T> T Array<T>::get_value (const int32 i) const
 {
   return m_internals->get_value (i);
 }
 
+
 // Type Explicit instatiations
 template class Array<uint8>;
 template class Array<int32>;
@@ -104,6 +135,7 @@ template class dray::Array<dray::Vec<dray::float32, 4>>;
 template class dray::Array<dray::Vec<dray::float64, 4>>;
 
 template class dray::Array<dray::Vec<dray::int32, 2>>;
+template class dray::Array<dray::Vec<dray::int32, 3>>;
 template class dray::Array<dray::Vec<dray::int32, 4>>;
 
 #include <dray/matrix.hpp>
@@ -150,6 +182,9 @@ template class dray::Array<dray::RayHit>;
 #include <dray/location.hpp>
 template class dray::Array<dray::Location>;
 
+#include <dray/face_location.hpp>
+template class dray::Array<dray::FaceLocation>;
+
 #include <dray/intersection_context.hpp>
 template class dray::Array<dray::IntersectionContext>;
 
@@ -162,5 +197,10 @@ template class dray::Array<dray::stats::Stats>;
 #include <dray/rendering/point_light.hpp>
 template class dray::Array<dray::PointLight>;
 
+#include <dray/rendering/path_data.hpp>
+template class dray::Array<dray::Material>;
+template class dray::Array<dray::RayData>;
+template class dray::Array<dray::Sample>;
+
 #include <dray/rendering/volume_partial.hpp>
 template class dray::Array<dray::VolumePartial>;