update conduit for 0.5.0 release (#13455)
* add support for static (via ~shared) and use vtk-m 1.2 * updating vtkh package to output cmake configure file and pinning it to vtkm 1.2 * trying a different cmake for vtkh * removing problematic b * making conduit respect ~python * fixing ascent python logic * update ascent package * consistant cmake usage * conditionally add tbb in ascent if vtkh * applying becker fix * adding vtkh tag * fixing vtkh tagged version * updating ascent and conduit for static builds * enabling openmp * reverting files that should not have been changed * ascent updates * more robust handling of variants * fixing ascent package typo * ascent: add optional support for mfem * enable mfem conduit support for ascent * add optional adios dep to conduit * remove ver req from conduit * ascent: remove confusing comment * tweaks to conduit and ascent pkg recipes * fix typo in conduit package * pref conduit master * fixing mfem typo for ascent * reverting files * adding mirror for bzip * changing mfem to depend on conduit@master to get updated relay * restore use of conduit 0.3.1 or greater for mfem * set master as prefered conduit version * allow mfem to use conduit master * adding rover package and editing ascent * updating vtkm cmake dep * updates from axom * guard ascent python support on +shared * removing rover to simply ascent package * add fortran variant to conduit, to allow us to turn off conduit support even when a fortran compiler is specified * fix fortran compiler check so it can work on cray systems * working towards cuda fix for vtkm lagrange filter * update ascent package with more variants, and patch to avoid nvcc issue * hdf5 flags fix for BGQ * flake8 * extra guards for cuda patch * conduit and ascent fortran fix * fix patch for non cuda case * add test variant to conduit, tweak ascent pkg * change min ver of cmake used for ascent * h5z-zfp package: unset FC when ~fortran * conform to expected upstream solution * pinning vtkm * going back to vtkm master * add back vtk-m variant for shared libs * update ascent and vtkh packages * wire up option to run tests during install * add post install test * add testing to ascent * tweak for blueos xl * add ctest output on error for run_tests * enable ctest output on error for run_tests * add testing of the using-with-make example * update using-with-make examples * typo in ascent using-with-cmake test * fix ascent using test exe names * more fixes, less sleep * more fixes, less sleep ... * remove unwired up version * improvments suggested on review * adding new cmake * Update package.py * Update package.py * changes post cori os update * fix cray hack * Update package.py Fixing 'fix'. Inconsistent variable names in conduit package * type in spack recipes * add zfp support to conduit * fix indent error in conduit pkg * move to use build phases, add sphinx rtd as dep, fix ex names in tests * add conduit 0.5.0 release * flake8 * remove old cray hack * incorp feedback from review * fix to use proper build env sig
This commit is contained in:
committed by
Adam J. Stewart
parent
ffb4e02a53
commit
1b3f546ba4
@@ -72,7 +72,7 @@ class Ascent(Package):
|
||||
# package dependencies
|
||||
###########################################################################
|
||||
|
||||
depends_on("cmake@3.9.2:3.9.999", type='build')
|
||||
depends_on("cmake@3.14:", type='build')
|
||||
depends_on("conduit~python", when="~python")
|
||||
depends_on("conduit+python", when="+python+shared")
|
||||
depends_on("conduit~shared~python", when="~shared")
|
||||
@@ -120,8 +120,8 @@ class Ascent(Package):
|
||||
#######################
|
||||
depends_on("py-sphinx", when="+python+doc", type='build')
|
||||
|
||||
def setup_environment(self, spack_env, run_env):
|
||||
spack_env.set('CTEST_OUTPUT_ON_FAILURE', '1')
|
||||
def setup_build_environment(self, env):
|
||||
env.set('CTEST_OUTPUT_ON_FAILURE', '1')
|
||||
|
||||
def install(self, spec, prefix):
|
||||
"""
|
||||
@@ -353,12 +353,21 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
|
||||
cfg.write("# MPI Support\n")
|
||||
|
||||
if "+mpi" in spec:
|
||||
mpicc_path = spec['mpi'].mpicc
|
||||
mpicxx_path = spec['mpi'].mpicxx
|
||||
mpifc_path = spec['mpi'].mpifc
|
||||
# if we are using compiler wrappers on cray systems
|
||||
# use those for mpi wrappers, b/c spec['mpi'].mpicxx
|
||||
# etc make return the spack compiler wrappers
|
||||
# which can trip up mpi detection in CMake 3.14
|
||||
if cpp_compiler == "CC":
|
||||
mpicc_path = "cc"
|
||||
mpicxx_path = "CC"
|
||||
mpifc_path = "ftn"
|
||||
cfg.write(cmake_cache_entry("ENABLE_MPI", "ON"))
|
||||
cfg.write(cmake_cache_entry("MPI_C_COMPILER", spec['mpi'].mpicc))
|
||||
cfg.write(cmake_cache_entry("MPI_CXX_COMPILER",
|
||||
spec['mpi'].mpicxx))
|
||||
cfg.write(cmake_cache_entry("MPI_Fortran_COMPILER",
|
||||
spec['mpi'].mpifc))
|
||||
cfg.write(cmake_cache_entry("MPI_C_COMPILER", mpicc_path))
|
||||
cfg.write(cmake_cache_entry("MPI_CXX_COMPILER", mpicxx_path))
|
||||
cfg.write(cmake_cache_entry("MPI_Fortran_COMPILER", mpifc_path))
|
||||
mpiexe_bin = join_path(spec['mpi'].prefix.bin, 'mpiexec')
|
||||
if os.path.isfile(mpiexe_bin):
|
||||
# starting with cmake 3.10, FindMPI expects MPIEXEC_EXECUTABLE
|
||||
|
||||
Reference in New Issue
Block a user