NotificationsYou must be signed in to change notification settings
Fork14
Star55

Commite98ff94

authored

Merge pull request#284 from LLNL/release/v0.26

Release/v0.26

2 parents9c3e956 +642172b commite98ff94Copy full SHA for e98ff94

File tree

28 files changed

+481

-139

lines changed

.github/workflows
- ci-test.yml
.gitlab-ci.yml
CMakeLists.txt
docs
- Doxyfile.in
example
include/metall
- container
  - experimental/jgraph
    - jgraph.hpp
  - string_key_store.hpp
  - unordered_flat_map.hpp
  - unordered_flat_set.hpp
  - unordered_node_map.hpp
  - unordered_node_set.hpp
- detail
  - hash.hpp
  - utilities.hpp
- json
  - json_fwd.hpp
- kernel/segment_storage
  - mmap_segment_storage.hpp
- metall.hpp
- version.hpp
verification/logger
- CMakeLists.txt
- verify_logger.cpp

28 files changed

+481

-139

lines changed

`‎.github/workflows/ci-test.yml`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,23 +3,23 @@ name: CI Test`
`3`	`3`	`on:[push, pull_request]`
`4`	`4`
`5`	`5`	`jobs:`
`6`		`-bst1-80-0:`
	`6`	`+bst1-82-0:`
`7`	`7`	`runs-on:ubuntu-latest`
`8`	`8`	`env:`
`9`	`9`	`METALL_LIMIT_MAKE_PARALLELS:8`
`10`	`10`	`steps:`
`11`		`- -uses:actions/checkout@v2`
	`11`	`+ -uses:actions/checkout@v3`
`12`	`12`	`-name:Test`
`13`	`13`	`run:\|`
`14`	`14`	`pushd /dev/shm`
`15`		`- wget -q https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz`
	`15`	`+ wget -q https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz`
`16`	`16`	`mkdir boost`
`17`		`- tar xfboost_1_80_0.tar.gz -C boost --strip-components 1`
	`17`	`+ tar xfboost_1_82_0.tar.gz -C boost --strip-components 1`
`18`	`18`	`export BOOST_ROOT=${PWD}/boost`
`19`	`19`	`popd`
`20`	`20`	`export METALL_TEST_DIR=${GITHUB_JOB}`
`21`		`- export CC=gcc-10`
`22`		`- export CXX=g++-10`
	`21`	`+ export CC=gcc-12`
	`22`	`+ export CXX=g++-12`
`23`	`23`	`cd $GITHUB_WORKSPACE`
`24`	`24`	`bash ./scripts/CI/build_and_test.sh`
`25`	`25`
`@@ -28,7 +28,7 @@ jobs:`
`28`	`28`	`env:`
`29`	`29`	`METALL_LIMIT_MAKE_PARALLELS:8`
`30`	`30`	`steps:`
`31`		`- -uses:actions/checkout@v2`
	`31`	`+ -uses:actions/checkout@v3`
`32`	`32`	`-name:Test`
`33`	`33`	`run:\|`
`34`	`34`	`pushd /dev/shm`
`@@ -38,7 +38,7 @@ jobs:`
`38`	`38`	`export BOOST_ROOT=${PWD}/boost`
`39`	`39`	`popd`
`40`	`40`	`export METALL_TEST_DIR=${GITHUB_JOB}`
`41`		`- export CC=gcc-10`
`42`		`- export CXX=g++-10`
	`41`	`+ export CC=gcc-12`
	`42`	`+ export CXX=g++-12`
`43`	`43`	`cd $GITHUB_WORKSPACE`
`44`	`44`	`bash ./scripts/CI/build_and_test.sh`

`‎.gitlab-ci.yml`

Lines changed: 51 additions & 59 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ stages:`
`16`	`16`	`variables:`
`17`	`17`	`GTEST_COLOR:"1"`
`18`	`18`	`GIT_DEPTH:0`
`19`		`-SPACK_ARCH_INFO:"arch=linux-rhel7-broadwell"`
`20`	`19`
`21`	`20`
`22`	`21`	`install_boost:`
`@@ -26,27 +25,8 @@ install_boost:`
`26`	`25`	`-shell`
`27`	`26`	`script:`
`28`	`27`	`-hostname`
`29`		`- -pwd`
`30`		`-# - spack install boost@1.80.0`
`31`		`-# - spack install boost@1.79.0`
`32`		`-# - spack install boost@1.78.0`
`33`		`-# - spack install boost@1.77.0`
`34`		`-# - spack install boost@1.76.0`
`35`		`-# - spack install boost@1.75.0`
`36`		`-# - spack install boost@1.74.0`
`37`		`-# - spack install boost@1.73.0`
`38`		`-# - spack install boost@1.72.0`
`39`		`-# - spack install boost@1.71.0`
`40`		`-# - spack install boost@1.70.0`
`41`		`-# - spack install boost@1.69.0`
`42`		`-# - spack install boost@1.68.0`
`43`		`-# - spack install boost@1.67.0`
`44`		`-# - spack install boost@1.66.0`
`45`		`-# - spack install boost@1.65.1`
`46`		`-# - spack install boost@1.65.0`
`47`		`-# - spack install boost@1.64.0`
`48`		`-# - spack clean`
`49`		`- -spack find`
	`28`	`+ -srun -N1 -ppdebug spack install boost@1.82.0 boost@1.81.0 boost@1.80.0 boost@1.79.0 boost@1.78.0 boost@1.77.0 boost@1.76.0 boost@1.75.0 boost@1.74.0 boost@1.73.0 boost@1.72.0 boost@1.71.0 boost@1.70.0 boost@1.69.0 boost@1.68.0 boost@1.67.0 boost@1.66.0 boost@1.65.1 boost@1.65.0 boost@1.64.0`
	`29`	`+ -spack clean`
`50`	`30`
`51`	`31`
`52`	`32`	`.build:`
`@@ -57,114 +37,126 @@ install_boost:`
`57`	`37`	`script:`
`58`	`38`	`-echo "=== build section ==="`
`59`	`39`	`-module load gcc/${GCC_VERSION}`
`60`		`- -spack load boost@${BOOST_VERSION}${SPACK_ARCH_INFO}`
	`40`	`+ -spack load boost@${BOOST_VERSION}arch=$(spack arch)`
`61`	`41`	`-export METALL_TEST_DIR="/dev/shm/metall_test-${CI_CONCURRENT_ID}-${CI_PIPELINE_IID}"`
`62`	`42`	`-srun -N1 -ppdebug bash ./scripts/CI/build_and_test.sh`
`63`	`43`
`64`		`-build_gcc10.2.1_bst1.80.0:`
	`44`	`+build_gcc12.1.1_bst1.82.0:`
`65`	`45`	`extends:.build`
`66`	`46`	`variables:`
`67`		`-GCC_VERSION:"10.2.1"`
	`47`	`+GCC_VERSION:"12.1.1"`
	`48`	`+BOOST_VERSION:"1.82.0"`
	`49`	`+`
	`50`	`+build_gcc12.1.1_bst1.81.0:`
	`51`	`+extends:.build`
	`52`	`+variables:`
	`53`	`+GCC_VERSION:"12.1.1"`
	`54`	`+BOOST_VERSION:"1.81.0"`
	`55`	`+`
	`56`	`+build_gcc12.1.1_bst1.80.0:`
	`57`	`+extends:.build`
	`58`	`+variables:`
	`59`	`+GCC_VERSION:"12.1.1"`
`68`	`60`	`BOOST_VERSION:"1.80.0"`
`69`	`61`
`70`		`-build_gcc10.2.1_bst1.79.0:`
	`62`	`+build_gcc12.1.1_bst1.79.0:`
`71`	`63`	`extends:.build`
`72`	`64`	`variables:`
`73`		`-GCC_VERSION:"10.2.1"`
	`65`	`+GCC_VERSION:"12.1.1"`
`74`	`66`	`BOOST_VERSION:"1.79.0"`
`75`	`67`
`76`		`-build_gcc10.2.1_bst1.78.0:`
	`68`	`+build_gcc12.1.1_bst1.78.0:`
`77`	`69`	`extends:.build`
`78`	`70`	`variables:`
`79`		`-GCC_VERSION:"10.2.1"`
	`71`	`+GCC_VERSION:"12.1.1"`
`80`	`72`	`BOOST_VERSION:"1.78.0"`
`81`	`73`
`82`		`-build_gcc10.2.1_bst1.77.0:`
	`74`	`+build_gcc12.1.1_bst1.77.0:`
`83`	`75`	`extends:.build`
`84`	`76`	`variables:`
`85`		`-GCC_VERSION:"10.2.1"`
	`77`	`+GCC_VERSION:"12.1.1"`
`86`	`78`	`BOOST_VERSION:"1.77.0"`
`87`	`79`
`88`		`-build_gcc10.2.1_bst1.76.0:`
	`80`	`+build_gcc12.1.1_bst1.76.0:`
`89`	`81`	`extends:.build`
`90`	`82`	`variables:`
`91`		`-GCC_VERSION:"10.2.1"`
	`83`	`+GCC_VERSION:"12.1.1"`
`92`	`84`	`BOOST_VERSION:"1.76.0"`
`93`	`85`
`94`		`-build_gcc10.2.1_bst1.75.0:`
	`86`	`+build_gcc12.1.1_bst1.75.0:`
`95`	`87`	`extends:.build`
`96`	`88`	`variables:`
`97`		`-GCC_VERSION:"10.2.1"`
	`89`	`+GCC_VERSION:"12.1.1"`
`98`	`90`	`BOOST_VERSION:"1.75.0"`
`99`	`91`
`100`		`-build_gcc10.2.1_bst1.74.0:`
	`92`	`+build_gcc12.1.1_bst1.74.0:`
`101`	`93`	`extends:.build`
`102`	`94`	`variables:`
`103`		`-GCC_VERSION:"10.2.1"`
	`95`	`+GCC_VERSION:"12.1.1"`
`104`	`96`	`BOOST_VERSION:"1.74.0"`
`105`	`97`
`106`		`-build_gcc10.2.1_bst1.73.0:`
	`98`	`+build_gcc12.1.1_bst1.73.0:`
`107`	`99`	`extends:.build`
`108`	`100`	`variables:`
`109`		`-GCC_VERSION:"10.2.1"`
	`101`	`+GCC_VERSION:"12.1.1"`
`110`	`102`	`BOOST_VERSION:"1.73.0"`
`111`	`103`
`112`		`-build_gcc10.2.1_bst1.72.0:`
	`104`	`+build_gcc12.1.1_bst1.72.0:`
`113`	`105`	`extends:.build`
`114`	`106`	`variables:`
`115`		`-GCC_VERSION:"10.2.1"`
	`107`	`+GCC_VERSION:"12.1.1"`
`116`	`108`	`BOOST_VERSION:"1.72.0"`
`117`	`109`
`118`		`-build_gcc10.2.1_bst1.71.0:`
	`110`	`+build_gcc12.1.1_bst1.71.0:`
`119`	`111`	`extends:.build`
`120`	`112`	`variables:`
`121`		`-GCC_VERSION:"10.2.1"`
	`113`	`+GCC_VERSION:"12.1.1"`
`122`	`114`	`BOOST_VERSION:"1.71.0"`
`123`	`115`
`124`		`-build_gcc10.2.1_bst1.70.0:`
	`116`	`+build_gcc12.1.1_bst1.70.0:`
`125`	`117`	`extends:.build`
`126`	`118`	`variables:`
`127`		`-GCC_VERSION:"10.2.1"`
	`119`	`+GCC_VERSION:"12.1.1"`
`128`	`120`	`BOOST_VERSION:"1.70.0"`
`129`	`121`
`130`		`-build_gcc10.2.1_bst1.69.0:`
	`122`	`+build_gcc12.1.1_bst1.69.0:`
`131`	`123`	`extends:.build`
`132`	`124`	`variables:`
`133`		`-GCC_VERSION:"10.2.1"`
	`125`	`+GCC_VERSION:"12.1.1"`
`134`	`126`	`BOOST_VERSION:"1.69.0"`
`135`	`127`
`136`		`-build_gcc10.2.1_bst1.68.0:`
	`128`	`+build_gcc12.1.1_bst1.68.0:`
`137`	`129`	`extends:.build`
`138`	`130`	`variables:`
`139`		`-GCC_VERSION:"10.2.1"`
	`131`	`+GCC_VERSION:"12.1.1"`
`140`	`132`	`BOOST_VERSION:"1.68.0"`
`141`	`133`
`142`		`-build_gcc10.2.1_bst1.67.0:`
	`134`	`+build_gcc12.1.1_bst1.67.0:`
`143`	`135`	`extends:.build`
`144`	`136`	`variables:`
`145`		`-GCC_VERSION:"10.2.1"`
	`137`	`+GCC_VERSION:"12.1.1"`
`146`	`138`	`BOOST_VERSION:"1.67.0"`
`147`	`139`
`148`		`-build_gcc10.2.1_bst1.66.0:`
	`140`	`+build_gcc12.1.1_bst1.66.0:`
`149`	`141`	`extends:.build`
`150`	`142`	`variables:`
`151`		`-GCC_VERSION:"10.2.1"`
	`143`	`+GCC_VERSION:"12.1.1"`
`152`	`144`	`BOOST_VERSION:"1.66.0"`
`153`	`145`
`154`		`-build_gcc10.2.1_bst1.65.1:`
	`146`	`+build_gcc12.1.1_bst1.65.1:`
`155`	`147`	`extends:.build`
`156`	`148`	`variables:`
`157`		`-GCC_VERSION:"10.2.1"`
	`149`	`+GCC_VERSION:"12.1.1"`
`158`	`150`	`BOOST_VERSION:"1.65.1"`
`159`	`151`
`160`		`-build_gcc10.2.1_bst1.65.0:`
	`152`	`+build_gcc12.1.1_bst1.65.0:`
`161`	`153`	`extends:.build`
`162`	`154`	`variables:`
`163`		`-GCC_VERSION:"10.2.1"`
	`155`	`+GCC_VERSION:"12.1.1"`
`164`	`156`	`BOOST_VERSION:"1.65.0"`
`165`	`157`
`166`		`-build_gcc10.2.1_bst1.64.0:`
	`158`	`+build_gcc12.1.1_bst1.64.0:`
`167`	`159`	`extends:.build`
`168`	`160`	`variables:`
`169`		`-GCC_VERSION:"10.2.1"`
	`161`	`+GCC_VERSION:"12.1.1"`
`170`	`162`	`BOOST_VERSION:"1.64.0"`

`‎CMakeLists.txt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ endif()`
`17`	`17`	`# Metall general configuration`
`18`	`18`	`# -------------------------------------------------------------------------------- #`
`19`	`19`	`project(Metall`
`20`		`-VERSION0.25`
	`20`	`+VERSION0.26`
`21`	`21`	`DESCRIPTION"A persistent memory allocator for data-centric analytics"`
`22`	`22`	`HOMEPAGE_URL"https://github.com/LLNL/metall")`
`23`	`23`

`‎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.25`
	`41`	`+PROJECT_NUMBER = v0.26`
`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`

`‎example/CMakeLists.txt`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ add_metall_executable(concurrent_map concurrent_map.cpp)`
`32`	`32`
`33`	`33`	`add_metall_executable(metall_containersmetall_containers.cpp)`
`34`	`34`
	`35`	`+add_metall_executable(allocator_aware_typeallocator_aware_type.cpp)`
	`36`	`+`
	`37`	`+add_metall_executable(loggerlogger.cpp)`
	`38`	`+`
`35`	`39`	`if (BUILD_C)`
`36`	`40`	`add_c_executable(c_apic_api.c)`
`37`	`41`	`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!

Commite98ff94

File tree

28 files changed

28 files changed

`‎.github/workflows/ci-test.yml`

`‎.gitlab-ci.yml`

`‎CMakeLists.txt`

`‎docs/Doxyfile.in`

`‎example/CMakeLists.txt`

0 commit comments