Skip to content

Commit

Permalink
Merge branch 'develop' into prs/refactor_tag_generation
Browse files Browse the repository at this point in the history
  • Loading branch information
gr0vity-dev authored Mar 14, 2024
2 parents 5df25c7 + 7523172 commit 4b9be6d
Show file tree
Hide file tree
Showing 308 changed files with 11,712 additions and 9,383 deletions.
37 changes: 26 additions & 11 deletions .github/workflows/analyzers.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,51 @@
name: Static Analyzers

on: [push, pull_request]
on: [ push, pull_request ]

jobs:
clang_format:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3.1.0
- name: Installing clang-format 12
- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3.1.0

- name: Installing clang-format
env:
DEBIAN_FRONTEND: noninteractive
run: sudo apt-get install clang-format-12
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 17
sudo apt install clang-format-17
- name: Check clang-format
run: ci/clang-format-check.sh



cmake_format:
runs-on: ubuntu-20.04
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3.1.0
- uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 #v4.3.0
with:
- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3.1.0

- name: Setup Python
uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 #v4.3.0
with:
python-version: '3.x'
architecture: 'x64'
- uses: BSFishy/pip-action@8f2d471d809dc20b6ada98c91910b6ae6243f318
with:

- name: Install cmake-format
uses: BSFishy/pip-action@8f2d471d809dc20b6ada98c91910b6ae6243f318
with:
packages: |
cmake-format
- name: Check cmake-format
run: ci/cmake-format-check.sh


code_inspector:
runs-on: ubuntu-20.04
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/artifacts_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
osx_job:
needs: prepare_build
if: ${{ needs.prepare_build.outputs.tag_created == 'true' }}
runs-on: macOS-12
if: ${{ needs.prepare_build.outputs.TAG_CREATED == 'true' }}
runs-on: macOS-14
timeout-minutes: 90
strategy:
matrix:
Expand Down
70 changes: 64 additions & 6 deletions .github/workflows/code_sanitizers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Code Sanitizers

on: [push, pull_request, workflow_dispatch]
on: [ push, pull_request, workflow_dispatch ]

jobs:
linux_sanitizers:
Expand All @@ -9,13 +9,14 @@ jobs:
strategy:
fail-fast: false
matrix:
BACKEND: [lmdb, rocksdb]
COMPILER: [clang]
BACKEND: [ lmdb, rocksdb ]
COMPILER: [ clang ]
SANITIZER:
- { name: UBSAN, ignore_errors: false }
- { name: ASAN, ignore_errors: true }
- { name: ASAN_INT, ignore_errors: true }
- { name: ASAN, ignore_errors: false, leak_check: false }
- { name: ASAN_INT, ignore_errors: true, leak_check: false }
- { name: TSAN, ignore_errors: true }
- { name: LEAK, ignore_errors: true, leak_check: true }
runs-on: ubuntu-22.04
env:
COMPILER: ${{ matrix.COMPILER }}
Expand All @@ -24,7 +25,7 @@ jobs:
IGNORE_ERRORS: ${{ matrix.SANITIZER.ignore_errors }}
TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }}
DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }}
ASAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:suppressions=../asan_suppressions
ASAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:suppressions=../asan_suppressions:detect_leaks=${{ matrix.SANITIZER.leak_check && '1' || '0' }}
TSAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:suppressions=../tsan_suppressions
UBSAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:print_stacktrace=1
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
Expand Down Expand Up @@ -58,3 +59,60 @@ jobs:
continue-on-error: ${{ env.IGNORE_ERRORS == 'true' }}
run: ../ci/tests/show-sanitizer-reports.sh
working-directory: build


macos_sanitizers:
name: macOS [${{ matrix.SANITIZER.name }}] [${{ matrix.BACKEND }} | ${{ matrix.COMPILER }}] ${{ matrix.SANITIZER.ignore_errors && ' (Errors Ignored)' || '' }}
timeout-minutes: 120
strategy:
fail-fast: false
matrix:
BACKEND: [ lmdb, rocksdb ]
COMPILER: [ clang ]
SANITIZER:
- { name: UBSAN, ignore_errors: false }
- { name: ASAN, ignore_errors: false }
- { name: TSAN, ignore_errors: true }
runs-on: macos-14
env:
COMPILER: ${{ matrix.COMPILER }}
BACKEND: ${{ matrix.BACKEND }}
SANITIZER: ${{ matrix.SANITIZER.name }}
IGNORE_ERRORS: ${{ matrix.SANITIZER.ignore_errors }}
TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }}
DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }}
ASAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:suppressions=../asan_suppressions
TSAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:suppressions=../tsan_suppressions
UBSAN_OPTIONS: log_exe_name=1:log_path=sanitizer_report:print_stacktrace=1
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: "recursive"

- name: Prepare
run: ci/prepare/macos/prepare.sh

- name: Build Tests
id: build
run: ci/build-tests.sh

- name: Core Tests
if: steps.build.outcome == 'success' && (success() || failure())
continue-on-error: true
run: timeout -sKILL 45m ../ci/tests/run-core-tests.sh
working-directory: build

- name: RPC Tests
if: steps.build.outcome == 'success' && (success() || failure())
continue-on-error: true
run: timeout -sKILL 20m ../ci/tests/run-rpc-tests.sh
working-directory: build

- name: Reports
if: steps.build.outcome == 'success' && (success() || failure())
continue-on-error: ${{ env.IGNORE_ERRORS == 'true' }}
run: ../ci/tests/show-sanitizer-reports.sh
working-directory: build

65 changes: 1 addition & 64 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,13 @@ jobs:
BUILD_TYPE: ${{ matrix.RELEASE && 'RelWithDebInfo' || 'Debug' }}
TEST_USE_ROCKSDB: ${{ matrix.BACKEND == 'rocksdb' && '1' || '0' }}
DEADLINE_SCALE_FACTOR: ${{ matrix.BACKEND == 'rocksdb' && '2' || '1' }}
runs-on: macos-12
runs-on: macos-14
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: "recursive"
fetch-depth: 0 # Full history needed for restoring file timestamps

- name: Restore Timestamps
uses: ./.github/actions/restore-git-mtimes
continue-on-error: true

- name: Restore Build Cache
uses: actions/cache/restore@v3
continue-on-error: true
with:
path: build
key: ${{ runner.os }}-build-cache

- name: Prepare
run: ci/prepare/macos/prepare.sh
Expand All @@ -43,15 +31,6 @@ jobs:
id: build
run: ci/build-tests.sh

- name: Save Build Cache
# Only save build cache from develop to avoid polluting it by other branches / PRs
if: github.ref == 'refs/heads/develop' && success()
uses: actions/cache/save@v3
continue-on-error: true
with:
path: build
key: ${{ runner.os }}-build-cache

- name: Core Tests
if: steps.build.outcome == 'success' && (success() || failure())
run: ../ci/tests/run-core-tests.sh
Expand Down Expand Up @@ -90,18 +69,6 @@ jobs:
uses: actions/checkout@v3
with:
submodules: "recursive"
fetch-depth: 0 # Full history needed for restoring file timestamps

- name: Restore Timestamps
uses: ./.github/actions/restore-git-mtimes
continue-on-error: true

- name: Restore Build Cache
uses: actions/cache/restore@v3
continue-on-error: true
with:
path: build
key: ${{ runner.os }}-${{ env.COMPILER }}-build-cache

- name: Prepare
run: sudo -E ci/prepare/linux/prepare.sh
Expand All @@ -110,15 +77,6 @@ jobs:
id: build
run: ci/build-tests.sh

- name: Save Build Cache
# Only save build cache from develop to avoid polluting it by other branches / PRs
if: github.ref == 'refs/heads/develop' && success()
uses: actions/cache/save@v3
continue-on-error: true
with:
path: build
key: ${{ runner.os }}-${{ env.COMPILER }}-build-cache

- name: Core Tests
if: steps.build.outcome == 'success' && (success() || failure())
run: ../ci/tests/run-core-tests.sh
Expand Down Expand Up @@ -160,18 +118,6 @@ jobs:
uses: actions/checkout@v3
with:
submodules: "recursive"
fetch-depth: 0 # full history needed for restoring file timestamps

- name: Restore Timestamps
uses: ./.github/actions/restore-git-mtimes
continue-on-error: true

- name: Restore Build Cache
uses: actions/cache/restore@v3
continue-on-error: true
with:
path: build
key: ${{ runner.os }}-build-cache

- name: Prepare
run: ci/prepare/windows/prepare.ps1
Expand All @@ -181,15 +127,6 @@ jobs:
run: ci/build-tests.sh
shell: bash

- name: Save Build Cache
# only save build cache from develop to avoid polluting it by other branches / PRs
if: github.ref == 'refs/heads/develop' && success()
uses: actions/cache/save@v3
continue-on-error: true
with:
path: build
key: ${{ runner.os }}-build-cache

- name: Core Tests
if: steps.build.outcome == 'success' && (success() || failure())
run: ../ci/tests/run-core-tests.sh
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,9 @@
[submodule "submodules/gtest-parallel"]
path = submodules/gtest-parallel
url = https://github.com/google/gtest-parallel.git
[submodule "submodules/spdlog"]
path = submodules/spdlog
url = https://github.com/gabime/spdlog.git
[submodule "submodules/fmt"]
path = submodules/fmt
url = https://github.com/fmtlib/fmt.git
6 changes: 3 additions & 3 deletions CL/cl2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3571,19 +3571,19 @@ cl::pointer<T, detail::Deleter<SVMAllocator<T, SVMTrait>>> allocate_svm(const cl
}
#endif // #if !defined(CL_HPP_NO_STD_UNIQUE_PTR)

/*! \brief Vector alias to simplify contruction of coarse-grained SVM containers.
/*! \brief Vector alias to simplify construction of coarse-grained SVM containers.
*
*/
template < class T >
using coarse_svm_vector = vector<T, cl::SVMAllocator<int, cl::SVMTraitCoarse<>>>;

/*! \brief Vector alias to simplify contruction of fine-grained SVM containers.
/*! \brief Vector alias to simplify construction of fine-grained SVM containers.
*
*/
template < class T >
using fine_svm_vector = vector<T, cl::SVMAllocator<int, cl::SVMTraitFine<>>>;

/*! \brief Vector alias to simplify contruction of fine-grained SVM containers that support platform atomics.
/*! \brief Vector alias to simplify construction of fine-grained SVM containers that support platform atomics.
*
*/
template < class T >
Expand Down
Loading

0 comments on commit 4b9be6d

Please sign in to comment.