adios2: add 2.2.0 (#8871)
This also enables the bzip2 and zfp variants. The sz variant is currently broken.
This commit is contained in:
		 Michael Kuhn
					Michael Kuhn
				
			
				
					committed by
					
						 Adam J. Stewart
						Adam J. Stewart
					
				
			
			
				
	
			
			
			 Adam J. Stewart
						Adam J. Stewart
					
				
			
						parent
						
							03dc78a894
						
					
				
				
					commit
					4a6a19be85
				
			| @@ -35,6 +35,7 @@ class Adios2(CMakePackage): | |||||||
|     maintainers = ['ax3l'] |     maintainers = ['ax3l'] | ||||||
|  |  | ||||||
|     version('develop', branch='master') |     version('develop', branch='master') | ||||||
|  |     version('2.2.0', sha256='77058ea2ff7224dc02ea519733de42d89112cf21ffe7474fb2fa3c5696152948') | ||||||
|     version('2.1.0', '431fa5b015349f1838b96b8f5a1cc8f8') |     version('2.1.0', '431fa5b015349f1838b96b8f5a1cc8f8') | ||||||
|     version('2.0.0', 'da39655b51745d2c5f3f1e46c5abc4d7') |     version('2.0.0', 'da39655b51745d2c5f3f1e46c5abc4d7') | ||||||
|  |  | ||||||
| @@ -42,11 +43,14 @@ class Adios2(CMakePackage): | |||||||
|             description='Also build shared libraries') |             description='Also build shared libraries') | ||||||
|     variant('mpi', default=True, |     variant('mpi', default=True, | ||||||
|             description='Enable MPI') |             description='Enable MPI') | ||||||
|     # transforms (not yet implemented) |     # transforms | ||||||
|     # variant('bzip2', default=True, |     variant('bzip2', default=True, | ||||||
|     #         description='Enable BZip2 compression') |             description='Enable BZip2 compression') | ||||||
|     # variant('zfp', default=True, |     variant('zfp', default=True, | ||||||
|     #         description='Enable ZFP compression') |             description='Enable ZFP compression') | ||||||
|  |     # sz is broken in 2.2.0: https://github.com/ornladios/ADIOS2/issues/705 | ||||||
|  |     # variant('sz', default=True, | ||||||
|  |     #         description='Enable SZ compression') | ||||||
|     # transport engines |     # transport engines | ||||||
|     variant('dataman', default=True, |     variant('dataman', default=True, | ||||||
|             description='Enable the DataMan engine for WAN transports') |             description='Enable the DataMan engine for WAN transports') | ||||||
| @@ -72,6 +76,11 @@ class Adios2(CMakePackage): | |||||||
|     conflicts('+dataman', when='~shared') |     conflicts('+dataman', when='~shared') | ||||||
|  |  | ||||||
|     depends_on('cmake@3.5.0:', type='build') |     depends_on('cmake@3.5.0:', type='build') | ||||||
|  |     depends_on('pkgconfig', type='build', when='@2.2.0:') | ||||||
|  |     # The included ffs requires bison and flex but using them makes | ||||||
|  |     # the build fail due to an undefined reference. | ||||||
|  |     # depends_on('bison', type='build', when='@2.2.0:') | ||||||
|  |     # depends_on('flex', when='@2.2.0:') | ||||||
|  |  | ||||||
|     # contained in thirdparty/ |     # contained in thirdparty/ | ||||||
|     # depends_on('googletest') |     # depends_on('googletest') | ||||||
| @@ -90,6 +99,7 @@ class Adios2(CMakePackage): | |||||||
|  |  | ||||||
|     depends_on('bzip2', when='+bzip2') |     depends_on('bzip2', when='+bzip2') | ||||||
|     depends_on('zfp', when='+zfp') |     depends_on('zfp', when='+zfp') | ||||||
|  |     # depends_on('sz@:1.4.12', when='+sz') | ||||||
|  |  | ||||||
|     extends('python', when='+python') |     extends('python', when='+python') | ||||||
|     depends_on('python@2.7:', type=('build', 'run'), when='+python') |     depends_on('python@2.7:', type=('build', 'run'), when='+python') | ||||||
| @@ -109,6 +119,8 @@ def cmake_args(self): | |||||||
|                 'ON' if '+bzip2' in spec else 'OFF'), |                 'ON' if '+bzip2' in spec else 'OFF'), | ||||||
|             '-DADIOS2_USE_ZFP={0}'.format( |             '-DADIOS2_USE_ZFP={0}'.format( | ||||||
|                 'ON' if '+zfp' in spec else 'OFF'), |                 'ON' if '+zfp' in spec else 'OFF'), | ||||||
|  |             '-DADIOS2_USE_SZ={0}'.format( | ||||||
|  |                 'ON' if '+sz' in spec else 'OFF'), | ||||||
|             '-DADIOS2_USE_DataMan={0}'.format( |             '-DADIOS2_USE_DataMan={0}'.format( | ||||||
|                 'ON' if '+dataman' in spec else 'OFF'), |                 'ON' if '+dataman' in spec else 'OFF'), | ||||||
|             '-DADIOS2_USE_ZeroMQ={0}'.format( |             '-DADIOS2_USE_ZeroMQ={0}'.format( | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user