refactor to allow more flexibility with compiler setup for sycl case

Alpine-DAV · Nov 22, 2024 · 23bd7a8 · 23bd7a8
1 parent 32d8a84
commit 23bd7a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/scripts/build_ascent/build_ascent.sh b/scripts/build_ascent/build_ascent.sh
@@ -71,6 +71,7 @@ if [[ "$enable_cuda" == "ON" ]]; then
     CUDA_ARCH_VTKM="${CUDA_ARCH_VTKM:=ampere}"
 fi
 
+# NOTE: this script only builds kokkos when enable_hip=ON or enable_cycl=ON
 if [[ "$enable_hip" == "ON" ]]; then
     echo "*** configuring with HIP support"
 
@@ -81,15 +82,9 @@ if [[ "$enable_hip" == "ON" ]]; then
     ROCM_ARCH="${ROCM_ARCH:=gfx90a}"
     ROCM_PATH="${ROCM_PATH:=/opt/rocm/}"
 
-    # NOTE: this script only builds kokkos when enable_hip=ON
     build_kokkos="${build_kokkos:=true}"
 elif [[ "$enable_sycl" == "ON" ]]; then
     echo "*** configuring with SYCL support"
-
-    CC=`which icx`
-    CXX=`which icpx`
-    FTN=`which ifx`
-
     build_kokkos="${build_kokkos:=true}"
 else
     build_kokkos="${build_kokkos:=false}"

diff --git a/scripts/build_ascent/build_ascent_aurora.sh b/scripts/build_ascent/build_ascent_aurora.sh
@@ -18,4 +18,4 @@ module use /soft/modulefiles
 module load spack-pe-gcc cmake
 module load oneapi/eng-compiler/2023.12.15.002
 
-env enable_sycl=ON enable_mpi=ON enable_fortran=ON raja_enable_vectorization=OFF enable_tests=ON enable_verbose=ON ./build_ascent_sycl.sh
+env CC=`which icx` CXX=`which icpx` FTN=`which ifx` enable_sycl=ON enable_mpi=ON enable_fortran=ON raja_enable_vectorization=OFF enable_tests=ON enable_verbose=ON ./build_ascent_sycl.sh