Release 5.13.4

.github/ci-hpc-config.yml

@@ -4,10 +4,43 @@ build:
     - ninja
     - python3
     - qt
+    - cmake/new
   dependencies:
     - ecmwf/ecbuild@develop
   parallel: 64
   cmake_options:
     - -DENABLE_ALL_TESTS=ON
   ctest_options:
     - -L nightly
+
+gnu-12.2.0:
+  build:
+    modules:
+      - boost/1.81.0
+      - ninja
+      - python3/3.10.10-01
+      - qt
+      - cmake/new
+    dependencies:
+      - ecmwf/ecbuild@develop
+    parallel: 64
+    cmake_options:
+      - -DENABLE_ALL_TESTS=ON
+    ctest_options:
+      - -L nightly
+
+gnu-8.5.0:
+  build:
+    modules:
+      - boost/1.84.0
+      - ninja
+      - python3/3.11.8-01
+      - qt
+      - cmake/new
+    dependencies:
+      - ecmwf/ecbuild@develop
+    parallel: 64
+    cmake_options:
+      - -DENABLE_ALL_TESTS=ON
+    ctest_options:
+      - -L nightly

.github/workflows/ci.yml

@@ -30,48 +30,14 @@ jobs:
       codecov_upload: true
     secrets: inherit
 
-  # Run CI of private downstream packages on self-hosted runners
-  private-downstream-ci:
-    name: private-downstream-ci
-    needs: [downstream-ci]
-    if: (success() || failure()) && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Dispatch private downstream CI
-        uses: ecmwf-actions/dispatch-private-downstream-ci@v1
-        with:
-          token: ${{ secrets.GH_REPO_READ_TOKEN }}
-          owner: ecmwf-actions
-          repository: private-downstream-ci
-          event_type: downstream-ci
-          payload: '{"ecflow": "ecmwf/ecflow@${{ github.event.pull_request.head.sha || github.sha }}"}'
-
   # Build downstream packages on HPC
   downstream-ci-hpc:
     name: downstream-ci-hpc
     if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
     uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci-hpc.yml@main
     with:
       ecflow: ecmwf/ecflow@${{ github.event.pull_request.head.sha || github.sha }}
-      skip_matrix_jobs: intel-2021.4.0
+      skip_matrix_jobs: |
+        intel-2021.4.0
+        nvidia-22.11
     secrets: inherit
-
-  # Run CI of private downstream packages on HPC
-  private-downstream-ci-hpc:
-    name: private-downstream-ci-hpc
-    needs: [downstream-ci-hpc]
-    if: (success() || failure()) && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Dispatch private downstream CI
-        uses: ecmwf-actions/dispatch-private-downstream-ci@v1
-        with:
-          token: ${{ secrets.GH_REPO_READ_TOKEN }}
-          owner: ecmwf-actions
-          repository: private-downstream-ci
-          event_type: downstream-ci-hpc
-          payload: '{"ecflow": "ecmwf/ecflow@${{ github.event.pull_request.head.sha || github.sha }}"}'

CMakeLists.txt

@@ -24,7 +24,7 @@ endif()
 
 find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild /workspace/ecbuild) # Before project()
 
-project( ecflow LANGUAGES CXX VERSION 5.13.3 )
+project( ecflow LANGUAGES CXX VERSION 5.13.4 )
 
 # Important: the project version is used, as generated CMake variables, to filter .../ecflow/core/ecflow_version.h.in
 

Viewer/ecflowUI/src/ChangeNotify.cpp

@@ -63,6 +63,12 @@ ChangeNotify::ChangeNotify(const std::string& id)
     items[id] = this;
 }
 
+ChangeNotify::~ChangeNotify() {
+    delete data_;
+    delete model_;
+    delete proxyModel_;
+}
+
 ChangeNotifyModel* ChangeNotify::model() const {
     return model_; // proxyModel_;
 }

Viewer/ecflowUI/src/ChangeNotify.hpp

@@ -31,6 +31,7 @@ class ChangeNotify : public VPropertyObserver {
     explicit ChangeNotify(const std::string& id);
     ChangeNotify(const ChangeNotify&)            = delete;
     ChangeNotify& operator=(const ChangeNotify&) = delete;
+    ~ChangeNotify() override;
 
     const std::string& id() const { return id_; }
     VNodeList* data() const { return data_; }

Viewer/ecflowUI/src/InfoPresenter.hpp

@@ -25,7 +25,7 @@ class VReply;
 class InfoPresenter {
 public:
     InfoPresenter()          = default;
-    virtual ~InfoPresenter() = default;
+    virtual ~InfoPresenter();
     virtual void infoReady(VReply*) {}
     virtual void infoFailed(VReply*) {}
     virtual void infoProgress(VReply*) {}

Viewer/ecflowUI/src/InfoProvider.cpp

@@ -21,6 +21,12 @@
 #include "ecflow/node/EcfFile.hpp"
 #include "ecflow/node/Submittable.hpp"
 
+InfoPresenter::~InfoPresenter() {
+    // The following takes care of deleting the provider used by this presenter.
+    // The provider is typically created in the ctor of derived class (e.g. WhyItemWidget)
+    delete infoProvider_;
+}
+
 InfoProvider::InfoProvider(InfoPresenter* owner, VTask::Type taskType)
     : owner_(owner),
       reply_(new VReply(this)),
@@ -30,8 +36,8 @@ InfoProvider::InfoProvider(InfoPresenter* owner, VTask::Type taskType)
 }
 
 InfoProvider::~InfoProvider() {
-    delete reply_;
     clearInternal();
+    delete reply_;
 }
 
 void InfoProvider::clearInternal() {

Viewer/ecflowUI/src/InfoProvider.hpp

@@ -24,7 +24,9 @@ class InfoProvider : public VTaskObserver, public VInfoVisitor {
     InfoProvider(InfoPresenter* owner, VTask::Type);
     ~InfoProvider() override;
     InfoProvider(const InfoProvider&)            = delete;
+    InfoProvider(InfoProvider&&)                 = delete;
     InfoProvider& operator=(const InfoProvider&) = delete;
+    InfoProvider& operator=(InfoProvider&&)      = delete;
 
     void info(VInfo_ptr);
     void command(VTask::Type);

Viewer/ecflowUI/src/LogLoadWidget.cpp

@@ -169,7 +169,9 @@ LogLoadWidget::LogLoadWidget(QWidget* /*parent*/) : ui_(new Ui::LogLoadWidget) {
     slotExpandFileInfo(expandSt);
 }
 
-LogLoadWidget::~LogLoadWidget() = default;
+LogLoadWidget::~LogLoadWidget() {
+    delete ui_;
+}
 
 // void LogLoadWidget::initSplitter()
 //{

Viewer/ecflowUI/src/ModelColumn.cpp

@@ -20,16 +20,56 @@
 #include "VProperty.hpp"
 #include "VSettingsLoader.hpp"
 
-static std::map<std::string, ModelColumn*> defs;
+class ColumnDefinitions {
+public:
+    using storage_t = std::map<std::string, ModelColumn*>;
+
+    ColumnDefinitions(): storage_{} {}
+    ~ColumnDefinitions() {
+        for(auto item: storage_) {
+            delete item.second;
+        }
+    }
+
+    void insert(const std::string& k, ModelColumn* v) {
+        storage_[k] = v;
+    }
+
+    auto find(const std::string& k) const {
+        return storage_.find(k);
+    }
+
+    auto end() {
+        return storage_.end();
+    }
+
+    template <typename F>
+    void for_each(F&& f) {
+        for(auto item: storage_) {
+            f(item.first, item.second);
+        }
+    }
+
+private:
+    storage_t storage_;
+};
+
+static ColumnDefinitions defs;
 
 ModelColumn::ModelColumn(const std::string& id) : id_(id), diagStart_(-1), diagEnd_(-1) {
-    defs[id_] = this;
+    defs.insert(id_, this);
+}
+
+ModelColumn::~ModelColumn() {
+    for(auto && item: items_) {
+        delete item;
+    }
 }
 
 ModelColumn* ModelColumn::def(const std::string& id) {
-    auto it = defs.find(id);
-    if (it != defs.end())
+    if (auto it = defs.find(id); it != defs.end()) {
         return it->second;
+    }
     return nullptr;
 }
 
@@ -211,6 +251,9 @@ void ModelColumn::load(VProperty* group) {
     Q_ASSERT(group);
 
     auto* m = new ModelColumn(group->strName());
+    // Attention: Each ModelColumn object self-registers in `defs`!
+    //            This means that the newly created object will live until `defs` (with static allocation) is released.
+
     for (int i = 0; i < group->children().size(); i++) {
         VProperty* p = group->children().at(i);
         m->loadItem(p);
@@ -222,9 +265,7 @@ void ModelColumn::load(VProperty* group) {
 
 // Called via VSettingsLoader after the users settings are read
 void ModelColumn::loadSettings() {
-    for (auto& def : defs) {
-        def.second->loadUserSettings();
-    }
+    defs.for_each([](auto&& k, auto&& v){v->loadUserSettings();});
 }
 
 // Load user defined settings

Viewer/ecflowUI/src/ModelColumn.hpp

@@ -42,6 +42,7 @@ class ModelColumn : public QObject {
     Q_OBJECT
 public:
     explicit ModelColumn(const std::string& id);
+    ~ModelColumn() override;
 
     int count() const { return items_.size(); }
     int indexOf(QString) const;

Viewer/ecflowUI/src/NodeQuery.cpp

@@ -77,6 +77,7 @@ NodeQuery::NodeQuery(const std::string& name, bool ignoreMaxNum)
 
 NodeQuery::~NodeQuery() {
     qDeleteAll(options_);
+    qDeleteAll(attrGroup_);
 }
 
 NodeQuery* NodeQuery::clone() {

Viewer/ecflowUI/src/NodeQuery.hpp

@@ -33,6 +33,7 @@ class NodeQueryAttrGroup {
         : name_(name),
           types_(types),
           options_(options) {}
+    virtual ~NodeQueryAttrGroup() = default;
 
     QString name() const { return name_; }
     virtual bool hasType(VAttributeType* t) const { return types_.contains(t); }
@@ -41,14 +42,15 @@ class NodeQueryAttrGroup {
 
 protected:
     QString name_;
-    QList<VAttributeType*> types_;
-    QList<NodeQueryOption*> options_;
+    QList<VAttributeType*> types_; // This is a non-owning container
+    QList<NodeQueryOption*> options_; // This is a non-owning container 
 };
 
 class NodeQueryVarAttrGroup : public NodeQueryAttrGroup {
 public:
     NodeQueryVarAttrGroup(QString name, QList<VAttributeType*> types, QList<NodeQueryOption*> options)
         : NodeQueryAttrGroup(name, types, options) {}
+    ~NodeQueryVarAttrGroup() override = default;
 
     bool hasType(VAttributeType*) const override;
 };

Viewer/ecflowUI/src/OutputDirWidget.cpp

@@ -370,6 +370,10 @@ OutputDirWidget::OutputDirWidget(QWidget* parent) : QWidget(parent), ui_(new Ui:
     transitionTo(new DirWidgetEmptyState(this, nullptr));
 }
 
+OutputDirWidget::~OutputDirWidget() {
+    delete ui_;
+}
+
 // must be called externally
 void OutputDirWidget::showIt(bool st) {
     if (st) {

Viewer/ecflowUI/src/OutputDirWidget.hpp

@@ -43,6 +43,7 @@ class OutputDirWidget : public QWidget {
 
 public:
     explicit OutputDirWidget(QWidget* parent);
+    ~OutputDirWidget() override;
 
     void clear();
     void load(VReply* reply, const std::string& joboutFile);

Viewer/ecflowUI/src/OutputFetchInfo.cpp

@@ -45,6 +45,10 @@ OutputFetchInfo::OutputFetchInfo(QWidget* parent) : QWidget(parent), ui_(new Ui:
     connect(bGroup_, SIGNAL(buttonClicked(QAbstractButton*)), this, SLOT(buttonClicked(QAbstractButton*)));
 }
 
+OutputFetchInfo::~OutputFetchInfo() {
+    delete ui_;
+}
+
 void OutputFetchInfo::buttonClicked(QAbstractButton* b) {
     ui_->stackedWidget->setCurrentIndex((b == ui_->infoTb) ? 0 : 1);
 }

Viewer/ecflowUI/src/OutputFetchInfo.hpp

@@ -30,6 +30,8 @@ class OutputFetchInfo : public QWidget {
     Q_OBJECT
 public:
     explicit OutputFetchInfo(QWidget* parent);
+    ~OutputFetchInfo() override;
+
     void clearInfo();
     void setInfo(VReply*, VInfo_ptr info = nullptr);
     void setError(QString);

Viewer/ecflowUI/src/PlainTextWidget.cpp

@@ -33,6 +33,10 @@ PlainTextWidget::PlainTextWidget(QWidget* /*parent*/) : ui_(new Ui::PlainTextWid
     connect(ui_->fontSizeDownTb, SIGNAL(clicked()), this, SLOT(slotFontSizeDown()));
 }
 
+PlainTextWidget::~PlainTextWidget() {
+    delete ui_;
+}
+
 void PlainTextWidget::setPlainText(QString t) {
     ui_->textEdit->setPlainText(t);
 }

Viewer/ecflowUI/src/PlainTextWidget.hpp

@@ -22,7 +22,7 @@ class PlainTextWidget : public QWidget {
 
 public:
     explicit PlainTextWidget(QWidget* parent = nullptr);
-    ~PlainTextWidget() override = default;
+    ~PlainTextWidget() override;
 
     void setPlainText(QString);
     void setTitle(QString);

Viewer/ecflowUI/src/TimelineView.cpp

@@ -73,7 +73,9 @@ TimelineDelegate::TimelineDelegate(TimelineModel* model, QWidget* parent)
     updateSettings();
 }
 
-TimelineDelegate::~TimelineDelegate() = default;
+TimelineDelegate::~TimelineDelegate() {
+    delete prop_;
+}
 
 void TimelineDelegate::notifyChange(VProperty*) {
     updateSettings();

Viewer/ecflowUI/src/TimelineWidget.cpp

@@ -222,8 +222,8 @@ TimelineWidget::TimelineWidget(QWidget* /*parent*/)
 }
 
 TimelineWidget::~TimelineWidget() {
-    if (data_)
-        delete data_;
+    delete data_;
+    delete ui_;
 }
 
 // a complete clear

Viewer/ecflowUI/src/TreeNodeWidget.cpp

@@ -86,7 +86,11 @@ TreeNodeWidget::TreeNodeWidget(ServerFilter* serverFilter, QWidget* parent)
     WidgetNameProvider::nameChildren(this);
 }
 
-TreeNodeWidget::~TreeNodeWidget() = default;
+TreeNodeWidget::~TreeNodeWidget() {
+    delete stateFilterMenu_;
+    delete attrFilterMenu_;
+    delete iconFilterMenu_;
+}
 
 void TreeNodeWidget::setViewLayoutMode(TreeNodeWidget::ViewLayoutMode mode) {
     if (view_ && viewLayoutMode_ == mode)