Addition of tag to LULESH git dependency. (#169)

LLNL · May 28, 2022 · 852b09a · 852b09a
1 parent 07e056e
commit 852b09a
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 23 deletions.
diff --git a/samples/lulesh/lulesh_sample1_macosx.yaml b/samples/lulesh/lulesh_sample1_macosx.yaml
@@ -22,9 +22,6 @@ env:
           url: https://github.com/LLNL/LULESH.git
           tag: 2.0.3
 
-batch:
-    shell: /bin/bash
-
 study:
     - name: make-lulesh
       description: Build the serial version of LULESH.

diff --git a/samples/lulesh/lulesh_sample1_unix_linear.yaml b/samples/lulesh/lulesh_sample1_unix_linear.yaml
@@ -17,6 +17,7 @@ env:
         - name: LULESH
           path: $(OUTPUT_PATH)
           url: https://github.com/LLNL/LULESH.git
+          tag: 2.0.3
 
 study:
     - name: make-lulesh

diff --git a/samples/lulesh/lulesh_sample1_unix_slurm.yaml b/samples/lulesh/lulesh_sample1_unix_slurm.yaml
@@ -1,6 +1,11 @@
 description:
     name: lulesh_sample1
-    description: A sample LULESH study that downloads, builds, and runs a parameter study of varying problem sizes and iterations on SLURM.
+    description: A sample LULESH study that downloads, builds, and runs a parameter study of varying problem sizes and iterations.
+
+batch:
+    type: flux
+    bank: testbank
+    queue: pbatch
 
 env:
     variables:
@@ -14,43 +19,69 @@ env:
         - name: LULESH
           path: $(OUTPUT_PATH)
           url: https://github.com/LLNL/LULESH.git
-
-batch:
-    type        : slurm
-    host        : quartz
-    bank        : baasic
-    queue       : pbatch
-    gres        : ignore
-    reservation : test_reservation
+          tag: 2.0.3
 
 study:
     - name: make-lulesh
-      description: Build the MPI enabled version of LULESH.
+      description: Build the serial version of LULESH.
       run:
           cmd: |
-            module load cmake/3.13.4
             cd $(LULESH)
-            mkdir build
-            cd build
-            cmake -DCMAKE_BUILD_TYPE=Release -DMPI_CXX_COMPILER=`which mpicxx` ..
+            sed -i 's/^CXX = $(MPICXX)/CXX = $(SERCXX)/' ./Makefile
+            sed -i 's/^CXXFLAGS = -g -O3 -fopenmp/#CXXFLAGS = -g -O3 -fopenmp/' ./Makefile
+            sed -i 's/^#LDFLAGS = -g -O3/LDFLAGS = -g -O3/' ./Makefile
+            sed -i 's/^LDFLAGS = -g -O3 -fopenmp/#LDFLAGS = -g -O3 -fopenmp/' ./Makefile
+            sed -i 's/^#CXXFLAGS = -g -O3 -I/CXXFLAGS = -g -O3 -I/' ./Makefile
+            make clean
             make
           depends: []
 
     - name: run-lulesh
       description: Run LULESH.
       run:
           cmd: |
-            $(LAUNCHER) $(LULESH)/build/lulesh2.0 -s $(SIZE) -i $(ITERATIONS) -p > $(outfile)
+            $(LAUNCHER) $(LULESH)/lulesh2.0 -s $(SIZE) -i $(ITERATIONS) -p > $(outfile)
           depends: [make-lulesh]
-          nodes: 2
-          procs: 27
-          exclusive   : True
+          nodes: 1
+          procs: 1
           walltime: "00:10:00"
 
+    - name: post-process-lulesh
+      description: Post process all LULESH results.
+      run:
+          cmd: |
+            echo "Unparameterized step with Parameter Independent dependencies." >> out.log
+            echo $(run-lulesh.workspace) > out.log
+            ls $(run-lulesh.workspace) > ls.log
+          depends: [run-lulesh_*]
+
+    - name: post-process-lulesh-trials
+      description: Post process all LULESH results.
+      run:
+          cmd: |
+            echo "Parameterized step that has Parameter Independent dependencies" >> out.log
+            echo "TRIAL = $(TRIAL)" >> out.log
+            echo $(run-lulesh.workspace) >> out.log
+            ls $(run-lulesh.workspace) > out.log
+          depends: [run-lulesh_*]
+
+    - name: post-process-lulesh-size
+      description: Post process all LULESH results.
+      run:
+          cmd: |
+            echo "Parameterized step that has Parameter Independent dependencies" >> out.log
+            echo "SIZE = $(SIZE)" >> out.log
+            echo $(run-lulesh.workspace) >> out.log
+            ls $(run-lulesh.workspace) | grep $(SIZE.label) >> out.log
+          depends: [run-lulesh_*]
+
 global.parameters:
+    TRIAL:
+        values  : [1, 2, 3, 4, 5, 6, 7, 8, 9]
+        label   : TRIAL.%%
     SIZE:
-        values  : [100, 100, 100, 200, 200, 200, 300, 300, 300]
+        values  : [10, 10, 10, 20, 20, 20, 30, 30, 30]
         label   : SIZE.%%
     ITERATIONS:
-        values  : [100, 200, 300, 100, 200, 300, 100, 200, 300]
+        values  : [10, 20, 30, 10, 20, 30, 10, 20, 30]
         label   : ITER.%%