Hermes 1.1

.github/workflows/main.yml

@@ -52,7 +52,7 @@ jobs:
         with:
           path: |
             ~/build
-          key: ${{ runner.os }}-${{ hashFiles('wrapper', 'traits', 'test', 'src', 'hermes_shm', 'benchmarks', 'adapter') }}
+          key: ${{ runner.os }}-${{ hashFiles('wrapper', 'test', 'tasks', 'src', 'include', 'hrun', 'hermes_adapters', 'benchmark') }}
 
       - name: Install APT Dependencies
         run: |
@@ -71,9 +71,9 @@ jobs:
         if: steps.spack-cache.outputs.cache-hit != 'true'
         run: ci/install_deps.sh
 
-      - name: Build
-        if: steps.hermes-cache.outputs.cache-hit != 'true'
-        run: ci/build_hermes.sh
+#      - name: Build
+#        if: steps.hermes-cache.outputs.cache-hit != 'true'
+#        run: ci/build_hermes.sh
 #
 #      - name: Test
 #        run: bash ci/test_hermes.sh

.gitignore

@@ -1,3 +1,17 @@
+cmake*
+.idea
+*.cmd
+*.symvers
+*.cmd
+*.mod
+*.mod.c
+*.ko
+*.order
+*.o
+*.o.cmd
+*.o.d
+build
+
 build/
 benchmarks/HermesVFD
 
@@ -15,8 +29,8 @@ cmake-build-*
 .idea
 .clang-format
 __pycache__/
-/src/adapter/posix/cmake-build-debug-system/CMakeFiles/clion-log.txt
-/adapter/test/posix/Testing/Temporary/LastTest.log
+/hrun/src/hermes_adapters/posix/cmake-build-debug-system/CMakeFiles/clion-log.txt
+/hermes_adapters/test/posix/Testing/Temporary/LastTest.log
 .cache
 
 wrapper/java/out
@@ -25,7 +39,7 @@ Testing
 
 .gradle
 **/build/
-!src/**/build/
+!hrun/src/**/build/
 
 # Ignore Gradle GUI config
 gradle-app.setting

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/pybind11"]
+	path = external/pybind11
+	url = https://github.com/pybind/pybind11.git

CMake/HermesConfig.cmake

@@ -1,96 +1,103 @@
-# Find hermes header and library.
+# Find Hermes header and library.
 #
 
 # This module defines the following uncached variables:
-#  Hermes_FOUND, if false, do not try to use hermes.
-#  Hermes_INCLUDE_DIRS, where to find hermes.h.
-#  Hermes_LIBRARIES, the libraries to link against to use the hermes library
-#  Hermes_LIBRARY_DIRS, the directory where the hermes library is found.
+#  Hermes_FOUND, if false, do not try to use Hermes.
+#  Hermes_INCLUDE_DIRS, where to find Hermes.h.
+#  Hermes_LIBRARIES, the libraries to link against to use the Hermes library
+#  Hermes_LIBRARY_DIRS, the directory where the Hermes library is found.
 
-#-----------------------------------------------------------------------------
-# Version Strings
-#-----------------------------------------------------------------------------
-set(HERMES_VERSION_STRING  @HERMES_PACKAGE_VERSION@)
-set(HERMES_VERSION_MAJOR   @HERMES_VERSION_MAJOR@)
-set(HERMES_VERSION_MINOR   @HERMES_VERSION_MINOR@)
-set(HERMES_VERSION_PATCH   @HERMES_VERSION_PATCH@)
+find_path(
+  Hermes_INCLUDE_DIR
+        hermes/hermes_types.h
+)
+message("Hermes_INCLUDE_DIR: ${Hermes_INCLUDE_DIR}")
 
-#-----------------------------------------------------------------------------
-# C++ Version
-#-----------------------------------------------------------------------------
-set(CMAKE_CXX_STANDARD 17)
+if( Hermes_INCLUDE_DIR )
+  get_filename_component(Hermes_DIR ${Hermes_INCLUDE_DIR} PATH)
 
-#-----------------------------------------------------------------------------
-# Find hermes.h
-#-----------------------------------------------------------------------------
-find_path(Hermes_INCLUDE_DIR hermes.h)
-if (NOT Hermes_INCLUDE_DIR)
-    set(Hermes_FOUND OFF)
-    message(SEND_ERROR "FindHermes: Could not find hermes.h")
-else()
-    #-----------------------------------------------------------------------------
-    # Find hermes install dir and hermes.so
-    #-----------------------------------------------------------------------------
-    get_filename_component(Hermes_DIR ${Hermes_INCLUDE_DIR} PATH)
-    find_library(
-            Hermes_LIBRARY
-            NAMES hermes
-    )
+  #-----------------------------------------------------------------------------
+  # Find all packages needed by Hermes
+  #-----------------------------------------------------------------------------
+  find_library(
+    Hermes_LIBRARY
+    NAMES hrun_client hrun_server
+  )
 
-    #-----------------------------------------------------------------------------
-    # Mark hermes as found
-    #-----------------------------------------------------------------------------
-    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)
+  message("Hermes_LIBRARY: ${Hermes_LIBRARY}")
 
-    #-----------------------------------------------------------------------------
-    # Find all packages needed by hermes
-    #-----------------------------------------------------------------------------
-    # thallium
-    if(@HERMES_RPC_THALLIUM@)
-        find_package(thallium CONFIG REQUIRED)
-        if(thallium_FOUND)
-            message(STATUS "found thallium at ${thallium_DIR}")
-        endif()
-    endif()
+  # HermesShm
+  find_package(HermesShm CONFIG REQUIRED)
+  message(STATUS "found hermes_shm.h at ${HermesShm_INCLUDE_DIRS}")
 
-    #YAML-CPP
-    find_package(yaml-cpp REQUIRED)
-    if(yaml-cpp_FOUND)
-        message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
-    endif()
+  # YAML-CPP
+  find_package(yaml-cpp REQUIRED)
+  message(STATUS "found yaml-cpp at ${yaml-cpp_DIR}")
 
-    #Cereal
-    find_package(cereal REQUIRED)
-    if(cereal)
-        message(STATUS "found cereal")
-    endif()
+  # Catch2
+  find_package(Catch2 3.0.1 REQUIRED)
+  message(STATUS "found catch2.h at ${Catch2_CXX_INCLUDE_DIRS}")
 
-    #if(HERMES_COMMUNICATION_MPI)
+  # MPICH
+  if(BUILD_MPI_TESTS)
     find_package(MPI REQUIRED COMPONENTS C CXX)
     message(STATUS "found mpi.h at ${MPI_CXX_INCLUDE_DIRS}")
-    #endif()
+  endif()
 
-    # librt
-    if(NOT APPLE)
-        find_library(LIBRT rt)
-        if(NOT LIBRT)
-            message(FATAL_ERROR "librt is required for POSIX shared memory")
-        endif()
-    endif()
+  # OpenMP
+  if(BUILD_OpenMP_TESTS)
+    find_package(OpenMP REQUIRED COMPONENTS C CXX)
+    message(STATUS "found omp.h at ${OpenMP_CXX_INCLUDE_DIRS}")
+  endif()
 
-    #-----------------------------------------------------------------------------
-    # Set all packages needed by hermes
-    #-----------------------------------------------------------------------------
+  # Cereal
+  find_package(cereal REQUIRED)
+  if(cereal)
+    message(STATUS "found cereal")
+  endif()
 
-    # Set the Hermes library dependencies
-    set(Hermes_LIBRARIES yaml-cpp thallium
-            MPI::MPI_CXX stdc++fs dl cereal::cereal
-            hermes_shm_data_structures hermes)
-endif()
+  # Boost
+  find_package(Boost REQUIRED COMPONENTS regex system filesystem fiber REQUIRED)
+  if (Boost_FOUND)
+    message(STATUS "found boost at ${Boost_INCLUDE_DIRS}")
+  endif()
+
+  # Thallium
+  find_package(thallium CONFIG REQUIRED)
+  if(thallium_FOUND)
+    message(STATUS "found thallium at ${thallium_DIR}")
+  endif()
+
+  #-----------------------------------------------------------------------------
+  # Mark hermes as found and set all needed packages
+  #-----------------------------------------------------------------------------
+  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 ${Boost_INCLUDE_DIRS} ${Hermes_INCLUDE_DIR})
+    set(Hermes_LIBRARIES
+            ${HermesShm_LIBRARIES}
+            yaml-cpp
+            cereal::cereal
+            -ldl -lrt -lc -pthread
+            thallium
+            hermes
+            ${Boost_LIBRARIES} ${Hermes_LIBRARY})
+    set(Hermes_CLIENT_LIBRARIES ${Hermes_LIBRARIES})
+  endif(Hermes_LIBRARY)
+
+else(Hermes_INCLUDE_DIR)
+  message(STATUS "FindHermes: Could not find Hermes.h")
+endif(Hermes_INCLUDE_DIR)
+
+if(Hermes_FOUND)
+  if(NOT Hermes_FIND_QUIETLY)
+    message(STATUS "FindHermes: Found both Hermes.h and libhrun_client.so")
+  endif(NOT Hermes_FIND_QUIETLY)
+else(Hermes_FOUND)
+  if(Hermes_FIND_REQUIRED)
+    message(STATUS "FindHermes: Could not find Hermes.h and/or libhrun_client.so")
+  endif(Hermes_FIND_REQUIRED)
+endif(Hermes_FOUND)