From dfd13ac70d7b7f3d67949ab9bba7b1b079d0d72c Mon Sep 17 00:00:00 2001
From: "Daniel J. Magee" <dmagee@lanl.gov>
Date: Thu, 5 Oct 2023 12:00:56 -0600
Subject: [PATCH] Modified pavilion and stream

---
 utils/pav_config/hosts/crossroads.yaml | 11 ++++++-----
 utils/pav_config/tests/stream.yaml     |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/utils/pav_config/hosts/crossroads.yaml b/utils/pav_config/hosts/crossroads.yaml
index 4e8b115c..e94ebcf9 100755
--- a/utils/pav_config/hosts/crossroads.yaml
+++ b/utils/pav_config/hosts/crossroads.yaml
@@ -6,14 +6,15 @@ variables:
     crayversion: "16.0.0"
     craympichversion: "8.1.26"
     partn: 'standard'
+
     mpis:
         - { name: "cray-mpich", version: "{{craympichversion}}", mpicc: "cc", mpicxx: "CC", mpifc: "ftn", mpival: "cray"}
     compilers:
-        - { name: "intel-classic", version: "{{intelversion}}", cc: "cc", cxx: "CC", pe_env: intel, fc: "ftn" }
-        - { name: "intel-oneapi", version: "{{intelversion}}", cc: "cc", cxx: "CC", pe_env: intel, fc: "ftn" }
-        - { name: "intel", version: "{{intelversion}}", cc: "cc", cxx: "CC", pe_env: intel, fc: "ftn" }
-        - { name: "cce", version: "{{crayversion}}", cc: "cc", cxx: "CC", pe_env: cray, fc: "ftn" }
-
+        - { name: "intel-classic", version: "{{intelversion}}", cc: "cc", cxx: "CC", pe_env: intel, fc: "ftn", blas_cflags: '-DUSE_CBLAS=1 -O3 -qopenmp', arch_opt: ''}
+        - { name: "intel-oneapi", version: "{{intelversion}}", cc: "cc", cxx: "CC", pe_env: intel, fc: "ftn", blas_cflags: '-DUSE_CBLAS=1 -O3 -fopenmp', arch_opt: ''}
+        - { name: "intel", version: "{{intelversion}}", cc: "cc", cxx: "CC", pe_env: intel, fc: "ftn", blas_cflags: '-DUSE_CBLAS=1 -O3 -qopenmp', arch_opt: ''}
+        - { name: "cce", version: "{{crayversion}}", cc: "cc", cxx: "CC", pe_env: cray, fc: "ftn", blas_cflags: '-DUSE_CBLAS=1 -O3 -openmp', arch_opt: ''}
+        # - { name: "gcc", version: "12.2.0", pe_env: "PrgEnv-gnu", cc: "cc", cxx: "CC", fc: "ftn", blas_cflags: '-DUSE_CBLAS=1 -O3 -fopenmp', arch_opt: ''}
     scratch:
         - name: xrscratch
           path: "/lustre/xrscratch1/{{pav.user}}"
diff --git a/utils/pav_config/tests/stream.yaml b/utils/pav_config/tests/stream.yaml
index fd438cc8..a6d813e9 100644
--- a/utils/pav_config/tests/stream.yaml
+++ b/utils/pav_config/tests/stream.yaml
@@ -98,7 +98,10 @@ _base:
         nodes: '10' # 'ALL'
         tasks_per_node: 1
         share_allocation: false
+
+    variables:
         ntimes: '10'
+        stream_array_size: '40'
 
     permute_on:
         - compilers