Skip to content

Commit

Permalink
Merge pull request #284 from LLNL/release/v0.26
Browse files Browse the repository at this point in the history 
Release/v0.26
  • Loading branch information
@KIwabuchi
KIwabuchi authored Jul 16, 2023
2 parents 9c3e956 + 642172b commit e98ff94
Show file tree
Hide file tree
Showing 28 changed files with 481 additions and 139 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ name: CI Test
on: [push, pull_request]

jobs:
bst1-80-0:
bst1-82-0:
runs-on: ubuntu-latest
env:
METALL_LIMIT_MAKE_PARALLELS: 8
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Test
run: |
pushd /dev/shm
wget -q https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz
wget -q https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz
mkdir boost
tar xf boost_1_80_0.tar.gz -C boost --strip-components 1
tar xf boost_1_82_0.tar.gz -C boost --strip-components 1
export BOOST_ROOT=${PWD}/boost
popd
export METALL_TEST_DIR=${GITHUB_JOB}
export CC=gcc-10
export CXX=g++-10
export CC=gcc-12
export CXX=g++-12
cd $GITHUB_WORKSPACE
bash ./scripts/CI/build_and_test.sh
Expand All @@ -28,7 +28,7 @@ jobs:
env:
METALL_LIMIT_MAKE_PARALLELS: 8
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Test
run: |
pushd /dev/shm
Expand All @@ -38,7 +38,7 @@ jobs:
export BOOST_ROOT=${PWD}/boost
popd
export METALL_TEST_DIR=${GITHUB_JOB}
export CC=gcc-10
export CXX=g++-10
export CC=gcc-12
export CXX=g++-12
cd $GITHUB_WORKSPACE
bash ./scripts/CI/build_and_test.sh
110 changes: 51 additions & 59 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ stages:
variables:
GTEST_COLOR: "1"
GIT_DEPTH: 0
SPACK_ARCH_INFO: "arch=linux-rhel7-broadwell"


install_boost:
Expand All @@ -26,27 +25,8 @@ install_boost:
- shell
script:
- hostname
- pwd
# - spack install boost@1.80.0
# - spack install boost@1.79.0
# - spack install boost@1.78.0
# - spack install boost@1.77.0
# - spack install boost@1.76.0
# - spack install boost@1.75.0
# - spack install boost@1.74.0
# - spack install boost@1.73.0
# - spack install boost@1.72.0
# - spack install boost@1.71.0
# - spack install boost@1.70.0
# - spack install boost@1.69.0
# - spack install boost@1.68.0
# - spack install boost@1.67.0
# - spack install boost@1.66.0
# - spack install boost@1.65.1
# - spack install boost@1.65.0
# - spack install boost@1.64.0
# - spack clean
- spack find
- 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
- spack clean


.build:
Expand All @@ -57,114 +37,126 @@ install_boost:
script:
- echo "=== build section ==="
- module load gcc/${GCC_VERSION}
- spack load boost@${BOOST_VERSION} ${SPACK_ARCH_INFO}
- spack load boost@${BOOST_VERSION} arch=$(spack arch)
- export METALL_TEST_DIR="/dev/shm/metall_test-${CI_CONCURRENT_ID}-${CI_PIPELINE_IID}"
- srun -N1 -ppdebug bash ./scripts/CI/build_and_test.sh

build_gcc10.2.1_bst1.80.0:
build_gcc12.1.1_bst1.82.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.82.0"

build_gcc12.1.1_bst1.81.0:
extends: .build
variables:
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.81.0"

build_gcc12.1.1_bst1.80.0:
extends: .build
variables:
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.80.0"

build_gcc10.2.1_bst1.79.0:
build_gcc12.1.1_bst1.79.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.79.0"

build_gcc10.2.1_bst1.78.0:
build_gcc12.1.1_bst1.78.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.78.0"

build_gcc10.2.1_bst1.77.0:
build_gcc12.1.1_bst1.77.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.77.0"

build_gcc10.2.1_bst1.76.0:
build_gcc12.1.1_bst1.76.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.76.0"

build_gcc10.2.1_bst1.75.0:
build_gcc12.1.1_bst1.75.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.75.0"

build_gcc10.2.1_bst1.74.0:
build_gcc12.1.1_bst1.74.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.74.0"

build_gcc10.2.1_bst1.73.0:
build_gcc12.1.1_bst1.73.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.73.0"

build_gcc10.2.1_bst1.72.0:
build_gcc12.1.1_bst1.72.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.72.0"

build_gcc10.2.1_bst1.71.0:
build_gcc12.1.1_bst1.71.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.71.0"

build_gcc10.2.1_bst1.70.0:
build_gcc12.1.1_bst1.70.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.70.0"

build_gcc10.2.1_bst1.69.0:
build_gcc12.1.1_bst1.69.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.69.0"

build_gcc10.2.1_bst1.68.0:
build_gcc12.1.1_bst1.68.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.68.0"

build_gcc10.2.1_bst1.67.0:
build_gcc12.1.1_bst1.67.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.67.0"

build_gcc10.2.1_bst1.66.0:
build_gcc12.1.1_bst1.66.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.66.0"

build_gcc10.2.1_bst1.65.1:
build_gcc12.1.1_bst1.65.1:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.65.1"

build_gcc10.2.1_bst1.65.0:
build_gcc12.1.1_bst1.65.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.65.0"

build_gcc10.2.1_bst1.64.0:
build_gcc12.1.1_bst1.64.0:
extends: .build
variables:
GCC_VERSION: "10.2.1"
GCC_VERSION: "12.1.1"
BOOST_VERSION: "1.64.0"
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif()
# Metall general configuration
# -------------------------------------------------------------------------------- #
project(Metall
VERSION 0.25
VERSION 0.26
DESCRIPTION "A persistent memory allocator for data-centric analytics"
HOMEPAGE_URL "https://github.com/LLNL/metall")

Expand Down
2 changes: 1 addition & 1 deletion docs/Doxyfile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.25
PROJECT_NUMBER = v0.26

# 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
Expand Down
4 changes: 4 additions & 0 deletions example/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ add_metall_executable(concurrent_map concurrent_map.cpp)

add_metall_executable(metall_containers metall_containers.cpp)

add_metall_executable(allocator_aware_type allocator_aware_type.cpp)

add_metall_executable(logger logger.cpp)

if (BUILD_C)
add_c_executable(c_api c_api.c)
target_link_libraries(c_api PRIVATE metall_c)
Expand Down
Loading

0 comments on commit e98ff94

Please sign in to comment.