Merge pull request #107 from LLNL/release/0.7

Release/0.7

CMakeLists.txt

@@ -17,7 +17,7 @@ endif ()
 # Configuration for building test, benchmark, example, etc.
 # -------------------------------------------------------------------------------- #
 cmake_minimum_required(VERSION 3.10) # gtest_discover_tests requires >= CMake 3.10
-project(Metall VERSION 0.6)
+project(Metall VERSION 0.7)
 configure_file(MetallConfig.h.in MetallConfig.h)
 
 include_directories(${PROJECT_BINARY_DIR})

README.md

@@ -24,7 +24,7 @@ Metall (memory allocator for persistent memory)
 
 ## Required to Build Metall
 
-- GCC 8.1 or more.
+- GCC 8.1 or more (8.3 or more is recommended due to early implementation of the Filesystem library).
 - Boost C++ Libraries 1.64 or more (build is not required; needs only
   their header files).
 

bench/adjacency_list/CMakeLists.txt

@@ -6,13 +6,6 @@ else ()
     MESSAGE(STATUS "OpenMP is not found. Use single thread in adjacency_list.")
 endif ()
 
-#if (USE_NUMA_LIB)
-#    if (${CMAKE_SYSTEM_NAME} MATCHES Linux)
-#        link_libraries(numa)
-#        add_definitions(-DMETALL_USE_NUMA_LIB)
-#    endif()
-#endif()
-
 add_executable(run_adj_list_bench_stl run_adj_list_bench_stl.cpp)
 add_executable(run_adj_list_bench_bip run_adj_list_bench_bip.cpp)
 add_executable(run_adj_list_bench_bip_extend run_adj_list_bench_bip_extend.cpp)
@@ -32,32 +25,5 @@ if (MEMKIND_ROOT)
     add_executable(run_adj_list_bench_pmem run_adj_list_bench_pmem)
 endif()
 
-# Experimental version
-#if (JEMALLOC_ROOT)
-#    # set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-#
-#    add_executable(run_adj_list_bench_metall_jemalloc run_adj_list_bench_metall_jemalloc.cpp)
-#
-#    # Include jemalloc headers
-#    execute_process(COMMAND ${JEMALLOC_ROOT}/bin/jemalloc-config --includedir
-#            OUTPUT_VARIABLE JEMALLOC_INCLUDEDIR)
-#    string(STRIP ${JEMALLOC_INCLUDEDIR} JEMALLOC_INCLUDEDIR) # Remove the newline at the end
-#    target_include_directories(run_adj_list_bench_metall_jemalloc PUBLIC "${JEMALLOC_INCLUDEDIR}")
-#
-#    # Link to jemalloc library
-#    execute_process(COMMAND ${JEMALLOC_ROOT}/bin/jemalloc-config --libdir
-#            OUTPUT_VARIABLE JEMALLOC_LIBDIR)
-#    string(STRIP ${JEMALLOC_LIBDIR} JEMALLOC_LIBDIR) # Remove the newline at the end
-#    target_link_directories(run_adj_list_bench_metall_jemalloc PUBLIC "${JEMALLOC_LIBDIR}")
-#    target_link_libraries(run_adj_list_bench_metall_jemalloc -ljemalloc)
-#
-#    # Libraries required by jemalloc
-#    execute_process(COMMAND ${JEMALLOC_ROOT}/bin/jemalloc-config --libs
-#            OUTPUT_VARIABLE JEMALLOC_LIBS)
-#    string(STRIP ${JEMALLOC_LIBS} JEMALLOC_LIBS) # Remove the newline at the end
-#    target_compile_options(run_adj_list_bench_metall_jemalloc PUBLIC "${JEMALLOC_LIBS}")
-#endif ()
-
-
 add_subdirectory(edge_generator)
 add_subdirectory(test)

docs/Doxyfile.in

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Metall"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v0.6
+PROJECT_NUMBER         = v0.7
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

docs/readthedocs/getting_started/build_and_install.md

@@ -37,7 +37,7 @@ g++ -std=c++17 your_program.cpp -lstdc++fs
 
 ## Required to Build Metall
 
-- GCC 8.1 or more.
+- GCC 8.1 or more (8.3 or more is recommended due to early implementation of the Filesystem library).
 - Boost C++ Libraries 1.64 or more (build is not required; needs only
   their header files).
 

example/CMakeLists.txt

@@ -27,14 +27,6 @@ add_executable(static_mutex static_mutex)
 
 add_executable(concurrent_map concurrent_map)
 
-if (USE_NUMA_LIB)
-    if (${CMAKE_SYSTEM_NAME} MATCHES Linux)
-        link_libraries(numa)
-        add_definitions(-DMETALL_USE_NUMA_LIB)
-    endif()
-endif()
-add_executable(custom_kernel_allocator custom_kernel_allocator)
-
 if (BUILD_C)
     add_executable(c_api c_api.c)
     target_link_libraries(c_api metall_c)