zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ECP Data & Vis SDK packages (#13027)

Browse Source 
* ecp-io-sdk: Add faodel and sort variants

* ecp-viz-sdk: Re-enable catalyst, sort variants, turn on by default

* ecp-io-sdk and ecp-viz-sdk: Fix dependency variants
This commit is contained in:
Chuck Atkins
2019-10-03 10:05:02 -04:00
committed by GitHub
parent 78577c0a90
commit b973f038fd
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/ecp-io-sdk/package.py
View File

@@ -16,26 +16,27 @@ class EcpIoSdk(CMakePackage):
version('1.0', branch='master') version('1.0', branch='master')
variant('hdf5', default=True, description="Enable HDF5")
variant('adios2', default=True, description="Enable ADIOS2") variant('adios2', default=True, description="Enable ADIOS2")
variant('pnetcdf', default=True, description="Enable PNetCDF")
variant('darshan', default=True, description="Enable Darshan") variant('darshan', default=True, description="Enable Darshan")
variant('faodel', default=False, description="Enable FAODEL")
variant('hdf5', default=True, description="Enable HDF5")
variant('mercury', default=True, description="Enable Mercury") variant('mercury', default=True, description="Enable Mercury")
variant('pnetcdf', default=True, description="Enable PNetCDF")
variant('unifyfs', default=True, description="Enable UnifyFS") variant('unifyfs', default=True, description="Enable UnifyFS")
variant('veloc', default=True, description="Enable VeloC") variant('veloc', default=True, description="Enable VeloC")
# Currently no spack packages # Currently no spack packages
# variant('romio', default=False, description="Enable ROMIO") # variant('romio', default=False, description="Enable ROMIO")
# variant('faodel', default=False, description="Enable FAODEL")
depends_on('hdf5', when='+hdf5') depends_on('adios2+mpi+fortran+zfp+hdf5', when='+adios2')
depends_on('adios2', when='+adios2')
depends_on('parallel-netcdf', when='+pnetcdf')
depends_on('veloc', when='+veloc')
depends_on('unifyfs', when='+unifyfs')
depends_on('darshan-runtime', when='+darshan') depends_on('darshan-runtime', when='+darshan')
depends_on('darshan-util', when='+darshan') depends_on('darshan-util', when='+darshan')
depends_on('mercury', when='+mercury') depends_on('faodel+mpi+hdf5', when='+faodel')
depends_on('hdf5+mpi+fortran', when='+hdf5')
depends_on('mercury+mpi+ofi+sm', when='+mercury')
depends_on('parallel-netcdf+fortran+pic', when='+pnetcdf')
depends_on('unifyfs+fortran+numa', when='+unifyfs')
depends_on('veloc', when='+veloc')
def cmake_args(self): def cmake_args(self):
return ['-DIO=ON'] return ['-DIO=ON']

28
var/spack/repos/builtin/packages/ecp-viz-sdk/package.py
View File

@@ -16,31 +16,29 @@ class EcpVizSdk(CMakePackage):
version('1.0', branch='master') version('1.0', branch='master')
variant('paraview', default=False, description="Enable ParaView") variant('catalyst', default=True, description="Enable Catalyst")
variant('vtkm', default=False, description="Enable VTK-m") variant('paraview', default=True, description="Enable ParaView")
variant('zfp', default=False, description="Enable ZFP") variant('sz', default=True, description="Enable SZ")
variant('sz', default=False, description="Enable SZ") variant('vtkm', default=True, description="Enable VTK-m")
variant('zfp', default=True, description="Enable ZFP")
# TODO: fix +osmesa~rendering conflict
variant('catalyst', default=False, description="Enable Catalyst")
# Unsatisfiable dependencies: hdf5 and netcdf
# variant('visit', default=False, description="Enable VisIt")
# Broken dependency: vtk-h # Broken dependency: vtk-h
# variant('ascent', default=False, description="Enable Ascent") # variant('ascent', default=False, description="Enable Ascent")
# Outstanding build issues
# variant('visit', default=False, description="Enable VisIt")
# Missing spack package # Missing spack package
# variant('cinema', default=False, description="Enable Cinema") # variant('cinema', default=False, description="Enable Cinema")
# variant('rover', default=False, description="Enable ROVER") # variant('rover', default=False, description="Enable ROVER")
depends_on('paraview', when='+paraview')
depends_on('catalyst', when='+catalyst')
depends_on('vtkm', when='+vtkm')
depends_on('ascent', when='+ascent') depends_on('ascent', when='+ascent')
depends_on('visit', when='+visit') depends_on('catalyst', when='+catalyst')
depends_on('zfp', when='+zfp') depends_on('paraview', when='+paraview')
depends_on('sz', when='+sz') depends_on('sz', when='+sz')
depends_on('visit', when='+visit')
depends_on('vtkm', when='+vtkm')
depends_on('zfp', when='+zfp')
def cmake_args(self): def cmake_args(self):
return ['-DVIZ=ON'] return ['-DVIZ=ON']