try new containers for non device ci

Alpine-DAV · Dec 2, 2023 · c0af5ec · c0af5ec
1 parent f652e7b
commit c0af5ec
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 64 deletions.
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
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
diff --git a/...ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_env_setup.sh b/...ci/docker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_env_setup.sh
diff --git a/...ocker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_uberenv_build.sh b/...ocker/_alpinedav_ubuntu_18.04_cuda_11.4.0_devel_tpls_build_ascent/docker_uberenv_build.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
@@ -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
@@ -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
@@ -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
@@ -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