install examples (proxies + noise) with supporting files (#70)

Alpine-DAV · Jan 25, 2018 · b56228d · b56228d
1 parent 10227c6
commit b56228d
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 15 deletions.
diff --git a/src/examples/proxies/cloverleaf3d-ref/ASCENT_README.md b/src/examples/proxies/cloverleaf3d-ref/ASCENT_README.md
@@ -0,0 +1,9 @@
+# Cloverleaf 3D with Ascent Integration
+
+Sample Run:
+
+mpiexec -n 2 ./cloverleaf3d_par
+
+For more info, please visit:
+
+http://ascent.readthedocs.io/en/latest/ExampleIntegrations.html
diff --git a/src/examples/proxies/cloverleaf3d-ref/CMakeLists.txt b/src/examples/proxies/cloverleaf3d-ref/CMakeLists.txt
@@ -49,7 +49,7 @@
 ###############################################################################
 
 
-set(CLOVER3D_SOURCES
+set(clover_sources
     PdV.f90
     PdV_kernel.f90
     accelerate.f90
@@ -114,13 +114,28 @@ if(MPI_FOUND AND FORTRAN_FOUND)
 
     blt_add_executable(
         NAME        cloverleaf3d_par
-        SOURCES     ${CLOVER3D_SOURCES}
+        SOURCES     ${clover_sources}
         DEPENDS_ON  ${clover_par_deps}
         OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 
     blt_add_target_compile_flags(TO cloverleaf3d_par FLAGS "${clover_compile_flags}")
 
+
+    # install target for clover mpi
+    install(TARGETS cloverleaf3d_par
+            EXPORT  ascent
+            LIBRARY DESTINATION examples/proxies/cloverleaf3d
+            ARCHIVE DESTINATION examples/proxies/cloverleaf3d
+            RUNTIME DESTINATION examples/proxies/cloverleaf3d
+    )
+
+    install(FILES ASCENT_README.md
+                  clover.in
+                  ascent_actions.json
+                  ascent_options.json
+            DESTINATION examples/proxies/cloverleaf3d)
+
 endif()
 
 

diff --git a/src/examples/proxies/cloverleaf3d-ref/ascent_options.json b/src/examples/proxies/cloverleaf3d-ref/ascent_options.json
@@ -1,4 +1,3 @@
 {
-  "pipeline/type"    : "vtkm",
-  "pipeline/backend" : "serial"
+  "web" : {"stream" : "false"}
 }
diff --git a/src/examples/proxies/kripke/ASCENT_README.md b/src/examples/proxies/kripke/ASCENT_README.md
@@ -0,0 +1,9 @@
+# Kripke with Ascent Integration
+
+Sample Run:
+
+mpiexec -n 1 ./kripke_par --procs 1,1,1  --zones 32,32,32 --niter 3 --dir 1:2 --grp 1:1 --legendre 4 --quad 4:4
+
+For more info, please visit:
+
+http://ascent.readthedocs.io/en/latest/ExampleIntegrations.html
diff --git a/src/examples/proxies/kripke/CMakeLists.txt b/src/examples/proxies/kripke/CMakeLists.txt
@@ -105,6 +105,19 @@ if(MPI_FOUND)
 
     blt_add_target_compile_flags(TO kripke_par FLAGS "-D PARALLEL ${kripke_openmp_flags}")
 
+    # install target for kripke mpi
+    install(TARGETS kripke_par
+            EXPORT  ascent
+            LIBRARY DESTINATION examples/proxies/kripke
+            ARCHIVE DESTINATION examples/proxies/kripke
+            RUNTIME DESTINATION examples/proxies/kripke
+    )
+
+    install(FILES ASCENT_README.md 
+                  ascent_actions.json
+                  ascent_options.json
+            DESTINATION examples/proxies/kripke)
+
 endif()
 
 

diff --git a/src/examples/proxies/kripke/ascent_options.json b/src/examples/proxies/kripke/ascent_options.json
@@ -1,4 +1,3 @@
 {
-  "pipeline/type"    : "vtkm",
-  "pipeline/backend" : "serial"
+  "web" : {"stream" : "false"}
 }
diff --git a/src/examples/proxies/lulesh2.0.3/ASCENT_README.md b/src/examples/proxies/lulesh2.0.3/ASCENT_README.md
@@ -0,0 +1,9 @@
+# Lulesh with Ascent Integration
+
+Sample Run:
+
+mpiexec -n 8 ./lulesh_par -i 10 -s 32
+
+For more info, please visit:
+
+http://ascent.readthedocs.io/en/latest/ExampleIntegrations.html
diff --git a/src/examples/proxies/lulesh2.0.3/CMakeLists.txt b/src/examples/proxies/lulesh2.0.3/CMakeLists.txt
@@ -76,6 +76,20 @@ blt_add_executable(
 
 blt_add_target_compile_flags(TO lulesh_ser FLAGS "-DUSE_MPI=0 ${lulesh_openmp_flags}")
 
+# install target for lulesh serial
+install(TARGETS lulesh_ser
+        EXPORT  ascent
+        LIBRARY DESTINATION examples/proxies/lulesh
+        ARCHIVE DESTINATION examples/proxies/lulesh
+        RUNTIME DESTINATION examples/proxies/lulesh
+)
+
+install(FILES ASCENT_README.md
+              ascent_actions.json
+              ascent_options.json
+        DESTINATION examples/proxies/lulesh)
+
+
 if(MPI_FOUND)
 
     set(lulesh_par_deps ascent_mpi mpi)
@@ -91,6 +105,16 @@ if(MPI_FOUND)
 
     blt_add_target_compile_flags(TO lulesh_par FLAGS "-DUSE_MPI=1 ${lulesh_openmp_flags}")
 
+
+    # install target for lulesh mpi
+    install(TARGETS lulesh_par
+            EXPORT  ascent
+            LIBRARY DESTINATION examples/proxies/lulesh
+            ARCHIVE DESTINATION examples/proxies/lulesh
+            RUNTIME DESTINATION examples/proxies/lulesh
+    )
+
+
 endif()
 
 

diff --git a/src/examples/proxies/lulesh2.0.3/ascent_actions.json b/src/examples/proxies/lulesh2.0.3/ascent_actions.json
@@ -2,7 +2,7 @@
   {
     "scenes": 
     {
-      "s2": 
+      "s1": 
       {
         "plots": 
         {

diff --git a/src/examples/proxies/lulesh2.0.3/ascent_options.json b/src/examples/proxies/lulesh2.0.3/ascent_options.json
@@ -1,4 +1,3 @@
 {
-  "pipeline/type"    : "vtkm",
-  "pipeline/backend" : "serial"
+  "web" : {"stream" : "false"}
 }
diff --git a/src/examples/proxies/lulesh2.0.3/lulesh.cc b/src/examples/proxies/lulesh2.0.3/lulesh.cc
@@ -2859,10 +2859,7 @@ int main(int argc, char *argv[])
 #if USE_MPI
     ascent_opts["mpi_comm"] = MPI_Comm_c2f(MPI_COMM_WORLD);
 #endif
-    // TODO:
-    ascent_opts["runtime/type"] = "ascent";
-    ascent_opts["ascent_info"] = "verbose";
-
+
     ascent.open(ascent_opts);
    // BEGIN timestep to solution */
 #if USE_MPI   

diff --git a/src/examples/synthetic/noise/README.md → ...examples/synthetic/noise/ASCENT_README.md b/src/examples/synthetic/noise/README.md → ...examples/synthetic/noise/ASCENT_README.md
@@ -1,10 +1,22 @@
-# Noise.cpp
+# Ascent Noise Example
 
 The noise application generates a synthetic data set based open simplex noise which is a public domain n-dimensional smooth noise function. This is similar to Ken Perlin's simplex noise, but this algorithm does not come with any of the accociated patent issues. The code included here is a *c* port of the java implementation and can be found on [github](https://github.com/smcameron/open-simplex-noise-in-c). The java version can be found [here](https://gist.github.com/KdotJPG/b1270127455a94ac5d19).
 
-The noise application comes with a serial and distributed memory parallel version that will automatically distribute a uniform data set across ranks.
+The noise application comes with a serial (noise_ser) and distributed memory parallel version (noise_par) that will automatically distribute a uniform data set across ranks.
 
 # Options
  - `--time_steps=10` The number of time steps to generate
  - `--time_delta=0.5` The amount of time to advance per time step.
  - `--dims=x,y,z` The total number of cells in the data set
+
+
+
+Sample Runs:
+
+./noise_ser
+
+mpiexec -n 2 ./noise_par
+
+For more info, please visit:
+
+http://ascent.readthedocs.io/en/latest/ExampleIntegrations.html
diff --git a/src/examples/synthetic/noise/CMakeLists.txt b/src/examples/synthetic/noise/CMakeLists.txt
@@ -55,6 +55,7 @@ set(noise_sources
 set(noise_header
     open_simplex_noise.h)
 
+
 if(OPENMP_FOUND)
   set(noise_openmp_flags "-DNOISE_USE_OPENMP")
 else()
@@ -69,6 +70,16 @@ blt_add_executable(
 
 blt_add_target_compile_flags(TO noise_ser FLAGS "${noise_openmp_flags}")
 
+# install target for noise example
+install(TARGETS noise_ser
+        EXPORT  ascent
+        LIBRARY DESTINATION examples/synthetic/noise
+        ARCHIVE DESTINATION examples/synthetic/noise
+        RUNTIME DESTINATION examples/synthetic/noise
+)
+
+install(FILES ASCENT_README.md DESTINATION examples/synthetic/noise)
+
 if(MPI_FOUND)
 
     set(noise_par_deps ascent_mpi mpi)
@@ -84,6 +95,15 @@ if(MPI_FOUND)
 
     blt_add_target_compile_flags(TO noise_par FLAGS "-DPARALLEL  ${noise_openmp_flags}")
 
+    # install target for mpi noise example
+    install(TARGETS noise_par
+            EXPORT  ascent
+            LIBRARY DESTINATION examples/synthetic/noise
+            ARCHIVE DESTINATION examples/synthetic/noise
+            RUNTIME DESTINATION examples/synthetic/noise
+    )
+
+
 endif()