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.

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

C++17 #953

Merged
merged 31 commits into from
Sep 5, 2023
Merged

C++17 #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6be5490
Enabled C++17 support, with related cleanup
GiovanniBussi Apr 24, 2023
766692d
Removed Tools::make_unique
GiovanniBussi Apr 25, 2023
80fa14e
Added support for C++11 regex
GiovanniBussi Sep 20, 2022
9c951d5
auto arguments in lambda functions (c++14)
GiovanniBussi Apr 26, 2023
cbdd52e
Make sure C++17 filesystem library is supported during configure
GiovanniBussi Apr 26, 2023
f78f63c
Make sure mac conda build can use filesystem library
GiovanniBussi Apr 26, 2023
586569a
Removed usage of dirent/readdir, now using c++17 filesystem
GiovanniBussi Apr 26, 2023
03032e2
Replaced cwd and chdir with filesystem library
GiovanniBussi Apr 25, 2023
841cba1
PLUMED_REGISTER_ACTION overhaul, plus sed applied to the actions
Iximiel May 12, 2023
550c70b
Merge remote-tracking branch 'upstream/c++17'
Iximiel May 12, 2023
91b5280
astyled and polished the class
Iximiel May 12, 2023
5c5ba2f
small aestetic changes
Iximiel May 12, 2023
1a69fd0
starting to revert to quotes
Iximiel May 12, 2023
3a14e0f
readded the quotes
Iximiel May 12, 2023
2b9345b
removed some spaces
Iximiel May 12, 2023
f6909bf
removed spaces
Iximiel May 12, 2023
e4213a7
reverted the documentation
Iximiel May 12, 2023
7016c11
moved the definitions outside the PLMD namespace
Iximiel May 15, 2023
3e60f26
Merge pull request #935 from Iximiel/actionRegister
GiovanniBussi May 19, 2023
97ef479
Merge branch 'master' into c++17
GiovanniBussi May 22, 2023
671ec98
Merge remote-tracking branch 'origin/c++17' into c++17
GiovanniBussi May 22, 2023
f6ab08d
Merge remote-tracking branch 'origin/master' into c++17
GiovanniBussi Jun 19, 2023
d018a98
Added back shortcut to std::make_unique
GiovanniBussi Jun 19, 2023
349474a
Revert "Removed Tools::make_unique"
GiovanniBussi Jun 19, 2023
93c0c83
Fixing doc to C++17
GiovanniBussi Jun 19, 2023
e2305ea
removed centos7 dockerfile
GiovanniBussi Jun 19, 2023
6b730cb
small fix
GiovanniBussi Jun 19, 2023
08b89e4
Merge branch 'master' into c++17
GiovanniBussi Jun 23, 2023
73a1a5e
Merge remote-tracking branch 'origin/master' into c++17
GiovanniBussi Jul 6, 2023
f0c606f
Merge remote-tracking branch 'origin/master' into c++17
GiovanniBussi Aug 2, 2023
610f86b
Merge branch 'master' into c++17
GiovanniBussi Sep 5, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ jobs:

conda:
uses: ./.github/workflows/condaWF.yml
secrets: inherit
secrets: inherit
2 changes: 0 additions & 2 deletions .github/workflows/dockerWF.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ jobs:
strategy:
fail-fast: false
matrix:
# centos7 (gcc 4.8)
# fedora38 (gcc 13)
# rockylinux8
variant:
- centos7
- fedora38
- rocky8
steps:
Expand Down
4 changes: 3 additions & 1 deletion CHANGES/v2.10.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@

This page contains changes that will end up in 2.10

- **PLUMED 2.10 requires a C++17 compatible compiler**.

- Changes relevant for developers:
- Removed some shortcuts for `ActionRegister.h` (from the modules bias colvar function sasa and vatom) and `CLToolRegister.h` (from the module cltools), now the two headers can only be included with `#include "core/ActionRegister.h"` or `#include "core/CLToolRegister.h"`.
- Removed some shortcuts for `ActionRegister.h` (from the modules bias colvar function sasa and vatom) and `CLToolRegister.h` (from the module cltools), now the two headers can only be included with `#include "core/ActionRegister.h"` or `#include "core/CLToolRegister.h"`.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,8 @@ Required software
Required software:

* GNU make.
* C/c++ compiler (c++11 support is required as of version 2.4).
* C/c++ compiler (c++17 support is required as of version 2.10).
* A modern version of the `patch` command line tool.
* Support for POSIX library `dirent.h`.

Suggested software (libraries are checked by `./configure` and enabled if available):

Expand Down
5 changes: 5 additions & 0 deletions conda/plumed/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ export CPPFLAGS="-D__PLUMED_DEFAULT_KERNEL=$PREFIX/lib/libplumedKernel$SHLIB_EXT
# enable optimization
export CXXFLAGS="${CXXFLAGS//-O2/-O3}"

if [[ $(uname) == "Darwin" ]]; then
# see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
fi

# libraries are explicitly listed here due to --disable-libsearch
export LIBS="-lfftw3 -lgsl -lgslcblas -llapack -lblas -lz $LIBS"

Expand Down
Loading