Skip to content

Commit

Permalink
try to avoid issue with needing both cmake and makefile req vers of zfp
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrush committed Jun 29, 2019
1 parent 3515c06 commit 29d5dc5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -169,7 +169,6 @@ script:
- export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}"
- export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"
- if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi
- if [ $ENABLE_ADIOS = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^adios~zfp"; fi
- echo $SPACK_SPEC
# Output something every 10 minutes or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
Expand Down
4 changes: 2 additions & 2 deletions scripts/uberenv/packages/conduit/package.py
Expand Up @@ -116,7 +116,7 @@ class Conduit(Package):
depends_on("adios~mpi~hdf5~shared~blosc", when="+adios~mpi~shared")

# zfp
depends_on("zfp", when="+zfp")
depends_on("zfpcmake", when="+zfp")

#######################
# MPI
Expand Down Expand Up @@ -441,7 +441,7 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
cfg.write("# zfp from spack \n")

if "+zfp" in spec:
cfg.write(cmake_cache_entry("ZFP_DIR", spec['zfp'].prefix))
cfg.write(cmake_cache_entry("ZFP_DIR", spec['zfpcmake'].prefix))
else:
cfg.write("# zfp not built by spack \n")

Expand Down
Expand Up @@ -6,7 +6,7 @@
from spack import *


class Zfp(CMakePackage):
class Zfpcmake(CMakePackage):
"""zfp is an open source C/C++ library for high-fidelity, high-throughput
lossy compression of floating-point and integer multi-dimensional
arrays.
Expand Down

0 comments on commit 29d5dc5

Please sign in to comment.