Use HSM instead of HERMES for data structure stuff

lukemartinlogan · Jan 13, 2025 · 5e02460 · 5e02460
1 parent 27b4d54
commit 5e02460
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,8 +4,8 @@ project(hermes)
 #-----------------------------------------------------------------------------
 # Define Constants
 #-----------------------------------------------------------------------------
-set(HERMES_VERSION_MAJOR 1)
-set(HERMES_VERSION_MINOR 3)
+set(HERMES_VERSION_MAJOR 2)
+set(HERMES_VERSION_MINOR 0)
 set(HERMES_VERSION_PATCH 0)
 
 #-----------------------------------------------------------------------------
@@ -30,6 +30,9 @@ option(HERMES_ENABLE_ADIOS "Build the Hermes Python wrapper" OFF)
 option(HERMES_MPICH "Specify that this a MPICH build" OFF)
 option(HERMES_OPENMPI "Specify that this a OpenMPI build" OFF)
 
+option(HERMES_ENABLE_CUDA "Enable CUDA support" OFF)
+option(HERMES_ENABLE_ROCM "Enable ROCm support" OFF)
+
 # A hack for spack to get dependencies
 option(HERMES_NO_COMPILE "Don't compile the code" OFF)
 if (HERMES_NO_COMPILE)
@@ -114,10 +117,20 @@ add_custom_target(coverage COMMAND bash ${CMAKE_SOURCE_DIR}/ci/coverage.sh
 # Find Packages
 #-----------------------------------------------------------------------------
 
+# Include most packages needed by both client and host
 include(CMake/HermesCommonConfig.cmake)
 set(Hermes_CLIENT_DEPS hermes_client)
 set(Hermes_RUNTIME_DEPS hermes_runtime)
 
+# ENABLE GPU SUPPORT
+if (CHIMAERA_ENABLE_CUDA)
+    hshm_enable_cuda(17)
+endif()
+if (CHIMAERA_ENABLE_ROCM)
+    hshm_enable_rocm("HIP" 17)
+endif()
+
+
 # Zeromq
 #pkg_check_modules(ZMQ REQUIRED libzmq)
 #include_directories(${ZMQ_INCLUDE_DIRS})

diff --git a/hermes_adapters/posix/posix_fs_api.h b/hermes_adapters/posix/posix_fs_api.h
@@ -40,8 +40,8 @@ class PosixFs : public hermes::adapter::Filesystem {
       buf->st_ino = 0;*/
       buf->st_mode = 0100644;
       /*buf->st_nlink = 1;*/
-      buf->st_uid = HERMES_SYSTEM_INFO->uid_;
-      buf->st_gid = HERMES_SYSTEM_INFO->gid_;
+      buf->st_uid = HSHM_SYSTEM_INFO->uid_;
+      buf->st_gid = HSHM_SYSTEM_INFO->gid_;
       // buf->st_rdev = 0;
       buf->st_size = GetSize(f, astat);
       /*buf->st_blksize = 0;

diff --git a/test/unit/hermes_adapters/posix/CMakeLists.txt b/test/unit/hermes_adapters/posix/CMakeLists.txt
@@ -72,7 +72,7 @@ target_link_libraries(hermes_posix_simple_io_omp
 
 add_executable(posix_simple_io_omp posix_simple_io_omp.cc)
 target_link_libraries(posix_simple_io_omp
-        HermesShm::cxx Catch2::Catch2 OpenMP::OpenMP_CXX)
+        hshm::cxx Catch2::Catch2 OpenMP::OpenMP_CXX)
 
 jarvis_test(posix test_posix_simple_io_omp)
 jarvis_test(posix test_hermes_posix_simple_io_omp)