-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #669 from lukemartinlogan/dev
Dev
- Loading branch information
Showing
20 changed files
with
390 additions
and
324 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,28 +33,25 @@ class Hermes(CMakePackage): | |
| # Common across hermes_shm and hermes | ||
| variant('mpiio', default=True, description='Enable MPI I/O adapter') | ||
| variant('stdio', default=True, description='Enable STDIO adapter') | ||
| variant('debug', default=False, description='Build shared libraries') | ||
| variant('vfd', default=False, description='Enable HDF5 VFD') | ||
| variant('ares', default=False, description='Enable full libfabric install') | ||
| variant('only_verbs', default=False, description='Only verbs') | ||
| variant('debug', default=False, description='Build shared libraries') | ||
| variant('zmq', default=False, description='Build ZeroMQ tests') | ||
| variant('adios', default=False, description='Build Adios tests') | ||
| variant('encrypt', default=False, description='Build Adios tests') | ||
| variant('compress', default=False, description='Build Adios tests') | ||
|
|
||
| depends_on('[email protected]') | ||
| depends_on('[email protected]') | ||
| depends_on('mpi') | ||
| depends_on('cereal') | ||
| depends_on('yaml-cpp') | ||
| depends_on('libaio') | ||
| depends_on('doxygen') # @1.9.3 | ||
| depends_on('[email protected]: +context +fiber +filesystem +system +atomic +chrono +serialization +signals +pic +regex') | ||
| depends_on('libfabric fabrics=sockets,tcp,udp,verbs,mlx,rxm,rxd,shm', | ||
| when='+ares') | ||
| depends_on('libfabric fabrics=verbs', | ||
| when='+only_verbs') | ||
| depends_on('libzmq', '+zmq') | ||
| depends_on('[email protected]', when='+vfd') | ||
| depends_on('adios2', when='+adios') | ||
| depends_on('hermes_shm+mochi') | ||
| depends_on('hermes_shm+debug', when='+debug') | ||
| depends_on('hermes_shm+mpiio') | ||
| depends_on('hermes_shm+cereal') | ||
| depends_on('hermes_shm+boost') | ||
| depends_on('hermes_shm+ares', when='+ares') | ||
| depends_on('hermes_shm+zmq', when='+zmq') | ||
| depends_on('hermes_shm+vfd', when='+vfd') | ||
| depends_on('hermes_shm+adios', when='+adios') | ||
| depends_on('hermes_shm+encrypt', when='+encrypt') | ||
| depends_on('hermes_shm+compress', when='+compress') | ||
|
|
||
| def cmake_args(self): | ||
| args = [] | ||
|
|
@@ -72,6 +69,10 @@ def cmake_args(self): | |
| args.append('-HERMES_ENABLE_STDIO_ADAPTER=ON') | ||
| if '+vfd' in self.spec: | ||
| args.append('-HERMES_ENABLE_VFD=ON') | ||
| if '+compress' in self.spec: | ||
| args.append(self.define('HERMES_ENABLE_COMPRESSION', 'ON')) | ||
| if '+encrypt' in self.spec: | ||
| args.append(self.define('HERMES_ENABLE_ENCRYPTION', 'ON')) | ||
| return args | ||
|
|
||
| def set_include(self, env, path): | ||
|
|
@@ -92,6 +93,7 @@ def set_flags(self, env): | |
| self.set_lib(env, '{}/lib'.format(self.prefix)) | ||
| self.set_lib(env, '{}/lib64'.format(self.prefix)) | ||
| env.prepend_path('CMAKE_PREFIX_PATH', '{}/cmake'.format(self.prefix)) | ||
| env.prepend_path('CMAKE_MODULE_PATH', '{}/cmake'.format(self.prefix)) | ||
|
|
||
| def setup_dependent_environment(self, spack_env, run_env, dependent_spec): | ||
| self.set_flags(spack_env) | ||
|
|
||
Oops, something went wrong.