diff --git a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/Dockerfile b/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/Dockerfile deleted file mode 100644 index 3d2600a3c..000000000 --- a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) Lawrence Livermore National Security, LLC and other Ascent -# Project developers. See top-level LICENSE AND COPYRIGHT files for dates and -# other details. No copyright assignment is required to contribute to Ascent. - -FROM alpinedav/ascent-ci:ubuntu-18.04-cuda-11.4.0-devel - -# obtain a copy of ascent source from host env, -# which we use to call uberenv -COPY ascent.docker.src.tar.gz / -# extract -RUN tar -xzf ascent.docker.src.tar.gz - -# copy spack build script in -COPY docker_uberenv_build.sh docker_env_setup.sh / -RUN chmod -R a+x /*.sh - -RUN /docker_uberenv_build.sh - -RUN /docker_env_setup.sh diff --git a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/build.sh b/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/build.sh deleted file mode 100644 index 1c2385a4d..000000000 --- a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/build.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# Copyright (c) Lawrence Livermore National Security, LLC and other Ascent -# Project developers. See top-level LICENSE AND COPYRIGHT files for dates and -# other details. No copyright assignment is required to contribute to Ascent. -set -ev - -export TAG_BASE=alpinedav/ascent-ci:ubuntu-18.04-cuda-11.4.0-devel-tpls-build-ascent - -date - -python ../build_and_tag.py ${TAG_BASE} - -date diff --git a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_env_setup.sh b/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_env_setup.sh deleted file mode 100644 index 12dfb0bb0..000000000 --- a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_env_setup.sh +++ /dev/null @@ -1,7 +0,0 @@ -# create some helper scripts -python ascent/scripts/gen_spack_env_script.py cmake mpi -echo "git clone --recursive https://github.com/Alpine-DAV/ascent.git" > clone.sh -chmod +x clone.sh - -# delete copy of source from host (ci will fetch new from repo) -rm -rf ascent \ No newline at end of file diff --git a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_uberenv_build.sh b/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_uberenv_build.sh deleted file mode 100644 index 4b1382a8b..000000000 --- a/scripts/ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_uberenv_build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -ev - -cmake_install_dir=/cmake-3.23.2-linux-x86_64 -if [ ! -d ${cmake_install_dir} ]; then - echo "**** Downloading ${hdf5_tarball}" - # setup cmake in container - curl -L https://github.com/Kitware/CMake/releases/download/v3.23.2/cmake-3.23.2-linux-x86_64.tar.gz -o cmake-3.23.2-linux-x86_64.tar.gz - tar -xzf cmake-3.23.2-linux-x86_64.tar.gz -fi - -export PATH=$PATH:/${cmake_install_dir}/bin/ - -# build cuda tpls with helper script -chmod +x ascent/scripts/build_ascent/build_ascent_cuda.sh -env build_ascent=false ascent/scripts/build_ascent/build_ascent_cuda.sh - diff --git a/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_11.4.3_devel_tpls/docker_uberenv_build.sh b/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_11.4.3_devel_tpls/docker_uberenv_build.sh index 5a18cb9be..64de1313b 100644 --- a/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_11.4.3_devel_tpls/docker_uberenv_build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_11.4.3_devel_tpls/docker_uberenv_build.sh @@ -8,12 +8,12 @@ export SPACK_SPEC="%gcc+mpi+cuda+vtkh+dray+mfem+occa~genten~python~openmp~shared # constraints export SPACK_SPEC="${SPACK_SPEC} ^raja+cuda~openmp cuda_arch=70 ^umpire+cuda~openmp cuda_arch=70 ^camp+cuda~openmp cuda_arch=70 ^hdf5~mpi ^mfem~cuda~petsc~sundials~slepc ^hypre~cuda ^vtk-m+cuda~kokkos cuda_arch=70" # config -export SPACK_CONFIG="scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_22.04_cuda_11.8.0_devel/" +export SPACK_ENV_YAML="scripts/uberenv_configs/spack_configs/envs/alpinedav-ubuntu_20.04_cuda_11.4.3_devel/spack.yaml" cd ascent && python3 scripts/uberenv/uberenv.py \ -k \ --spec="${SPACK_SPEC}" \ - --spack-config-dir="${SPACK_CONFIG}" \ + --spack-env-file="${SPACK_ENV_YAML}" \ --prefix="/uberenv_libs" # cleanup the spack build stuff to free up space diff --git a/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/docker_uberenv_build.sh b/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/docker_uberenv_build.sh index 5a18cb9be..ebe6d2cd5 100644 --- a/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/docker_uberenv_build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_20.04_cuda_12.1.1_devel_tpls/docker_uberenv_build.sh @@ -8,12 +8,12 @@ export SPACK_SPEC="%gcc+mpi+cuda+vtkh+dray+mfem+occa~genten~python~openmp~shared # constraints export SPACK_SPEC="${SPACK_SPEC} ^raja+cuda~openmp cuda_arch=70 ^umpire+cuda~openmp cuda_arch=70 ^camp+cuda~openmp cuda_arch=70 ^hdf5~mpi ^mfem~cuda~petsc~sundials~slepc ^hypre~cuda ^vtk-m+cuda~kokkos cuda_arch=70" # config -export SPACK_CONFIG="scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_22.04_cuda_11.8.0_devel/" +export SPACK_ENV_YAML="scripts/uberenv_configs/spack_configs/envs/alpinedav-ubuntu_20.04_cuda_12.1.1_devel/spack.yaml" cd ascent && python3 scripts/uberenv/uberenv.py \ -k \ --spec="${SPACK_SPEC}" \ - --spack-config-dir="${SPACK_CONFIG}" \ + --spack-env-file="${SPACK_ENV_YAML}" \ --prefix="/uberenv_libs" # cleanup the spack build stuff to free up space diff --git a/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/docker_uberenv_build.sh b/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/docker_uberenv_build.sh index 921c9b182..fc43248fe 100755 --- a/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/docker_uberenv_build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_20.04_devel_tpls/docker_uberenv_build.sh @@ -8,12 +8,12 @@ export SPACK_SPEC="%gcc+mpi+python+dray+mfem+occa+fides+adios2+babelflow~genten" # constraints export SPACK_SPEC="${SPACK_SPEC}" # config -export SPACK_CONFIG="scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_18.04_devel/" +export SPACK_ENV_YAML="scripts/uberenv_configs/spack_configs/envs/alpinedav-ubuntu_18.04_devel/spack.yaml" cd ascent && python3 scripts/uberenv/uberenv.py \ -k \ --spec="${SPACK_SPEC}" \ - --spack-config-dir="${SPACK_CONFIG}" \ + --spack-env-file="${SPACK_ENV_YAML}" \ --prefix="/uberenv_libs" # cleanup the spack build stuff to free up space diff --git a/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/docker_uberenv_build.sh b/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/docker_uberenv_build.sh index 921c9b182..fc43248fe 100644 --- a/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/docker_uberenv_build.sh +++ b/scripts/ci/docker/alpinedav_ubuntu_22.04_devel_tpls/docker_uberenv_build.sh @@ -8,12 +8,12 @@ export SPACK_SPEC="%gcc+mpi+python+dray+mfem+occa+fides+adios2+babelflow~genten" # constraints export SPACK_SPEC="${SPACK_SPEC}" # config -export SPACK_CONFIG="scripts/uberenv_configs/spack_configs/configs/alpinedav/ubuntu_18.04_devel/" +export SPACK_ENV_YAML="scripts/uberenv_configs/spack_configs/envs/alpinedav-ubuntu_18.04_devel/spack.yaml" cd ascent && python3 scripts/uberenv/uberenv.py \ -k \ --spec="${SPACK_SPEC}" \ - --spack-config-dir="${SPACK_CONFIG}" \ + --spack-env-file="${SPACK_ENV_YAML}" \ --prefix="/uberenv_libs" # cleanup the spack build stuff to free up space