Update kokkos prof lib and expected responses.

- also small fix to blake beta tests
sandialabs · Feb 14, 2023 · dbc09d7 · dbc09d7
1 parent 15dce77
commit dbc09d7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/cdash/blake/nightly_cron_script_ali_perf_tests_blake_run.sh b/cdash/blake/nightly_cron_script_ali_perf_tests_blake_run.sh
@@ -13,7 +13,7 @@ rm -rf intel_modules.out
 export OMP_NUM_THREADS=1
 
 export INTEL_LICENSE_FILE=/home/projects/x86-64/intel/licenses/USE_SERVER-ohpc.lic
-export KOKKOS_PROFILE_LIBRARY=/home/projects/albany/nightlyCDashAlbanyBlake/kokkos-tools/profiling/space-time-stack-mem-only/kp_space_time_stack.so
+export KOKKOS_TOOLS_LIBS=/home/projects/albany/nightlyCDashAlbanyBlake/kokkos-tools/profiling/space-time-stack-mem-only/kp_space_time_stack.so
 source blake_intel_modules.sh >& intel_modules.out  
 
 printenv |& tee out-env.txt

diff --git a/cdash/weaver/nightly_cron_script_ali_perf_tests_weaver.sh b/cdash/weaver/nightly_cron_script_ali_perf_tests_weaver.sh
@@ -14,7 +14,7 @@ unset http_proxy
 unset https_proxy
 
 export OMP_NUM_THREADS=1
-export KOKKOS_PROFILE_LIBRARY=/home/projects/albany/nightlyCDashWeaver/kokkos-tools/profiling/space-time-stack-mem-only/kp_space_time_stack.so
+export KOKKOS_TOOLS_LIBS=/home/projects/albany/nightlyCDashWeaver/kokkos-tools/profiling/space-time-stack-mem-only/kp_space_time_stack.so
 source weaver_modules_cuda.sh >& modules.out  
 
 now=$(date +"%m_%d_%Y-%H_%M")

diff --git a/doc/submit_blake.sh b/doc/submit_blake.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -login
 
-#SBATCH --job-name=GISRun
-#SBATCH --output=GISRun.%j.out
-#SBATCH --error=GISRun.%j.err
+#SBATCH --job-name=ALIPT
+#SBATCH --output=ALIPT.%j.out
+#SBATCH --error=ALIPT.%j.err
 #SBATCH --nodes=8
 #SBATCH --ntasks=384
 #SBATCH --ntasks-per-node=48
@@ -14,8 +14,8 @@
 source ${HOME}/bin/blake_intel_modules.sh
 
 # Env variables
-#export KOKKOS_PROFILE_LIBRARY=/home/projects/albany/nightlyCDashAlbanyBlake/kokkos-tools/profiling/space-time-stack-mem-only/kp_space_time_stack.so
-unset KOKKOS_PROFILE_LIBRARY
+export KOKKOS_TOOLS_LIBS=/home/projects/albany/nightlyCDashAlbanyBlake/kokkos-tools/profiling/space-time-stack-mem-only/kp_space_time_stack.so
+#unset KOKKOS_TOOLS_LIBS
 
 # Run
 ctest -V

diff --git a/perf_tests/green-1-10km/input_albany_Enthalpy_MueLuKokkos.yaml b/perf_tests/green-1-10km/input_albany_Enthalpy_MueLuKokkos.yaml
@@ -66,7 +66,7 @@ ANONYMOUS:
 
 # Final solution comparison
   Regression For Response 0:
-    Test Value: -7.540479841331e+00
+    Test Value: -8.033641273293e+00
     Relative Tolerance: 1.00000000000000008e-05
     Absolute Tolerance: 1.00000000000000002e-03
 

diff --git a/perf_tests/green-1-10km/input_albany_Velocity_MueLuKokkos.yaml b/perf_tests/green-1-10km/input_albany_Velocity_MueLuKokkos.yaml
@@ -78,7 +78,7 @@ ANONYMOUS:
 
 # Final solution comparison
   Regression For Response 0:
-    Test Value: 9.968002494725e-01
+    Test Value: 1.004566152824e+00
     Relative Tolerance: 1.00000000000000008e-05
     Absolute Tolerance: 1.00000000000000002e-03
 

diff --git a/perf_tests/green-3-20km/CMakeLists.txt b/perf_tests/green-3-20km/CMakeLists.txt
@@ -51,9 +51,9 @@ add_test(${testName}_ent_muk_np${ALBANY_NUM_PROCS} ${ALBANY_SFAD6_EXE} input_alb
 
 IF (NOT ALBANY_ENABLE_CUDA)
   add_test(${testName}_vel_mu_np${ALBANY_NUM_PROCS} ${ALBANY_SFAD12_EXE} input_albany_Velocity_MueLu.yaml ${ALBANY_EXTRA_ARGS})
-  add_test(${testName}_beta_1ws_np${ALBANY_NUM_PROCS} ${ALBANY_ANALYSIS_SFAD8_EXE} input_albany_BasalFrictionInit_SingleWorkset.yaml ${ALBANY_EXTRA_ARGS})
-  add_test(${testName}_beta_mem_np${ALBANY_NUM_PROCS} ${ALBANY_ANALYSIS_SFAD8_EXE} input_albany_BasalFrictionInit_Memoization.yaml ${ALBANY_EXTRA_ARGS})
-  add_test(${testName}_beta_memp_np${ALBANY_NUM_PROCS} ${ALBANY_ANALYSIS_SFAD8_EXE} input_albany_BasalFrictionInit_MemoizationForParams.yaml ${ALBANY_EXTRA_ARGS})
+  add_test(${testName}_beta_1ws_np${ALBANY_NUM_PROCS} ${ALBANY_ANALYSIS_SFAD12_EXE} input_albany_BasalFrictionInit_SingleWorkset.yaml ${ALBANY_EXTRA_ARGS})
+  add_test(${testName}_beta_mem_np${ALBANY_NUM_PROCS} ${ALBANY_ANALYSIS_SFAD12_EXE} input_albany_BasalFrictionInit_Memoization.yaml ${ALBANY_EXTRA_ARGS})
+  add_test(${testName}_beta_memp_np${ALBANY_NUM_PROCS} ${ALBANY_ANALYSIS_SFAD12_EXE} input_albany_BasalFrictionInit_MemoizationForParams.yaml ${ALBANY_EXTRA_ARGS})
 ENDIF()