NotificationsYou must be signed in to change notification settings
Fork14
Star55

Commit1f6c027

authored

Merge pull request#321 from LLNL/release/v0.28

Release/v0.28

2 parentsd40ae14 +e5a07ce commit1f6c027Copy full SHA for 1f6c027

File tree

74 files changed

+4079

-2330

lines changed

CMakeLists.txt
bench
- bfs
  - run_bfs_bench_metall.cpp
  - run_bfs_bench_metall_multiple.cpp
- simple_alloc
  - run_simple_allocation_bench_metall.cpp
cmake
docs
- Doxyfile.in
- readthedocs/basics
  - getting_started.md
example
include/metall
src
test
tutorial
- hands_on
  - README.md
- nvmw21
  - CMakeLists.txt
  - README.md
verification
- CMakeLists.txt
- logger
  - verify_logger.cpp
- soft_dirty
  - verify_soft_dirty.cpp
- sparse_copy

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+4079

-2330

lines changed

`‎CMakeLists.txt`

Lines changed: 60 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,19 @@ include(FetchContent)`
`5`	`5`	`# -------------------------------------------------------------------------------- #`
`6`	`6`	`# CMake policy`
`7`	`7`	`# -------------------------------------------------------------------------------- #`
`8`		`-if(${CMAKE_VERSION}VERSION_GREATER_EQUAL"3.13")`
	`8`	`+if(${CMAKE_VERSION}VERSION_GREATER_EQUAL"3.13")`
`9`	`9`	`cmake_policy(SETCMP0077NEW)`
`10`		`-endif()`
	`10`	`+endif()`
`11`	`11`
`12`		`-if(${CMAKE_VERSION}VERSION_GREATER_EQUAL"3.24")`
	`12`	`+if(${CMAKE_VERSION}VERSION_GREATER_EQUAL"3.24")`
`13`	`13`	`cmake_policy(SETCMP0135NEW)`
`14`		`-endif()`
	`14`	`+endif()`
`15`	`15`
`16`	`16`	`# -------------------------------------------------------------------------------- #`
`17`	`17`	`# Metall general configuration`
`18`	`18`	`# -------------------------------------------------------------------------------- #`
`19`	`19`	`project(Metall`
`20`		`-VERSION0.27`
	`20`	`+VERSION0.28`
`21`	`21`	`DESCRIPTION"A persistent memory allocator for data-centric analytics"`
`22`	`22`	`HOMEPAGE_URL"https://github.com/LLNL/metall")`
`23`	`23`
`@@ -92,6 +92,7 @@ set(COMPILER_DEFS "" CACHE STRING "A list of Metall compile definitions to be ad`
`92`	`92`
`93`	`93`	`# ---------- Experimental options ---------- #`
`94`	`94`	`set(UMAP_ROOT""CACHEPATH"UMap installed root directory")`
	`95`	`+set(PRIVATEER_ROOT""CACHEPATH"Privateer installed root directory")`
`95`	`96`
`96`	`97`	`option(ONLY_DOWNLOAD_GTEST"Only downloading Google Test"OFF)`
`97`	`98`	`option(SKIP_DOWNLOAD_GTEST"Skip downloading Google Test"OFF)`
`@@ -113,11 +114,11 @@ endif ()`
`113`	`114`	`# -------------------------------------------------------------------------------- #`
`114`	`115`	`if (INSTALL_HEADER_ONLY)`
`115`	`116`	`message(WARNING"INSTALL_HEADER_ONLY option has been replaced with JUST_INSTALL_METALL_HEADER.")`
`116`		`-endif()`
	`117`	`+endif()`
`117`	`118`
`118`	`119`	`if (JUST_INSTALL_METALL_HEADER)`
`119`	`120`	`return()`
`120`		`-endif()`
	`121`	`+endif()`
`121`	`122`	`# -------------------------------------------------------------------------------- #`
`122`	`123`
`123`	`124`	`# -------------------------------------------------------------------------------- #`
`@@ -138,7 +139,7 @@ endif ()`
`138`	`139`	`# -------------------------------------------------------------------------------- #`
`139`	`140`
`140`	`141`	`# -------------------------------------------------------------------------------- #`
`141`		`-#Executables`
	`142`	`+#Set up for building executables`
`142`	`143`	`# -------------------------------------------------------------------------------- #`
`143`	`144`
`144`	`145`	`# Requirements for GCC`
`@@ -151,9 +152,9 @@ if (NOT RUN_BUILD_AND_TEST_WITH_CI)`
`151`	`152`	`endif ()`
`152`	`153`
`153`	`154`	`# ---------- Metall Macros ---------- #`
`154`		`-foreach(X${COMPILER_DEFS})`
	`155`	`+foreach(X${COMPILER_DEFS})`
`155`	`156`	`message(STATUS"Metall compile definition:${X}")`
`156`		`-endforeach()`
	`157`	`+endforeach()`
`157`	`158`
`158`	`159`
`159`	`160`	`# ---------- CMAKE_BUILD_TYPE ---------- #`
`@@ -168,12 +169,8 @@ find_package(Threads REQUIRED)`
`168`	`169`
`169`	`170`
`170`	`171`	`# ---------- filesystem ---------- #`
`171`		`-include(include_cxx_filesystem_library)`
`172`		`-include_cxx_filesystem_library()`
`173`		`-`
`174`		`-# Xcode 11 Beta Release Notes`
`175`		`-# Clang now supports the C++17 <filesystem> library for iOS 13, macOS 10.15, watchOS 6, and tvOS 13. (50988273)`
`176`		`-# https://developer.apple.com/documentation/xcode_release_notes/xcode_11_beta_release_notes?language=objc`
	`172`	`+include(check_cxx_filesystem_library)`
	`173`	`+check_cxx_filesystem_library()`
`177`	`174`
`178`	`175`
`179`	`176`	`# ---------- UMap ---------- #`
`@@ -183,6 +180,11 @@ if (UMAP_ROOT)`
`183`	`180`	`endif ()`
`184`	`181`	`endif ()`
`185`	`182`
	`183`	`+# ---------- Privateer ---------- #`
	`184`	`+if (PRIVATEER_ROOT)`
	`185`	`+message(STATUS"Privateer Root is:${PRIVATEER_ROOT}")`
	`186`	`+find_library(LIBPRIVATEERNAMESprivateerPATHS${PRIVATEER_ROOT}/lib)`
	`187`	`+endif ()`
`186`	`188`
`187`	`189`	`# ---------- Boost ---------- #`
`188`	`190`	`# Disable the boost-cmake feature (BoostConfig.cmake or boost-config.cmake) since`
`@@ -192,7 +194,7 @@ set(Boost_NO_BOOST_CMAKE ON)`
`192`	`194`	`find_package(Boost1.64QUIET)`
`193`	`195`	`if (NOTBoost_FOUND)`
`194`	`196`	`FetchContent_Declare(Boost`
`195`		`-URLhttps://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2)`
	`197`	`+URLhttps://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.bz2)`
`196`	`198`	`FetchContent_GetProperties(Boost)`
`197`	`199`	`if (NOTBoost_POPULATED)`
`198`	`200`	`FetchContent_Populate(Boost)`
`@@ -212,7 +214,7 @@ function(add_common_compile_options name)`
`212`	`214`	`target_compile_options(${name}PRIVATE$<$<CONFIG:Debug>:-Og>)`
`213`	`215`	`target_compile_options(${name}PRIVATE$<$<CONFIG:Debug>:-g3>)`
`214`	`216`	`target_compile_options(${name}PRIVATE$<$<CONFIG:Debug>:-Wextra>)`
`215`		`- if (Linux)`
	`217`	`+ if (CMAKE_SYSTEM_NAMESTREQUAL"Linux")`
`216`	`218`	`target_compile_options(${name}PRIVATE$<$<CONFIG:Debug>:-pg>)`
`217`	`219`	`endif ()`
`218`	`220`
`@@ -223,7 +225,7 @@ function(add_common_compile_options name)`
`223`	`225`	`# Release with debug info`
`224`	`226`	`target_compile_options(${name}PRIVATE$<$<CONFIG:RelWithDebInfo>:-Ofast>)`
`225`	`227`	`target_compile_options(${name}PRIVATE$<$<CONFIG:RelWithDebInfo>:-g3>)`
`226`		`- if (Linux)`
	`228`	`+ if (CMAKE_SYSTEM_NAMESTREQUAL"Linux")`
`227`	`229`	`target_compile_options(${name}PRIVATE$<$<CONFIG:RelWithDebInfo>:-pg>)`
`228`	`230`	`endif ()`
`229`	`231`	`endfunction()`
`@@ -246,20 +248,18 @@ function(common_setup_for_metall_executable name)`
`246`	`248`	`# --------------------`
`247`	`249`
`248`	`250`	`# ----- Compile Definitions ----- #`
`249`		`- foreach(X${COMPILER_DEFS})`
`250`		`-target_compile_definitions(${name}PRIVATE${X})`
`251`		`- endforeach()`
	`251`	`+ foreach(X${COMPILER_DEFS})`
	`252`	`+target_compile_definitions(${name}PRIVATE${X})`
	`253`	`+ endforeach()`
`252`	`254`	`# --------------------`
`253`	`255`
`254`	`256`	`# ----- CXX17 Filesystem Lib----- #`
`255`		`-#include_cxx_filesystem_library module must be executed first`
`256`		`- if (FOUND_CXX17_FILESYSTEM_LIB)`
`257`		`- if (REQUIRE_LIB_STDCXX_FS)`
	`257`	`+#GNU compilers prior to 9.1 requires linking with stdc++fs`
	`258`	`+ if (("${CMAKE_C_COMPILER_ID}"STREQUAL"GNU")OR("${CMAKE_CXX_COMPILER_ID}"STREQUAL"GNU"))`
	`259`	`+ if (CMAKE_CXX_COMPILER_VERSIONVERSION_LESS9.1)`
`258`	`260`	`target_link_libraries(${name}PRIVATEstdc++fs)`
`259`		`- endif()`
`260`		`- elseif()`
`261`		`-target_compile_definitions(${name}PRIVATE"METALL_DISABLE_CXX17_FILESYSTEM_LIB")`
`262`		`- endif()`
	`261`	`+ endif ()`
	`262`	`+ endif ()`
`263`	`263`	`# --------------------`
`264`	`264`
`265`	`265`	`# ----- Umap----- #`
`@@ -271,6 +271,37 @@ function(common_setup_for_metall_executable name)`
`271`	`271`	`endif ()`
`272`	`272`	`endif ()`
`273`	`273`	`# --------------------`
	`274`	`+`
	`275`	`+# ----- Privateer----- #`
	`276`	`+ if (PRIVATEER_ROOT)`
	`277`	`+target_include_directories(${name}PRIVATE${PRIVATEER_ROOT}/include)`
	`278`	`+ if (LIBPRIVATEER)`
	`279`	`+# 1) Privateer Dependencies`
	`280`	`+FIND_PACKAGE(OpenSSL)`
	`281`	`+ if (OpenSSL_FOUND)`
	`282`	`+target_link_libraries(${name}PRIVATEOpenSSL::SSL)`
	`283`	`+target_link_libraries(${name}PRIVATEOpenSSL::Crypto)`
	`284`	`+ endif ()`
	`285`	`+target_link_libraries(${name}PRIVATErt)`
	`286`	`+FIND_PACKAGE(OpenMPREQUIRED)`
	`287`	`+ if (OpenMP_CXX_FOUND)`
	`288`	`+target_link_libraries(${name}PRIVATEOpenMP::OpenMP_CXX)`
	`289`	`+ else ()`
	`290`	`+message(FATAL_ERROR"OpenMP is required to build Metall with Privateer")`
	`291`	`+ endif ()`
	`292`	`+ if (ZSTD_ROOT)`
	`293`	`+find_library(LIBZSTDNAMESzstdPATHS${ZSTD_ROOT}/lib)`
	`294`	`+target_include_directories(${name}PRIVATE${ZSTD_ROOT}/lib)`
	`295`	`+target_link_libraries(${name}PRIVATE${LIBZSTD})`
	`296`	`+target_compile_definitions(${name}PRIVATEUSE_COMPRESSION)`
	`297`	`+ endif ()`
	`298`	`+`
	`299`	`+# 2) Link Privateer`
	`300`	`+target_link_libraries(${name}PRIVATE${LIBPRIVATEER})`
	`301`	`+target_compile_definitions(${name}PRIVATEMETALL_USE_PRIVATEER)`
	`302`	`+ endif ()`
	`303`	`+ endif ()`
	`304`	`+# --------------------`
`274`	`305`	`endfunction()`
`275`	`306`
`276`	`307`	`function(add_metall_executablenamesource)`

`‎bench/bfs/run_bfs_bench_metall.cpp`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ int main(int argc, char *argv[]) {`
`29`	`29`	`// metall::logger::set_log_level(metall::logger::level::verbose);`
`30`	`30`
`31`	`31`	`metall::managermanager(metall::open_read_only,`
`32`		`- option.graph_file_name_list[0].c_str());`
	`32`	`+ option.graph_file_name_list[0]);`
`33`	`33`	`auto adj_list =`
`34`	`34`	`manager.find<adjacency_list_type>(option.graph_key_name.c_str()).first;`
`35`	`35`

`‎bench/bfs/run_bfs_bench_metall_multiple.cpp`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ int main(int argc, char *argv[]) {`
`33`	`33`	`std::vector<metall::manager *> managers;`
`34`	`34`	`for (constauto &file_name : option.graph_file_name_list) {`
`35`	`35`	`managers.emplace_back(`
`36`		`-newmetall::manager(metall::open_read_only, file_name.c_str()));`
	`36`	`+newmetall::manager(metall::open_read_only, file_name));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`auto adj_list =adjacency_list_type(option.graph_key_name, managers.begin(),`

`‎bench/simple_alloc/run_simple_allocation_bench_metall.cpp`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`intmain(int argc,char *argv[]) {`
`14`	`14`	`constauto option =simple_alloc_bench::parse_option(argc, argv);`
`15`	`15`	`{`
`16`		`- metall::managermanager(metall::create_only, option.datastore_path.c_str());`
	`16`	`+ metall::managermanager(metall::create_only, option.datastore_path);`
`17`	`17`	`simple_alloc_bench::run_bench(option, manager.get_allocator<std::byte>());`
`18`	`18`	`}`
`19`	`19`	`metall::manager::remove(option.datastore_path.c_str());`

`‎cmake/check_cxx_filesystem_library.cmake`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,25 @@`
	`1`	`+# Checks if the C++17 <filesystem> library is available.`
	`2`	`+function(check_cxx_filesystem_library)`
	`3`	`+`
	`4`	`+set(FOUND_CXX17_FILESYSTEM_LIBFALSEPARENT_SCOPE)`
	`5`	`+set(REQUIRE_LIB_STDCXX_FSFALSEPARENT_SCOPE)`
	`6`	`+`
	`7`	`+# Check if C++17 <filesystem> header files are available`
	`8`	`+# If not, uses our own implementation.`
	`9`	`+include(CheckIncludeFileCXX)`
	`10`	`+CHECK_INCLUDE_FILE_CXX(filesystemFOUND_FILESYSTEM_HEADER)`
	`11`	`+ if (NOTFOUND_FILESYSTEM_HEADER)`
	`12`	`+message(FATAL_ERROR"Cannot find the C++17 <filesystem> library.")`
	`13`	`+ endif ()`
	`14`	`+`
	`15`	`+ if (CMAKE_CXX_COMPILER_IDMATCHES"Clang")# Clang or AppleClang`
	`16`	`+ if (${CMAKE_HOST_SYSTEM_NAME}MATCHES"Darwin")# macOS`
	`17`	`+include(get_macos_version)`
	`18`	`+get_macos_version()# Get macOS version`
	`19`	`+message(VERBOSE"Detected macOS version${MACOS_VERSION}")`
	`20`	`+ if (MACOS_VERSIONVERSION_LESS10.15)# macOS < 10.15`
	`21`	`+message(FATAL_ERROR"macOS >= 10.15 is required to use the C++17 <filesystem> library.")`
	`22`	`+ endif ()`
	`23`	`+ endif ()`
	`24`	`+ endif ()`
	`25`	`+endfunction()`

`‎cmake/include_cxx_filesystem_library.cmake`

Lines changed: 0 additions & 40 deletions

This file was deleted.

`‎cmake/setup_mpi.cmake`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if (MPI_CXX_FOUND)`
	`1`	`+if (NOTMPI_CXX_FOUND)`
`2`	`2`	`find_package(MPI)`
`3`	`3`	`endif ()`
`4`	`4`

`‎docs/Doxyfile.in`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ PROJECT_NAME = "Metall"`
`38`	`38`	`# could be handy for archiving the generated documentation or if some version`
`39`	`39`	`# control system is used.`
`40`	`40`
`41`		`-PROJECT_NUMBER = v0.27`
	`41`	`+PROJECT_NUMBER = v0.28`
`42`	`42`
`43`	`43`	`# Using the PROJECT_BRIEF tag one can provide an optional one line description`
`44`	`44`	`# for a project that appears at the top of each page and should give viewer a`

`‎docs/readthedocs/basics/getting_started.md`

Lines changed: 3 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,22 +69,11 @@ g++ -std=c++17 your_program.cpp -lstdc++fs -I${BOOST_ROOT}/include -I${METALL_RO`
`69`	`69`
`70`	`70`	`Clang (or Apple clang) could be used instead of GCC to build Metall.`
`71`	`71`	`However, we haven't tested it intensively.`
	`72`	`+To run on macOS, Metall requires macOS >= 10.15.`
	`73`	`+`
`72`	`74`	`Also, Boost C++ Libraries 1.69 or more may be required`
`73`	`75`	`if one wants to build Metall with Clang + CUDA.`
`74`	`76`
`75`		`-On macOS >= 10.15 or Linux`
`76`		`-`
`77`	`77`	```bash
`78`		`-# Remove "-lstdc++fs" option`
`79`	`78`	`clang++ -std=c++17 [tutorial_program.cpp] -I../../include -I${BOOST_ROOT}`
`80`		-```
`81`		`-`
`82`		`-On macOS < 10.15`
`83`		`-`
`84`		`-The C++17 <filesystem> library is not available on macOS < 10.15.`
`85`		`-One has to stop using C++17 <filesystem> library in Metall.`
`86`		`-If METALL_DISABLE_CXX17_FILESYSTEM_LIB macro is defined, Metall uses its own file system operation implementation.`
`87`		`-`
`88`		-```bash
`89`		`-clang++ -std=c++17 [tutorial_program.cpp] -I../../include -I${BOOST_ROOT} -DMETALL_DISABLE_CXX17_FILESYSTEM_LIB`
`90`		-```
	`79`	+```

`‎example/CMakeLists.txt`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ add_metall_executable(snapshot snapshot.cpp)`
`14`	`14`
`15`	`15`	`add_metall_executable(csr_graphcsr_graph.cpp)`
`16`	`16`
`17`		`-add_metall_executable(fallback_allocator_adaptorfallback_allocator_adaptor.cpp)`
	`17`	`+add_metall_executable(fallback_allocatorfallback_allocator.cpp)`
`18`	`18`
`19`	`19`	`add_metall_executable(datastore_descriptiondatastore_description.cpp)`
`20`	`20`
`@@ -38,6 +38,9 @@ add_metall_executable(logger logger.cpp)`
`38`	`38`
`39`	`39`	`add_metall_executable(concurrentconcurrent.cpp)`
`40`	`40`
	`41`	`+add_metall_executable(custom_loggercustom_logger.cpp)`
	`42`	`+target_compile_definitions(custom_loggerPRIVATEMETALL_LOGGER_EXTERN_C=1)`
	`43`	`+`
`41`	`44`	`if (BUILD_C)`
`42`	`45`	`add_c_executable(c_apic_api.c)`
`43`	`46`	`target_link_libraries(c_apiPRIVATEmetall_c)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1f6c027

File tree

74 files changed

Some content is hidden

74 files changed

`‎CMakeLists.txt`

`‎bench/bfs/run_bfs_bench_metall.cpp`

`‎bench/bfs/run_bfs_bench_metall_multiple.cpp`

`‎bench/simple_alloc/run_simple_allocation_bench_metall.cpp`

`‎cmake/check_cxx_filesystem_library.cmake`

`‎cmake/include_cxx_filesystem_library.cmake`

`‎cmake/setup_mpi.cmake`

`‎docs/Doxyfile.in`

`‎docs/readthedocs/basics/getting_started.md`

`‎example/CMakeLists.txt`

0 commit comments