Skip to content
Snippets Groups Projects

Feature/amg memory management

Merged Christian Engwer requested to merge feature/amg-memory-management into master
1 unresolved thread

This branch is cleaning up the AMG memory management in order to get rid of manual pointer juggling and thus improve maintainability.

Edited by Christian Engwer

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
266 266 : public Dune::Preconditioner<typename P::domain_type,typename P::range_type> {
267 267 friend struct Amg::ConstructionTraits<NonoverlappingBlockPreconditioner<C,P> >;
268 268 public:
269 typedef Preconditioner<typename P::domain_type,typename P::range_type> Prec;
  • @ansgar that might indeed be true. I'll have a look.

  • Furthermore there seems to be some problem introduced during my git rebase orgy, as I had to factor out these changes from an other branch I have lying around... A fix will follow...

  • Christian Engwer added 2 commits

    added 2 commits

    • ba3d08cb - [amg] fix weak_ptr issue when copying a hierarchy
    • 3be3e805 - [amg] the default constructor for Hierarchy did not initialize levels_

    Compare with previous version

  • Can someone comment on #64 (closed) ? If it is unnecessary, this owuld be the right commit to clean this up.

  • Christian Engwer added 3 commits

    added 3 commits

    • e246bd21 - [amg] replace manual memory management with shared_ptr in AMG
    • 38dadd7b - [amg] note some more questions to be moved to an issue later...
    • 68bd185a - [amg] split hierarchy.hh

    Compare with previous version

  • Christian Engwer added 2 commits

    added 2 commits

    • e3c44f51 - [amg] split hierarchy.hh
    • cdfa51c6 - [amg] remove some #warning statements as they are now listed in a dedicated issue

    Compare with previous version

  • Christian Engwer added 2 commits

    added 2 commits

    • 7dd43fc7 - [cleanup] don't create a Prec typedef, but explicitly name Preconditioner<X,Y>
    • 241d6150 - [amg] don't copy temporary data durint copy-construction

    Compare with previous version

  • Christian Engwer unmarked as a Work In Progress

    unmarked as a Work In Progress

  • All tests run through, I'd like to merge soon to ease future changes.

  • I resolved the merge conflict by hand and will now push to master.

  • Christian Engwer added 24 commits

    added 24 commits

    • 241d6150...6e567183 - 11 commits from branch master
    • bd05ab5a - [amg] update Hierarchy to internally manage the finest level via shared_ptr
    • 01b18870 - [prec] change internal memory management of parallel preconditioners
    • 5d28d987 - [amg] change memory management of Hierarchy to use shared_ptr to simplify memory management
    • ef0e3a0c - [amg] simplify Hierarchy and use delagting constructors and the default destructor
    • 36d6a5fe - [amg] cleanup constructors/destructors of Amg::Hierarchy
    • 00f4630d - [amg] fix weak_ptr issue when copying a hierarchy
    • 44ffb9ee - [amg] the default constructor for Hierarchy did not initialize levels_
    • 5b58c1b9 - [amg] replace manual memory management with shared_ptr in AMG
    • cdfd41a8 - [amg] note some more questions to be moved to an issue later...
    • 4d7d1a6c - [amg] split hierarchy.hh
    • 8b08b08b - [amg] remove some #warning statements as they are now listed in a dedicated issue
    • e801e705 - [cleanup] don't create a Prec typedef, but explicitly name Preconditioner<X,Y>
    • b24b42a2 - [amg] don't copy temporary data durint copy-construction

    Compare with previous version

  • OK. The gitlab instruction for manual merge did not work. I rebased and force pushed... This will be merged once the test succeed.

  • Christian Engwer enabled an automatic merge when the pipeline for b24b42a2 succeeds

    enabled an automatic merge when the pipeline for b24b42a2 succeeds

  • mentioned in commit 5117bb4c

  • Simon Praetorius mentioned in merge request !302 (merged)

    mentioned in merge request !302 (merged)

  • Robert K mentioned in commit 1baedfab

    mentioned in commit 1baedfab

  • mentioned in issue #64 (closed)

  • mentioned in issue #26 (closed)

  • Please register or sign in to reply
    Loading