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

darshan-runtime, darshan-util: darshan 3.3.0 release + other additions (#23552)

Browse Source 
Add darshan-3.3.0 tags to darshan util/runtime, AutoPerf variants, AutoPerf XC variants, and HDF5 module support to darshan-runtime.
This commit is contained in:
shanedsnyder 2021-05-11 11:04:23 -05:00 committed by GitHub
parent ec033d8922
commit b4e4e76872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
var/spack/repos/builtin/packages/darshan-runtime/package.py
View File

@ -20,10 +20,11 @@ class DarshanRuntime(Package):
maintainers = ['shanedsnyder', 'carns'] maintainers = ['shanedsnyder', 'carns']
version('develop', branch='master') version('master', branch='master', submodules=True)
version('3.3.0', sha256='2e8bccf28acfa9f9394f2084ec18122c66e45d966087fa2e533928e824fcb57a', preferred=True)
version('3.3.0-pre2', sha256='0fc09f86f935132b7b05df981b05cdb3796a1ea02c7acd1905323691df65e761') version('3.3.0-pre2', sha256='0fc09f86f935132b7b05df981b05cdb3796a1ea02c7acd1905323691df65e761')
version('3.3.0-pre1', sha256='1c655359455b5122921091bab9961491be58a5f0158f073d09fe8cc772bd0812') version('3.3.0-pre1', sha256='1c655359455b5122921091bab9961491be58a5f0158f073d09fe8cc772bd0812')
version('3.2.1', sha256='d63048b7a3d1c4de939875943e3e7a2468a9034fcb68585edbc87f57f622e7f7', preferred=True) version('3.2.1', sha256='d63048b7a3d1c4de939875943e3e7a2468a9034fcb68585edbc87f57f622e7f7')
version('3.2.0', sha256='4035435bdc0fa2a678247fbf8d5a31dfeb3a133baf06577786b1fe8d00a31b7e') version('3.2.0', sha256='4035435bdc0fa2a678247fbf8d5a31dfeb3a133baf06577786b1fe8d00a31b7e')
version('3.1.8', sha256='3ed51c8d5d93b4a8cbb7d53d13052140a9dffe0bc1a3e1ebfc44a36a184b5c82') version('3.1.8', sha256='3ed51c8d5d93b4a8cbb7d53d13052140a9dffe0bc1a3e1ebfc44a36a184b5c82')
version('3.1.7', sha256='9ba535df292727ac1e8025bdf2dc42942715205cad8319d925723fd88709e8d6') version('3.1.7', sha256='9ba535df292727ac1e8025bdf2dc42942715205cad8319d925723fd88709e8d6')
@ -33,11 +34,26 @@ class DarshanRuntime(Package):
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
depends_on('zlib') depends_on('zlib')
depends_on('hdf5', when='+hdf5')
depends_on('papi', when='+apxc')
variant('slurm', default=False, description='Use Slurm Job ID') variant('slurm', default=False, description='Use Slurm Job ID')
variant('cobalt', default=False, description='Use Coblat Job Id') variant('cobalt', default=False, description='Use Coblat Job Id')
variant('pbs', default=False, description='Use PBS Job Id') variant('pbs', default=False, description='Use PBS Job Id')
variant('mpi', default=True, description='Compile with MPI support') variant('mpi', default=True, description='Compile with MPI support')
variant('hdf5', default=False, description='Compile with HDF5 module')
variant('apmpi', default=False, description='Compile with AutoPerf MPI module')
variant('apmpi_sync', default=False, description='Compile with AutoPerf MPI module (with collective synchronization timing)')
variant('apxc', default=False, description='Compile with AutoPerf XC module')
conflicts('+hdf5', when='@:3.1.8',
msg='+hdf5 variant only available starting from version 3.2.0')
conflicts('+apmpi', when='@:3.2.1',
msg='+apmpi variant only available starting from version 3.3.0')
conflicts('+apmpi_sync', when='@:3.2.1',
msg='+apmpi variant only available starting from version 3.3.0')
conflicts('+apxc', when='@:3.2.1',
msg='+apxc variant only available starting from version 3.3.0')
def install(self, spec, prefix): def install(self, spec, prefix):
@ -55,6 +71,18 @@ def install(self, spec, prefix):
options = ['CC=%s' % spec['mpi'].mpicc] options = ['CC=%s' % spec['mpi'].mpicc]
else: else:
options = ['--without-mpi'] options = ['--without-mpi']
if '+hdf5' in spec:
options.extend(['--enable-hdf5-mod=%s' % spec['hdf5'].prefix])
if '+apmpi' in spec:
options.extend(['--enable-apmpi-mod'])
if '+apmpi_sync' in spec:
options.extend(['--enable-apmpi-mod',
'--enable-apmpi-coll-sync'])
if '+apxc' in spec:
options.extend(['--enable-apxc-mod'])
options.extend(['--with-mem-align=8', options.extend(['--with-mem-align=8',
'--with-log-path-by-env=DARSHAN_LOG_DIR_PATH', '--with-log-path-by-env=DARSHAN_LOG_DIR_PATH',
'--with-jobid-env=%s' % job_id, '--with-jobid-env=%s' % job_id,

17
var/spack/repos/builtin/packages/darshan-util/package.py
View File

@ -18,10 +18,11 @@ class DarshanUtil(Package):
maintainers = ['shanedsnyder', 'carns'] maintainers = ['shanedsnyder', 'carns']
version('develop', branch='master') version('master', branch='master', submodules='True')
version('3.3.0', sha256='2e8bccf28acfa9f9394f2084ec18122c66e45d966087fa2e533928e824fcb57a', preferred=True)
version('3.3.0-pre2', sha256='0fc09f86f935132b7b05df981b05cdb3796a1ea02c7acd1905323691df65e761') version('3.3.0-pre2', sha256='0fc09f86f935132b7b05df981b05cdb3796a1ea02c7acd1905323691df65e761')
version('3.3.0-pre1', sha256='1c655359455b5122921091bab9961491be58a5f0158f073d09fe8cc772bd0812') version('3.3.0-pre1', sha256='1c655359455b5122921091bab9961491be58a5f0158f073d09fe8cc772bd0812')
version('3.2.1', sha256='d63048b7a3d1c4de939875943e3e7a2468a9034fcb68585edbc87f57f622e7f7', preferred=True) version('3.2.1', sha256='d63048b7a3d1c4de939875943e3e7a2468a9034fcb68585edbc87f57f622e7f7')
version('3.2.0', sha256='4035435bdc0fa2a678247fbf8d5a31dfeb3a133baf06577786b1fe8d00a31b7e') version('3.2.0', sha256='4035435bdc0fa2a678247fbf8d5a31dfeb3a133baf06577786b1fe8d00a31b7e')
version('3.1.8', sha256='3ed51c8d5d93b4a8cbb7d53d13052140a9dffe0bc1a3e1ebfc44a36a184b5c82') version('3.1.8', sha256='3ed51c8d5d93b4a8cbb7d53d13052140a9dffe0bc1a3e1ebfc44a36a184b5c82')
version('3.1.7', sha256='9ba535df292727ac1e8025bdf2dc42942715205cad8319d925723fd88709e8d6') version('3.1.7', sha256='9ba535df292727ac1e8025bdf2dc42942715205cad8319d925723fd88709e8d6')
@ -31,12 +32,19 @@ class DarshanUtil(Package):
variant('bzip2', default=False, description="Enable bzip2 compression") variant('bzip2', default=False, description="Enable bzip2 compression")
variant('shared', default=True, description='Build shared libraries') variant('shared', default=True, description='Build shared libraries')
variant('apmpi', default=False, description='Compile with AutoPerf MPI module support')
variant('apxc', default=False, description='Compile with AutoPerf XC module support')
depends_on('zlib') depends_on('zlib')
depends_on('bzip2', when="+bzip2", type=("build", "link", "run")) depends_on('bzip2', when="+bzip2", type=("build", "link", "run"))
patch('retvoid.patch', when='@3.2.0:3.2.1') patch('retvoid.patch', when='@3.2.0:3.2.1')
conflicts('+apmpi', when='@:3.2.1',
msg='+apmpi variant only available starting from version 3.3.0')
conflicts('+apxc', when='@:3.2.1',
msg='+apxc variant only available starting from version 3.3.0')
def install(self, spec, prefix): def install(self, spec, prefix):
options = ['CC=%s' % self.compiler.cc, options = ['CC=%s' % self.compiler.cc,
@ -44,6 +52,11 @@ def install(self, spec, prefix):
if '+shared' in spec: if '+shared' in spec:
options.extend(['--enable-shared']) options.extend(['--enable-shared'])
if '+apmpi' in spec:
options.extend(['--enable-autoperf-apmpi'])
if '+apxc' in spec:
options.extend(['--enable-autoperf-apxc'])
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):
configure = Executable('../darshan-util/configure') configure = Executable('../darshan-util/configure')
configure('--prefix=%s' % prefix, *options) configure('--prefix=%s' % prefix, *options)