Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump gcc in CI to 13 to test faster compilation #520

Merged
merged 5 commits into from
Mar 13, 2024
Merged

bump gcc in CI to 13 to test faster compilation #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5b9926
bump gcc in CI to 13 to test faster compilation
mgovers Mar 11, 2024
4a46c9c
Merge branch 'main' into feature/gcc-latest
mgovers Mar 13, 2024
0115a90
remove hardware destructive inference size
mgovers Mar 13, 2024
2727a14
also remove new header
mgovers Mar 13, 2024
03fcbb1
Merge branch 'main' into feature/gcc-latest
mgovers Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jobs:
compiler: [gcc, clang]
include:
- compiler: gcc
cc: gcc-11
cxx: g++-11
cc: gcc-13
cxx: g++-13
- compiler: clang
cc: clang-15
cxx: clang++-15
Expand Down
6 changes: 3 additions & 3 deletions docs/advanced_documentation/build-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ You need a C++ compiler with C++20 support. Below is a list of tested compilers:
* gcc >= 11.0
* Version 12.x tested using the version in the `manylinux_2_28` container.
* Version 12.x tested using the musllinux build with custom compiler
* Version 11.x tested in CI
* Version 13.x tested in CI
* Clang >= 15.0
* Version 15.x tested in CI
* Version 15.x tested in CI with code quality checks
Expand Down Expand Up @@ -166,8 +166,8 @@ WSL), or in a physical/virtual machine.
Append the following lines into the file `${HOME}/.bashrc`.

```shell
export CXX=clang++-15 # or g++-11
export CC=clang-15 # gcc-11
export CXX=clang++-15 # or g++-13
export CC=clang-15 # gcc-13
export CMAKE_PREFIX_PATH=/home/linuxbrew/.linuxbrew
export LLVM_COV=llvm-cov-15
export CLANG_TIDY=clang-tidy-15 # only if you want to use one of the clang-tidy presets
Expand Down
14 changes: 0 additions & 14 deletions power_grid_model_c/power_grid_model/include/power_grid_model/common/calculation_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,8 @@
#include <map>
#include <string>

#ifdef POWER_GRID_MODEL_CPP_BENCHMARK
#include <new>
#endif

namespace power_grid_model {

// calculation info
#ifdef POWER_GRID_MODEL_CPP_BENCHMARK
#if defined(__cpp_lib_hardware_interference_size)
constexpr size_t cache_line_size = std::hardware_destructive_interference_size;
#else
constexpr size_t cache_line_size = 64;
#endif
class alignas(cache_line_size) CalculationInfo : public std::map<std::string, double, std::less<>> {};
#else
mgovers marked this conversation as resolved.
Show resolved Hide resolved
using CalculationInfo = std::map<std::string, double, std::less<>>;
#endif

} // namespace power_grid_model
Loading