From 2853c4a6a794dd3b90cc75110f45e1efb924b905 Mon Sep 17 00:00:00 2001 From: Tamara Dahlgren Date: Thu, 1 Jul 2021 15:32:47 -0700 Subject: [PATCH 1/3] Preliminary CARE stack --- .../blueos_3_ppc64le_ib_p9/compilers.yaml | 209 ++++++++++++++++++ .../care/blueos_3_ppc64le_ib_p9/packages.yaml | 123 +++++++++++ spack-environments/care/spack.yaml | 79 +++++++ .../care/toss_3_x86_64_ib/compilers.yaml | 52 +++++ .../care/toss_3_x86_64_ib/config.yaml | 4 + .../care/toss_3_x86_64_ib/packages.yaml | 151 +++++++++++++ 6 files changed, 618 insertions(+) create mode 100644 spack-environments/care/blueos_3_ppc64le_ib_p9/compilers.yaml create mode 100644 spack-environments/care/blueos_3_ppc64le_ib_p9/packages.yaml create mode 100644 spack-environments/care/spack.yaml create mode 100644 spack-environments/care/toss_3_x86_64_ib/compilers.yaml create mode 100644 spack-environments/care/toss_3_x86_64_ib/config.yaml create mode 100644 spack-environments/care/toss_3_x86_64_ib/packages.yaml diff --git a/spack-environments/care/blueos_3_ppc64le_ib_p9/compilers.yaml b/spack-environments/care/blueos_3_ppc64le_ib_p9/compilers.yaml new file mode 100644 index 0000000..0d23f30 --- /dev/null +++ b/spack-environments/care/blueos_3_ppc64le_ib_p9/compilers.yaml @@ -0,0 +1,209 @@ +compilers:: +- compiler: + spec: clang@3.9.1 + paths: + cc: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang + cxx: /usr/tcetmp/packages/clang/clang-3.9.1/bin/clang++ + f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: clang@4.0.0 + paths: + cc: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang + cxx: /usr/tcetmp/packages/clang/clang-4.0.0/bin/clang++ + f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: clang@9.0.0 + paths: + cc: /usr/tce/packages/clang/clang-9.0.0/bin/clang + cxx: /usr/tce/packages/clang/clang-9.0.0/bin/clang++ + f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: clang@9.0.0ibm + paths: + cc: /usr/tce/packages/clang/clang-ibm-2019.10.03/bin/clang + cxx: /usr/tce/packages/clang/clang-ibm-2019.10.03/bin/clang++ + fc: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf2003_r + f77: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: clang@10.0.1ibm + paths: + cc: /usr/tce/packages/clang/clang-ibm-10.0.1/bin/clang + cxx: /usr/tce/packages/clang/clang-ibm-10.0.1/bin/clang++ + fc: /usr/tce/packages/xl/xl-2020.09.17/bin/xlf2003_r + f77: /usr/tce/packages/xl/xl-2020.09.17/bin/xlf_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: clang@coral2018.08.08 + paths: + cc: /usr/tce/packages/clang/clang-coral-2018.08.08/bin/clang + cxx: /usr/tce/packages/clang/clang-coral-2018.08.08/bin/clang++ + f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: clang@default + paths: + cc: clang + cxx: clang++ + f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: gcc@8.3.1 + paths: + cc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc + cxx: /usr/tce/packages/gcc/gcc-8.3.1/bin/g++ + f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran + fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: gcc@4.9.3 + paths: + cc: /usr/tce/packages/gcc/gcc-4.9.3/bin/gcc + cxx: /usr/tce/packages/gcc/gcc-4.9.3/bin/g++ + f77: /usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran + fc: /usr/tce/packages/gcc/gcc-4.9.3/bin/gfortran + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: gcc@default + paths: + cc: gcc + cxx: g++ + f77: gfortran + fc: gfortran + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: xl@default + paths: + cc: xlc + cxx: xlc++ + f77: xlf2003 + fc: xlf2003 + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: xl@beta2019.06.20 + paths: + cc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlc + cxx: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlc++ + f77: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + fc: /usr/tce/packages/xl/xl-beta-2019.06.20/bin/xlf2003_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: xl@16.1.1.7 + paths: + cc: /usr/tce/packages/xl/xl-2020.03.18/bin/xlc_r + cxx: /usr/tce/packages/xl/xl-2020.03.18/bin/xlC_r + fc: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf2003_r + f77: /usr/tce/packages/xl/xl-2020.03.18/bin/xlf_r + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: pgi@default + paths: + cc: pgcc + cxx: pgc++ + f77: pgfortran + fc: pgfortran + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: pgi@19.10 + paths: + cc: /usr/tce/packages/pgi/pgi-19.10/bin/pgcc + cxx: /usr/tce/packages/pgi/pgi-19.10/bin/pgc++ + f77: /usr/tce/packages/pgi/pgi-19.10/bin/pgfortran + fc: /usr/tce/packages/pgi/pgi-19.10/bin/pgfortran + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] +- compiler: + spec: pgi@20.4 + paths: + cc: /usr/tce/packages/pgi/pgi-20.4/bin/pgcc + cxx: /usr/tce/packages/pgi/pgi-20.4/bin/pgc++ + f77: /usr/tce/packages/pgi/pgi-20.4/bin/pgfortran + fc: /usr/tce/packages/pgi/pgi-20.4/bin/pgf90 + flags: {} + operating_system: rhel7 + target: ppc64le + modules: [] + environment: {} + extra_rpaths: [] diff --git a/spack-environments/care/blueos_3_ppc64le_ib_p9/packages.yaml b/spack-environments/care/blueos_3_ppc64le_ib_p9/packages.yaml new file mode 100644 index 0000000..d07dcef --- /dev/null +++ b/spack-environments/care/blueos_3_ppc64le_ib_p9/packages.yaml @@ -0,0 +1,123 @@ +packages:: + all: + permissions: + read: world + write: group + group: radiuss + providers: + blas: + - netlib-lapack + lapack: + - netlib-lapack + mpi: + - spectrum-mpi + unwind: + - libunwind + # This defaults us to machine specific flags of ivybridge which allows + # us to run on broadwell as well + target: [ppc64le] + compiler: [gcc, pgi, clang, xl] + + cuda: + version: [11.0.2, 10.1.243, 10.1.168, 9.2.148, 8.0] + buildable: false + externals: + - spec: cuda@11.0.2 + prefix: /usr/tce/packages/cuda/cuda-11.0.2 + - spec: cuda@10.1.243 + prefix: /usr/tce/packages/cuda/cuda-10.1.243 + - spec: cuda@10.1.168 + prefix: /usr/tce/packages/cuda/cuda-10.1.168 + - spec: cuda@9.2.148 + prefix: /usr/tce/packages/cuda/cuda-9.2.148 + - spec: cuda@8.0 + prefix: /usr/tce/packages/cuda/cuda-8.0 + spectrum-mpi: + externals: + - spec: spectrum-mpi@10.3.1.03rtm0%pgi@19.10 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-19.10 + - spec: spectrum-mpi@10.3.1.03rtm0%pgi@20.4 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-pgi-20.4 + - spec: spectrum-mpi@10.3.1.03rtm0%gcc@8.3.1 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-8.3.1 + - spec: spectrum-mpi@10.3.1.03rtm0%gcc@4.9.3 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-gcc-4.9.3 + - spec: spectrum-mpi@10.3.1.03rtm0%clang@9.0.0 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-9.0.0 + - spec: spectrum-mpi@10.3.1.03rtm0%clang@9.0.0ibm + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-2019.10.03 + - spec: spectrum-mpi@10.3.1.03rtm0%clang@10.0.1ibm + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-clang-ibm-10.0.1 + - spec: spectrum-mpi@10.3.1.03rtm0%xl@16.1.1.7 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2020.03.18 + - spec: spectrum-mpi@10.3.1.03rtm0%xl@beta2019.06.20 + prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-beta-2019.06.20 + buildable: false + + cmake: + version: [3.18.0] + buildable: false + externals: + - spec: cmake@3.18.0 + prefix: /usr/tce/packages/cmake/cmake-3.18.0 + + python: + buildable: false + version: [3.8.2] + externals: + - spec: python@3.8.2 + prefix: /usr/tce/packages/python/python-3.8.2 + + # Blas/Lapack virtual package provider + netlib-lapack: + buildable: false + externals: + - spec: netlib-lapack@3.6.1 + prefix: /usr + + # System level packages to not build + autoconf: + buildable: false + externals: + - spec: autoconf@2.69 + prefix: /usr + automake: + buildable: false + externals: + - spec: automake@1.13.4 + prefix: /usr + bzip2: + buildable: false + externals: + - spec: bzip2@1.0.6 + prefix: /usr + gettext: + buildable: false + externals: + - spec: gettext@0.19.8.1 + prefix: /usr + libtool: + buildable: false + externals: + - spec: libtool@2.4.2 + prefix: /usr + m4: + buildable: false + externals: + - spec: m4@1.4.16 + prefix: /usr + perl: + buildable: false + externals: + - spec: perl@5.16.3 + prefix: /usr + pkg-config: + buildable: false + externals: + - spec: pkg-config@0.27.1 + prefix: /usr + tar: + buildable: false + externals: + - spec: tar@1.26 + prefix: /usr diff --git a/spack-environments/care/spack.yaml b/spack-environments/care/spack.yaml new file mode 100644 index 0000000..c717b78 --- /dev/null +++ b/spack-environments/care/spack.yaml @@ -0,0 +1,79 @@ +############################################################################## +# Copyright (c) 2020-2021, Lawrence Livermore National Security, LLC and +# RADIUSS Stack project contributors. See the LICENSE file for details. +# +# SPDX-License-Identifier: MIT +############################################################################## + +spack: + #[general--] + include: + - ../radiuss/$SYS_TYPE + concretization: separately + view: false + #[--general] + + #[config-override--] + config: + install_tree: + root: /usr/workspace/radiuss/install/care-stack + padded_length: 128 + projections: + all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}' + misc_cache: $spack/.misc_cache + test_stage: $spack/.test_stage + 'build_stage:': + - $spack/var/spack/stage + #[--config-override] + + mirrors: + mirror: file:///usr/workspace/radiuss/mirrors/llnl-stack + + #[definitions--] + definitions: + - compilers: [] # ['%gcc@8.1.0', '%gcc@8.3.1', '%clang@10.0.0'] + when: env.get("SYS_TYPE", "") == "toss_3_x86_64_ib" + - compilers: ['%gcc@8.3.1'] # ['%xl@16.1.1.7'] + when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9" + #[definitions--] + - projects: + when: env.get("SYS_TYPE", "") == "toss_3_x86_64_ib" + - projects: + - care+cuda cuda_arch=70 +allow-unsupported-compilers ^cuda@10.1.168 ^cmake@3.14.5 + when: env.get("SYS_TYPE", "") == "blueos_3_ppc64le_ib_p9" + - dependencies: [] + #- hdf5@1.8.21~shared #axom requires shared variant + #[--definitions] + + specs: + - matrix: + - [$projects, $dependencies] + - [$compilers] + + gitlab-ci: + script: + - . ${CHILD_SPACK_PATH}/share/spack/setup-env.sh + - cd ${SPACK_CONCRETE_ENV_DIR} && spack env activate --without-view . + - spack -d ci rebuild + + mappings: + ## quartz + ## [runner-mapping--] + #- match: + # - target=broadwell + # runner-attributes: + # tags: [quartz, shell] + ## [--runner-mapping] + + # lassen + - match: + - 'target=ppc64le:' + runner-attributes: + tags: [lassen, shell] + + service-job-attributes: + tags: [lassen, shell] + before_script: + - . ${CHILD_SPACK_PATH}/share/spack/setup-env.sh + - spack env activate --without-view . + diff --git a/spack-environments/care/toss_3_x86_64_ib/compilers.yaml b/spack-environments/care/toss_3_x86_64_ib/compilers.yaml new file mode 100644 index 0000000..ef0f4e0 --- /dev/null +++ b/spack-environments/care/toss_3_x86_64_ib/compilers.yaml @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2020, Lawrence Livermore National Security, LLC and +# RADIUSS Stack project contributors. See the LICENSE file for details. +# +# SPDX-License-Identifier: MIT +############################################################################## + +compilers:: +- compiler: + environment: {} + extra_rpaths: [] + flags: + cflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 + cxxflags: --gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1 + modules: + - clang/10.0.0 + operating_system: rhel7 + paths: + cc: /usr/tce/packages/clang/clang-10.0.0/bin/clang + cxx: /usr/tce/packages/clang/clang-10.0.0/bin/clang++ + f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran + fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran + spec: clang@10.0.0 + target: x86_64 +- compiler: + environment: {} + extra_rpaths: [] + flags: {} + modules: + - gcc/8.3.1 + operating_system: rhel7 + paths: + cc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc + cxx: /usr/tce/packages/gcc/gcc-8.3.1/bin/g++ + f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran + fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran + spec: gcc@8.3.1 + target: x86_64 +- compiler: + environment: {} + extra_rpaths: [] + flags: {} + modules: + - gcc/8.1.0 + operating_system: rhel7 + paths: + cc: /usr/tce/packages/gcc/gcc-8.1.0/bin/gcc + cxx: /usr/tce/packages/gcc/gcc-8.1.0/bin/g++ + f77: /usr/tce/packages/gcc/gcc-8.1.0/bin/gfortran + fc: /usr/tce/packages/gcc/gcc-8.1.0/bin/gfortran + spec: gcc@8.1.0 + target: x86_64 diff --git a/spack-environments/care/toss_3_x86_64_ib/config.yaml b/spack-environments/care/toss_3_x86_64_ib/config.yaml new file mode 100644 index 0000000..2936d5a --- /dev/null +++ b/spack-environments/care/toss_3_x86_64_ib/config.yaml @@ -0,0 +1,4 @@ +config: + build_jobs: 36 + + concretizer: clingo diff --git a/spack-environments/care/toss_3_x86_64_ib/packages.yaml b/spack-environments/care/toss_3_x86_64_ib/packages.yaml new file mode 100644 index 0000000..bb8e9ae --- /dev/null +++ b/spack-environments/care/toss_3_x86_64_ib/packages.yaml @@ -0,0 +1,151 @@ +############################################################################## +# Copyright (c) 2020, Lawrence Livermore National Security, LLC and +# RADIUSS Stack project contributors. See the LICENSE file for details. +# +# SPDX-License-Identifier: MIT +############################################################################## + +#[config-override--] +packages:: +#[--config-override] + all: + permissions: + read: world + write: group + group: radiuss + providers: + blas: + - netlib-lapack + lapack: + - netlib-lapack + mpi: + - mvapich2 + - openmpi + unwind: + - libunwind + + mpi: + buildable: false + mvapich2: + buildable: false + externals: + - spec: mvapich2@2.2%gcc@8.1.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/mvapich2/mvapich2-2.2-gcc-8.1.0 + - spec: mvapich2@2.3%gcc@8.1.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.1.0 + - spec: mvapich2@2.2%gcc@8.3.1 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/mvapich2/mvapich2-2.2-gcc-8.3.1 + - spec: mvapich2@2.3%gcc@8.3.1 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-gcc-8.3.1 + - spec: mvapich2@2.2%clang@10.0.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/mvapich2/mvapich2-2.2-clang-10.0.0 + - spec: mvapich2@2.3%clang@10.0.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/mvapich2/mvapich2-2.3-clang-10.0.0 + openmpi: + buildable: false + externals: + - spec: openmpi@2.0.0%gcc@8.1.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-2.0.0-gcc-8.1.0 + - spec: openmpi@2.1.0%gcc@8.1.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-2.1.0-gcc-8.1.0 + - spec: openmpi@3.0.1%gcc@8.1.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-3.0.1-gcc-8.1.0 + - spec: openmpi@2.0.0%gcc@8.3.1 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-2.0.0-gcc-8.3.1 + - spec: openmpi@2.1.0%gcc@8.3.1 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-2.1.0-gcc-8.3.1 + - spec: openmpi@3.0.1%gcc@8.3.1 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-3.0.1-gcc-8.3.1 + - spec: openmpi@2.0.0%clang@10.0.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-2.0.0-clang-10.0.0 + - spec: openmpi@2.1.0%clang@10.0.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-2.1.0-clang-10.0.0 + - spec: openmpi@3.0.1%clang@10.0.0 arch=linux-rhel7-broadwell + prefix: /usr/tce/packages/openmpi/openmpi-3.0.1-clang-10.0.0 + cmake: + version: + - 3.18.0 + buildable: false + externals: + - spec: cmake@3.18.0 + prefix: /usr/tce/packages/cmake/cmake-3.18.0 + python: + buildable: false + externals: + - spec: python@3.8.2 + prefix: /usr/tce/packages/python/python-3.8.2 + netlib-lapack: + buildable: false + externals: + - spec: netlib-lapack@3.6.1 + prefix: /usr + autoconf: + buildable: false + externals: + - spec: autoconf@2.69 + prefix: /usr + automake: + buildable: false + externals: + - spec: automake@1.13.4 + prefix: /usr + bzip2: + buildable: false + externals: + - spec: bzip2@1.0.6 + prefix: /usr + gettext: + buildable: false + externals: + - spec: gettext@0.19.8.1 + prefix: /usr + graphviz: + buildable: false + externals: + - spec: graphviz@2.30.1 + prefix: /usr + libtool: + buildable: false + externals: + - spec: libtool@2.4.2 + prefix: /usr + libx11: + buildable: false + externals: + - spec: libx11@1.20.4 + prefix: /usr + m4: + buildable: false + externals: + - spec: m4@1.4.16 + prefix: /usr + perl: + buildable: false + externals: + - spec: perl@5.16.3 + prefix: /usr + pkg-config: + buildable: false + externals: + - spec: pkg-config@0.27.1 + prefix: /usr + tar: + buildable: false + externals: + - spec: tar@1.26 + prefix: /usr + unzip: + buildable: false + externals: + - spec: readline@6.2 + prefix: /usr + unzip: + buildable: false + externals: + - spec: unzip@6.0 + prefix: /usr + zlib: + buildable: false + externals: + - spec: zlib@1.2.7 + prefix: /usr From 4db9bdead24406928dc4594d119bd5b2cc3d1776 Mon Sep 17 00:00:00 2001 From: Tamara Dahlgren Date: Thu, 1 Jul 2021 16:18:07 -0700 Subject: [PATCH 2/3] hard code the ref and project name in .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04d3b35..3d66f17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,17 +11,17 @@ variables: SPACK_PATH: ${CI_BUILDS_DIR}/llnl-stack-${CI_COMMIT_SHORT_SHA}/spack #[--create-unique-path] SPACK_REPO: git@github.com:spack/spack.git - SPACK_REF: develop + SPACK_REF: 1c92d832b6eefaf2cf1d053ff621ddd44de7606e SPACK_DEBUG: "-d" - PROJECT_NAME: "radiuss" + PROJECT_NAME: "add-care" # We only do one generation per stage because we found conflicts otherwise #[one-generate-per-stage--] stages: - get-spack - concretize-test - - generate-quartz - generate-lassen + - generate-quartz - build - rm-spack #[--one-generate-per-stage] From 5a00135d95cfbda28bc9ba7e6ead49313d01d883 Mon Sep 17 00:00:00 2001 From: Tamara Dahlgren Date: Thu, 1 Jul 2021 17:54:13 -0700 Subject: [PATCH 3/3] Skip quartz; add care-specific clone commands --- .gitlab-ci.yml | 14 ++++++----- .gitlab/child/concretize.yml | 2 +- .gitlab/generate.yml | 38 +++++++++++++++--------------- .gitlab/get-spack-care | 29 +++++++++++++++++++++++ spack-environments/care/spack.yaml | 2 -- 5 files changed, 57 insertions(+), 28 deletions(-) create mode 100755 .gitlab/get-spack-care diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d66f17..0b8ef73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,28 +21,30 @@ stages: - get-spack - concretize-test - generate-lassen - - generate-quartz + #- generate-quartz - build - rm-spack #[--one-generate-per-stage] -.on-quartz: - tags: [shell, quartz] +#.on-quartz: +# tags: [shell, quartz] .on-lassen: tags: [shell, lassen] #[get-spack--] get-spack: - extends: [.on-quartz] + #extends: [.on-quartz] + extends: [.on-lassen] stage: get-spack script: - - .gitlab/get-spack + - .gitlab/get-spack-care #[--get-spack] #[rm-spack--] rm-spack: - extends: [.on-quartz] + #extends: [.on-quartz] + extends: [.on-lassen] stage: rm-spack script: - .gitlab/remove-spack diff --git a/.gitlab/child/concretize.yml b/.gitlab/child/concretize.yml index 6cc73b5..6d5b583 100644 --- a/.gitlab/child/concretize.yml +++ b/.gitlab/child/concretize.yml @@ -22,7 +22,7 @@ stages: extends: .concretize_rules tags: - shell - - quartz + - lassen before_script: - date - git clone ${CHILD_SPACK_PATH} --depth 1 local_spack diff --git a/.gitlab/generate.yml b/.gitlab/generate.yml index c6a08df..7516229 100644 --- a/.gitlab/generate.yml +++ b/.gitlab/generate.yml @@ -33,26 +33,26 @@ paths: - "${CI_PROJECT_DIR}/jobs_scratch_dir" -# quartz -generate-on-quartz: - extends: [.generate-pipeline, .on-quartz, .has_project_name] - stage: generate-quartz - before_script: - - .gitlab/print-variables +## quartz +#generate-on-quartz: +# extends: [.generate-pipeline, .on-quartz, .has_project_name] +# stage: generate-quartz +# before_script: +# - .gitlab/print-variables -#[send-variable-child--] -build-on-quartz: - extends: [.has_project_name] - stage: build - variables: - CHILD_SPACK_PATH: ${SPACK_PATH} - trigger: - include: - - artifact: "jobs_scratch_dir/pipeline.yml" - job: generate-on-quartz - strategy: depend - needs: [generate-on-quartz] -#[--send-variable-child] +##[send-variable-child--] +#build-on-quartz: +# extends: [.has_project_name] +# stage: build +# variables: +# CHILD_SPACK_PATH: ${SPACK_PATH} +# trigger: +# include: +# - artifact: "jobs_scratch_dir/pipeline.yml" +# job: generate-on-quartz +# strategy: depend +# needs: [generate-on-quartz] +##[--send-variable-child] # lassen generate-on-lassen: diff --git a/.gitlab/get-spack-care b/.gitlab/get-spack-care new file mode 100755 index 0000000..8f79688 --- /dev/null +++ b/.gitlab/get-spack-care @@ -0,0 +1,29 @@ +#!/bin/bash +checkout() { + cd ${SPACK_PATH} + git fetch origin pull/19736/head:feature/allow-untested-cuda-versions + git checkout 1c92d832b6eefaf2cf1d053ff621ddd44de7606e + # We tag the commit so we can retrieve which one was used by a given pipeline. + git tag ${CI_PIPELINE_ID} + cd - +} + +set -e + +#[get-spack--] +if [[ ! -d ${SPACK_PATH} ]] +then + mkdir -p ${SPACK_PATH}/.. + git clone ${SPACK_REPO} ${SPACK_PATH} + checkout +else + checkout + #git checkout -b temp + #git branch -D feature/allow-untested-cuda-versions + #git fetch --depth 1 ${SPACK_REPO} ${SPACK_REF}:${SPACK_REF} + #git checkout ${SPACK_REF} + #git tag ${CI_PIPELINE_ID} + #git branch -D temp + #cd - +fi +#[--get-spack] diff --git a/spack-environments/care/spack.yaml b/spack-environments/care/spack.yaml index c717b78..3770660 100644 --- a/spack-environments/care/spack.yaml +++ b/spack-environments/care/spack.yaml @@ -58,12 +58,10 @@ spack: mappings: ## quartz - ## [runner-mapping--] #- match: # - target=broadwell # runner-attributes: # tags: [quartz, shell] - ## [--runner-mapping] # lassen - match: