Merge 9f1263b into 87672e1

.github/workflows/docs.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
 
       - name: Cache Spack packages
         uses: actions/cache@v2
@@ -42,7 +42,6 @@ jobs:
           sudo apt-get install -y libsdl2-dev
           sudo apt-get install -y graphviz
           sudo apt-get install -y --no-install-recommends doxygen
-          sudo apt-get install -y libgoogle-glog-dev
 
       - name: Build And Install Dependencies
         if: steps.spack-cache.outputs.cache-hit != 'true'

.github/workflows/main.yml

@@ -32,17 +32,27 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
 
       - name: Run cpplint
         run: pip install cpplint==1.5.4 && bash ci/lint.sh `pwd`
 
       - name: Cache Spack packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: spack-cache
         with:
-          path: ~/${{ env.LOCAL }}
-          key: ${{ runner.os }}-${{ hashFiles('ci/**') }}
+          path: |
+            ~/spack
+            ~/.spack
+          key: ${{ runner.os }}-${{ hashFiles('ci/install_deps.sh') }}
+
+      - name: Cache Hermes
+        uses: actions/cache@v3
+        id: hermes-cache
+        with:
+          path: |
+            ~/build
+          key: ${{ runner.os }}-${{ hashFiles('wrapper', 'traits', 'test', 'src', 'hermes_shm', 'benchmarks', 'adapter') }}
 
       - name: Install APT Dependencies
         run: |
@@ -55,13 +65,18 @@ jobs:
           sudo apt-get install -y lcov
           sudo apt-get install -y zlib1g-dev
           sudo apt-get install -y libsdl2-dev
+          sudo apt-get install -y hdf5-tools
 
       - name: Build And Install Dependencies
         if: steps.spack-cache.outputs.cache-hit != 'true'
         run: ci/install_deps.sh
 
-      - name: Build and Test
-        run: ci/install_hermes.sh
+      - name: Build
+        if: steps.hermes-cache.outputs.cache-hit != 'true'
+        run: ci/build_hermes.sh
+
+      - name: Test
+        run: cd build && ctest -VV
 
       - name: Install
         run: pushd build && make install && popd
@@ -71,8 +86,8 @@ jobs:
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled && (failure() || !failure()) }}
 
-      - name: Multi-node Test
-        run: pushd ci/cluster && ./multi_node_ci_test.sh
+#      - name: Multi-node Test
+#        run: pushd ci/cluster && ./multi_node_ci_test.sh
 
       - name: Generate coverage file
         run: |

.gitignore

@@ -1,10 +1,14 @@
 build/
 benchmarks/HermesVFD
 
+hermes_shm/.git*
+
 GPATH
 GRTAGS
 GTAGS
 
+/compiler_data
+
 .gdb_history
 
 /cmake-build-*
@@ -15,3 +19,5 @@ __pycache__/
 /src/adapter/posix/cmake-build-debug-system/CMakeFiles/clion-log.txt
 /adapter/test/posix/Testing/Temporary/LastTest.log
 /.cache/
+
+Testing

.travis.yml

@@ -63,5 +63,5 @@ install:
   - spack repo add sds-repo
   - spack install mochi-thallium~cereal && spack load -r mochi-thallium~cereal
 
-script: ./ci/install_hermes.sh
+script: ./ci/install_hshm.sh
 

CMake/FindHermes.cmake

@@ -0,0 +1,43 @@
+# Find labstor header and library.
+#
+
+# This module defines the following uncached variables:
+#  Hermes_FOUND, if false, do not try to use labstor.
+#  Hermes_INCLUDE_DIRS, where to find labstor.h.
+#  Hermes_LIBRARIES, the libraries to link against to use the labstor library
+#  Hermes_LIBRARY_DIRS, the directory where the labstor library is found.
+
+find_path(
+  Hermes_INCLUDE_DIR
+        hermes/hermes.h
+)
+
+if( Hermes_INCLUDE_DIR )
+  get_filename_component(Hermes_DIR ${Hermes_INCLUDE_DIR} PATH)
+
+  find_library(
+    Hermes_LIBRARY
+    NAMES hermes
+  )
+
+  if( Hermes_LIBRARY )
+    set(Hermes_LIBRARY_DIR "")
+    get_filename_component(Hermes_LIBRARY_DIRS ${Hermes_LIBRARY} PATH)
+    # Set uncached variables as per standard.
+    set(Hermes_FOUND ON)
+    set(Hermes_INCLUDE_DIRS ${Hermes_INCLUDE_DIR})
+    set(Hermes_LIBRARIES ${Hermes_LIBRARY})
+  endif(Hermes_LIBRARY)
+else(Hermes_INCLUDE_DIR)
+  message(STATUS "FindHermes: Could not find hermes_shm.h")
+endif(Hermes_INCLUDE_DIR)
+
+if(Hermes_FOUND)
+  if(NOT Hermes_FIND_QUIETLY)
+    message(STATUS "FindHermes: Found both hermes_shm.h and libhermes.so")
+  endif(NOT Hermes_FIND_QUIETLY)
+else(Hermes_FOUND)
+  if(Hermes_FIND_REQUIRED)
+    message(STATUS "FindHermes: Could not find hermes_shm.h and/or libhermes.so")
+  endif(Hermes_FIND_REQUIRED)
+endif(Hermes_FOUND)