diff --git a/scripts/setupLC-TPL-uberenv.bash b/scripts/setupLC-TPL-uberenv.bash index 28776454..2fe2e048 100755 --- a/scripts/setupLC-TPL-uberenv.bash +++ b/scripts/setupLC-TPL-uberenv.bash @@ -43,6 +43,7 @@ echo "Building all LC TPLs from $GEOS_BRANCH to be installed at $INSTALL_DIR..." ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby clang-14 "%clang@14.0.6 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby gcc-12 "%gcc@12.1.1 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR ruby gcc-12noAVX "%gcc@12noAVX +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen gcc-8-cuda-11 "%gcc@8.3.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen clang-13-cuda-11 "%clang@13.0.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ & diff --git a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml index 6054c1f2..c1feba9d 100644 --- a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml @@ -12,11 +12,16 @@ # geosx@develop%clang@14.0.6 # geosx@develop%gcc@12.1.1 +# geosx@develop%gcc@noAVX # # Uberenv command to build geos dependencies: # python3 ./scripts/uberenv/uberenv.py --spec="%clang@14.0.6 +docs" # # python3 ./scripts/uberenv/uberenv.py --spec="%gcc@12.1.1 +docs" +# +# No AVX instructions +# python3 ./scripts/uberenv/uberenv.py --spec="%gcc@12noAVX +docs" + spack: config: @@ -55,7 +60,23 @@ spack: cxx: /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/g++ f77: /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/gfortran fc: /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/gfortran - flags: {} + operating_system: rhel8 + target: x86_64 + modules: [] + environment: + set: # Needed for scotch + BISON: bison + FLEX: flex + extra_rpaths: [] + - compiler: + spec: gcc@12noAVX + paths: + cc: /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/gcc + cxx: /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/g++ + f77: /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/gfortran + fc: /usr/tce/packages/gcc/gcc-12.1.1-magic/bin/gfortran + flags: + cxxflags: -march=x86-64-v2 -mno-avx512f operating_system: rhel8 target: x86_64 modules: [] @@ -114,6 +135,8 @@ spack: externals: - spec: mvapich2@2.3%gcc@12.1.1 process_managers=slurm prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1-magic + - spec: mvapich2@2.3%gcc@12noAVX process_managers=slurm + prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1-magic - spec: mvapich2@2.3%clang@14.0.6 process_managers=slurm prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6-magic diff --git a/scripts/spack_packages/packages/vtk/package.py b/scripts/spack_packages/packages/vtk/package.py index 40443461..db5aa7fb 100644 --- a/scripts/spack_packages/packages/vtk/package.py +++ b/scripts/spack_packages/packages/vtk/package.py @@ -62,7 +62,7 @@ def cmake_args(self): mpi_args = [ self.define('CMAKE_C_COMPILER', spec['mpi'].mpicc), self.define('CMAKE_CXX_COMPILER', spec['mpi'].mpicxx), - self.define('CMAKE_CXX_FLAGS', self.spec.compiler_flags["cxxflags"]), + self.define('CMAKE_CXX_FLAGS', " ".join(self.spec.compiler_flags["cxxflags"])), '-DVTK_USE_MPI=ON', '-DVTK_MODULE_ENABLE_VTK_IOParallelXML=YES', '-DVTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=YES' @@ -71,7 +71,7 @@ def cmake_args(self): mpi_args = [ self.define('CMAKE_C_COMPILER', self.compiler.cc), self.define('CMAKE_CXX_COMPILER', self.compiler.cxx), - self.define('CMAKE_CXX_FLAGS', self.spec.compiler_flags["cxxflags"]), + self.define('CMAKE_CXX_FLAGS', " ".join(self.spec.compiler_flags["cxxflags"])), '-DVTK_USE_MPI=OFF', '-DVTK_MODULE_ENABLE_VTK_IOParallelXML=NO', '-DVTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=NO',