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

Compiling with NVHPC #1076

Merged
merged 8 commits into from
Oct 10, 2024
Merged

Compiling with NVHPC #1076

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4aa6636
now nvhpc24.3 compiles
Iximiel May 15, 2024
b74c0a1
upgrade to the workflow
Iximiel May 15, 2024
30e4ec4
changed the position of the define near to where it is needed
Iximiel May 15, 2024
ea55ff9
Update MergeVectorTools.h on GH
Iximiel May 15, 2024
cec19bf
Update MergeVectorTools.h: adding a more explanatory comment
Iximiel May 15, 2024
aa4266e
small modification to the CI
Iximiel May 16, 2024
378fb88
Merge branch 'compileWithNVHPC' of https://github.com/Iximiel/plumed2…
Iximiel May 16, 2024
7053d19
changing again linuxWF for nvhpc
Iximiel Oct 10, 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
8 changes: 1 addition & 7 deletions src/tools/MergeVectorTools.h
View file
Open in desktop
Iximiel marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,7 @@ static void mergeSortedVectors(const C* const* vecs, std::size_t size, std::vect
/// to allow using a priority_queu, which selects the highest element.
/// we here (counterintuitively) define < as >
bool operator< (Entry const& rhs) const { return top() > rhs.top(); }
#ifdef __NVCOMPILER
#define PLMDAUTO typename C::value_type
#else
//I prefer letting gcc doing his work
#define PLMDAUTO auto
#endif
const PLMDAUTO & top() const { return *fwdIt; }
const typename C::value_type & top() const { return *fwdIt; }
void next() { ++fwdIt;};
};

Expand Down
Loading