Make package version names consistent.

.github/workflows/spack-mac.yml

@@ -24,4 +24,4 @@ jobs:
         spack repo add .
         spack repo list
         spack install hdf5-cmake
-        spack install hdf5-hpc-io
+        spack install hdf5-vol-tests+vol-cache

.github/workflows/spack.yml

@@ -25,5 +25,5 @@ jobs:
         spack repo add .
         spack repo list
         spack install hdf5-cmake
-        spack install hdf5-hpc-io
+        spack install hdf5-vol-tests+vol-cache
 

packages/hdf5-vol-async/package.py

@@ -9,16 +9,20 @@ class Hdf5VolAsync(CMakePackage):
     """This package enables asynchronous IO in HDF5."""
 
     homepage = "https://sdm.lbl.gov/"
-    # hpc-io hasn't accepted the pull request for CMakeLists.txt yet.
-    # git      = "https://github.com/hpc-io/vol-async"
-    git      = "https://github.com/hyoklee/vol-async"
+    git      = "https://github.com/hpc-io/vol-async"
     maintainers = ['hyoklee']
 
     version('develop', branch='develop')
+    version('hyoklee.develop',
+            branch='develop',
+            git='https://github.com/hyoklee/vol-async', preferred=True)
+    version('local.develop', branch='develop',
+            git='file:///scr/hyoklee/src/vol-async')
 
     depends_on('argobots@main')
-    # depends_on('hdf5-hpc-io')
-    depends_on('hdf5-cmake')
+    depends_on('hdf5-hpc-io')
+    # Use the following if you want to use HDFGroup/[email protected] instead.
+    # depends_on('[email protected]+mpi+threadsafe')
 
     def cmake_args(self):
         """Populate cmake arguments for HDF5 VOL."""
@@ -27,6 +31,16 @@ def cmake_args(self):
         args = [
             '-DBUILD_SHARED_LIBS:BOOL=ON',
             '-DBUILD_TESTING:BOOL=ON'
+            '-DCMAKE_C_COMPILER=mpicc',
+            '-DCMAKE_CXX_COMPILER=mpicxx',
         ]
 
         return args
+
+
+    def setup_environment(self, spack_env, run_env):
+        spack_env.set('HDF5_PLUGIN_PATH', self.build_directory+'/lib')
+        spack_env.set('HDF5_VOL_CONNECTOR',
+                         'async under_vol=0\;under_info={}')        
+        spack_env.set('LD_PRELOAD', self.spec['argobots'].prefix+'/lib/libabt.so')
+

packages/hdf5-vol-cache/package.py

@@ -14,12 +14,10 @@ class Hdf5VolCache(CMakePackage):
     maintainers = ['hyoklee']
 
     version('default', branch='develop')
-
-    # Set hdf5-cmake package option.
-    o_flt = '~zfp~mafisc~szip~zstd~blosc~bshuf~bitgroom'
-    o_vol = '~av~pv~cv'
-    o_par = '+mpi+threadsafe'
-    o = o_flt+o_vol+o_par
+    version('hyoklee.develop', branch='develop',
+            git='https://github.com/hyoklee/vol-cache.git', preferred=True)
+    version('local.develop', branch='develop',
+            git='file:///home/hyoklee/vol-cache')
 
     depends_on('hdf5-vol-async')
 

packages/hdf5-vol-tests/package.py

@@ -14,21 +14,34 @@ class Hdf5VolTests(CMakePackage):
 
     maintainers = ['hyoklee']
 
-    version('master', preferred=True)
-    variant('vol-async', default=True, description='Enable async VOL')
+    version('master', commit='9a147d3')
+    version('hyoklee.master',
+            git='https://github.com/hyoklee/vol-tests', preferred=True)
+    version('local.master', 
+            git='file:///Users/hyoklee/src/vol-tests')
+    variant('vol-async', default=False, description='Enable async VOL')
     variant('vol-cache', default=False, description='Enable cache VOL')
     variant('vol-external-passthrough', default=False, 
             description='Enable external pass-through VOL')
+    variant('vol-log', default=False, 
+            description='Enable log-based VOL')
+    variant('vol-adios2', default=False, 
+            description='Enable ADIOS2 VOL')
+    variant('vol-rest', default=False, 
+            description='Enable REST VOL')
 
     variant('async', default=True, description='Enable parallel tests.')
     variant('parallel', default=True, description='Enable async API tests.')
     variant('part', default=True, 
             description='Enable building the main test executable.')
-    depends_on('szip', when='+parallel')
+    depends_on('szip')
     depends_on('hdf5-vol-async', when='+vol-async')
     depends_on('hdf5-vol-cache', when='+vol-cache')
     depends_on('hdf5-vol-external-passthrough', 
                when='+vol-external-passthrough')
+    depends_on('hdf5-vol-log', when='+vol-log')
+    depends_on('adios2+shared+hdf5 ^[email protected]', when='+vol-adios2')
+    depends_on('hdf5-vol-rest', when='+vol-rest')    
 
     def cmake_args(self):
         args = []