ci: don't put compilers in config (#40700)
* ci: don't register detectable compilers Cause they go out of sync... * remove intel compiler, it can be detected too * Do not run spack compiler find since compilers are registered in concretize job already * trilinos: work around +stokhos +cuda +superlu-dist bug due to EMPTY macro
This commit is contained in:
		| @@ -140,6 +140,7 @@ default: | ||||
|     - spack --version | ||||
|     - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME} | ||||
|     - spack env activate --without-view . | ||||
|     - spack compiler find | ||||
|     - export SPACK_CI_CONFIG_ROOT="${SPACK_ROOT}/share/spack/gitlab/cloud_pipelines/configs" | ||||
|     - spack python -c "import os,sys; print(os.path.expandvars(sys.stdin.read()))" | ||||
|       < "${SPACK_CI_CONFIG_ROOT}/${PIPELINE_MIRROR_TEMPLATE}" > "${SPACK_CI_CONFIG_ROOT}/mirrors.yaml" | ||||
|   | ||||
| @@ -12,7 +12,7 @@ ci: | ||||
|       before_script-: | ||||
|       - - spack list --count  # ensure that spack's cache is populated | ||||
|       - - spack env activate --without-view ${SPACK_CONCRETE_ENV_DIR} | ||||
|         - spack compiler find | ||||
|         - spack compiler list | ||||
|         - if [ -n "$SPACK_BUILD_JOBS" ]; then spack config add "config:build_jobs:$SPACK_BUILD_JOBS"; fi | ||||
|       - - mkdir -p ${SPACK_ARTIFACTS_ROOT}/user_data | ||||
|         # AWS runners mount E4S public key (verification), UO runners mount public/private (signing/verification) | ||||
|   | ||||
| @@ -54,21 +54,6 @@ spack: | ||||
|     cuda: | ||||
|       version: [11.8.0] | ||||
|  | ||||
|   compilers: | ||||
|   - compiler: | ||||
|       spec: gcc@11.4.0 | ||||
|       paths: | ||||
|         cc: /usr/bin/gcc | ||||
|         cxx: /usr/bin/g++ | ||||
|         f77: /usr/bin/gfortran | ||||
|         fc: /usr/bin/gfortran | ||||
|       flags: {} | ||||
|       operating_system: ubuntu20.04 | ||||
|       target: aarch64 | ||||
|       modules: [] | ||||
|       environment: {} | ||||
|       extra_rpaths: [] | ||||
|  | ||||
|   specs: | ||||
|   # CPU | ||||
|   - adios | ||||
|   | ||||
| @@ -5,34 +5,6 @@ spack: | ||||
|     reuse: false | ||||
|     unify: false | ||||
|  | ||||
|   compilers: | ||||
|   - compiler: | ||||
|       spec: oneapi@2023.2.1 | ||||
|       paths: | ||||
|         cc: /opt/intel/oneapi/compiler/2023.2.1/linux/bin/icx | ||||
|         cxx: /opt/intel/oneapi/compiler/2023.2.1/linux/bin/icpx | ||||
|         f77: /opt/intel/oneapi/compiler/2023.2.1/linux/bin/ifx | ||||
|         fc: /opt/intel/oneapi/compiler/2023.2.1/linux/bin/ifx | ||||
|       flags: {} | ||||
|       operating_system: ubuntu20.04 | ||||
|       target: x86_64 | ||||
|       modules: [] | ||||
|       environment: {} | ||||
|       extra_rpaths: [] | ||||
|   - compiler: | ||||
|       spec: gcc@=11.4.0 | ||||
|       paths: | ||||
|         cc: /usr/bin/gcc | ||||
|         cxx: /usr/bin/g++ | ||||
|         f77: /usr/bin/gfortran | ||||
|         fc: /usr/bin/gfortran | ||||
|       flags: {} | ||||
|       operating_system: ubuntu20.04 | ||||
|       target: x86_64 | ||||
|       modules: [] | ||||
|       environment: {} | ||||
|       extra_rpaths: [] | ||||
|  | ||||
|   packages: | ||||
|     all: | ||||
|       require: '%oneapi target=x86_64_v3' | ||||
|   | ||||
| @@ -5,21 +5,6 @@ spack: | ||||
|     reuse: false | ||||
|     unify: false | ||||
|  | ||||
|   compilers: | ||||
|   - compiler: | ||||
|       spec: gcc@9.4.0 | ||||
|       paths: | ||||
|         cc: /usr/bin/gcc | ||||
|         cxx: /usr/bin/g++ | ||||
|         f77: /usr/bin/gfortran | ||||
|         fc: /usr/bin/gfortran | ||||
|       flags: {} | ||||
|       operating_system: ubuntu20.04 | ||||
|       target: ppc64le | ||||
|       modules: [] | ||||
|       environment: {} | ||||
|       extra_rpaths: [] | ||||
|  | ||||
|   packages: | ||||
|     all: | ||||
|       require: "%gcc@9.4.0 target=ppc64le" | ||||
|   | ||||
| @@ -5,21 +5,6 @@ spack: | ||||
|     reuse: false | ||||
|     unify: false | ||||
|  | ||||
|   compilers: | ||||
|   - compiler: | ||||
|       spec: gcc@=11.4.0 | ||||
|       paths: | ||||
|         cc: /usr/bin/gcc | ||||
|         cxx: /usr/bin/g++ | ||||
|         f77: /usr/bin/gfortran | ||||
|         fc: /usr/bin/gfortran | ||||
|       flags: {} | ||||
|       operating_system: ubuntu20.04 | ||||
|       target: x86_64 | ||||
|       modules: [] | ||||
|       environment: {} | ||||
|       extra_rpaths: [] | ||||
|  | ||||
|   packages: | ||||
|     all: | ||||
|       require: '%gcc target=x86_64_v3' | ||||
|   | ||||
| @@ -5,21 +5,6 @@ spack: | ||||
|     reuse: false | ||||
|     unify: false | ||||
|  | ||||
|   compilers: | ||||
|   - compiler: | ||||
|       spec: gcc@=11.4.0 | ||||
|       paths: | ||||
|         cc: /usr/bin/gcc | ||||
|         cxx: /usr/bin/g++ | ||||
|         f77: /usr/bin/gfortran | ||||
|         fc: /usr/bin/gfortran | ||||
|       flags: {} | ||||
|       operating_system: ubuntu20.04 | ||||
|       target: x86_64 | ||||
|       modules: [] | ||||
|       environment: {} | ||||
|       extra_rpaths: [] | ||||
|  | ||||
|   packages: | ||||
|     all: | ||||
|       require: '%gcc target=x86_64_v3' | ||||
|   | ||||
| @@ -358,6 +358,11 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): | ||||
|     conflicts("@:13.0.1 +cuda", when="^cuda@11:") | ||||
|     # Build hangs with CUDA 11.6 (see #28439) | ||||
|     conflicts("+cuda +stokhos", when="^cuda@11.6:") | ||||
|     # superlu-dist defines a macro EMPTY which conflicts with a header in cuda | ||||
|     # used when building stokhos | ||||
|     # Fix: https://github.com/xiaoyeli/superlu_dist/commit/09cb1430f7be288fd4d75b8ed461aa0b7e68fefe | ||||
|     # is not tagged yet. See discussion here https://github.com/trilinos/Trilinos/issues/11839 | ||||
|     conflicts("+cuda +stokhos +superlu-dist") | ||||
|     # Cuda UVM must be enabled prior to 13.2 | ||||
|     # See https://github.com/spack/spack/issues/28869 | ||||
|     conflicts("~uvm", when="@:13.1 +cuda") | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Harmen Stoppels
					Harmen Stoppels