Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test_spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
run-script:
runs-on: ubuntu-latest
container:
image: lifflander1/vt:amd64-ubuntu-20.04-gcc-10-gcc-10-openmpi-cpp
image: lifflander1/vt:wf-amd64-ubuntu-20.04-gcc-10-openmpi-cpp
env:
VT_LB_ENABLED: 0
VT_TRACE_ENABLED: 0
Expand All @@ -30,7 +30,7 @@ jobs:

- name: Prepare Spack configuration
run: |
apt update -y -q && apt install -y -q unzip
apt update -y -q && apt install -y -q libssl-dev unzip
mkdir -p /github/home/.spack/
cp ci/packages.yaml /github/home/.spack/
chmod +x ci/test_spack.sh
Expand Down
22 changes: 11 additions & 11 deletions ci/test_spack.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#!/usr/bin/env bash

set -euo pipefail

cur_path=$(pwd)
spack_path="$cur_path/spack"
vt_spack_package="$cur_path/spack-package"

git clone --branch v0.23.1 --depth=2 https://github.com/spack/spack.git
. spack/share/spack/setup-env.sh

branch_name=${1:-master}
git clone https://github.com/spack/spack.git
git clone -b "$branch_name" https://github.com/DARMA-tasking/spack-package.git

cd "$spack_path" || exit 1
cd "$cur_path" || exit 1

declare -A variables_map
variables_map["lb_enabled"]="${VT_LB_ENABLED:-0}"
variables_map["trace_enabled"]="${VT_TRACE_ENABLED:-0}"
variables_map["trace_only"]="${VT_BUILD_TRACE_ONLY:-0}"
variables_map["trace_only"]="${VT_BUILD_TRACE_ONLY:-1}"
variables_map["doxygen_enabled"]="${VT_DOXYGEN_ENABLED:-0}"
variables_map["mimalloc_enabled"]="${VT_MIMALLOC_ENABLED:-0}"
variables_map["asan_enabled"]="${VT_ASAN_ENABLED:-0}"
Expand All @@ -41,17 +41,17 @@ do
done

install_cmd=$(printf " %s" "${cmd_vars[@]}")
install_cmd="$spack_path/bin/spack install darma-vt@develop build_type=Release ${install_cmd:1}"
install_cmd="spack install darma-vt@develop build_type=Release ${install_cmd:1}"

"$spack_path"/bin/spack clean --all
"$spack_path"/bin/spack repo add "$vt_spack_package"
"$spack_path"/bin/spack external find
spack clean --all
spack repo add "$vt_spack_package"
spack external find
$install_cmd

git clone https://github.com/DARMA-tasking/vt-sample-project
mkdir -p vt-sample-project/build
cd vt-sample-project/build || exit 1
vt_DIR=$("$spack_path"/bin/spack location --install-dir darma-vt)
vt_DIR=$(spack location --install-dir darma-vt)
export vt_DIR
cmake -G "${CMAKE_GENERATOR:-Ninja}" \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion packages/darma-vt/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class DarmaVt(CMakePackage):
depends_on("mpi")
depends_on("darma-magistrate+kokkos", when="+kokkos")
depends_on("darma-magistrate~kokkos", when="~kokkos")
depends_on("fmt@7.1.3", when="@develop,1.5:")
depends_on("fmt", when="@develop,1.5:")

sanity_check_is_dir = ["include/vt"]
sanity_check_is_file = ["cmake/vtConfig.cmake", "cmake/vtTargets.cmake"]
Expand Down