Cim import breakers

.binder/Dockerfile

@@ -0,0 +1,31 @@
+# sogno/dpsim:dev is built by dpsim-git/packaging/Docker/Dockerfile.dev
+ARG BASE_IMAGE=sogno/dpsim:dev
+
+FROM ${BASE_IMAGE}
+
+ARG NotebookApp.default_url
+ARG ip
+ARG port
+ARG NB_USER=jovyan
+ARG NB_UID=1000
+ENV USER=${NB_USER}
+ENV NB_UID=${NB_UID}
+ENV HOME=/home/${NB_USER}
+
+RUN adduser \
+	--comment "Default user" \
+	--uid ${NB_UID} \
+	${NB_USER}
+
+COPY . ${HOME}/dpsim
+ENV PATH="${HOME}/.local/bin:${PATH}"
+
+RUN python3 -m pip install notebook jupyterlab jupyterhub
+USER root
+RUN chown -R ${NB_UID} ${HOME}
+USER ${NB_USER}
+RUN rm -rf ${HOME}/dpsim/build && mkdir ${HOME}/dpsim/build
+WORKDIR ${HOME}/dpsim
+
+RUN python3 -m build --wheel
+RUN python3 -m pip install ./dist/dpsim*

.clang-format

@@ -4,6 +4,4 @@
 ---
 BasedOnStyle: LLVM
 
-# Increase ColumnLimit to avoid breaking SPDX headers
-ColumnLimit: 200
-
+ReflowComments: false

.github/workflows/build_nix.yaml

@@ -0,0 +1,33 @@
+name: Build with Nix
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+## Build ##
+
+jobs:
+  build:
+    name: Build with Nix
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Setup Nix cache
+        uses: cachix/cachix-action@v14
+        with:
+          name: dpsim
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Build dpsim
+        run: nix build .#dpsim

.github/workflows/build_test_linux_fedora.yaml

@@ -2,8 +2,9 @@ name: Build & Test Fedora
 
 on:
   push:
+    branches:
+    - master
   pull_request:
-    types: [opened, synchronize, reopened]
 
 ## Build ##
 
@@ -30,7 +31,7 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{ github.workspace }}/build
-      run: cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 $GITHUB_WORKSPACE
+      run: cmake -DCIM_VERSION=CGMES_2.4.15_16FEB2016 -DCOVERAGE=ON $GITHUB_WORKSPACE
 
     - name: Build dpsimpy and test examples
       shell: bash
@@ -112,7 +113,7 @@ jobs:
 
     - name: Install parallel testing
       shell: bash
-      run: pip install pytest-xdist
+      run: pip install pytest pytest-xdist pytest-cov nbformat nbconvert
 
     - name: Run pytest
       shell: bash
@@ -121,14 +122,40 @@ jobs:
         PYTHONPATH: "${{ github.workspace }}/build"
       run: |
         cp -r python/src/dpsim build/
-        pytest -v examples/Notebooks -n auto
+        pytest -n auto --cov --cov-branch --cov-report=xml examples/Notebooks/
 
     - name: Archive notebook outputs
       uses: actions/upload-artifact@v4
       with:
         name: pytest-output-${{ github.sha }}
         path: outputs/
 
+    - name: Install lcov
+      run: sudo dnf install -y lcov
+
+    - name: Generate lcov report
+      run: |
+        lcov --capture --directory . --output-file coverage.info --rc lcov_branch_coverage=1 --ignore-errors mismatch
+        lcov --remove coverage.info '/usr/*' --output-file coverage.cleaned.info
+        lcov --list coverage.cleaned.info
+
+    - name: Upload coverage artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: coverage-fedora--${{ github.sha }}
+        path: |
+          build/coverage.info
+          build/coverage_report/
+          build/**/*.gc*
+          ${{ github.workspace }}/src/**/*.cpp
+
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        slug: sogno-platform/dpsim
+
   compare-notebook-results:
     name: Compare Notebook results
     runs-on: ubuntu-latest
@@ -286,50 +313,41 @@ jobs:
     uses: ./.github/workflows/run_villas_example.yaml
     with:
       compose_file_path: examples/villas/docker-compose-tests
-      container_commands: |
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "pip install paho-mqtt"
-        docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "/dpsim-mqtt" -u wildcard -v&
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-producer.py"&
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt.py"
+      example_name: dpsim-mqtt
+      continue_on_error: true
 
   test-villas-examples-2:
     name: Run dpsim-mqtt-import-export VILLASnode example
     needs: [linux-fedora-examples]
     uses: ./.github/workflows/run_villas_example.yaml
     with:
       compose_file_path: examples/villas/docker-compose-tests
-      container_commands: |
-        docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "#" -u wildcard -v&
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export.py"
+      example_name: dpsim-mqtt-import-export
+      continue_on_error: true
 
   test-villas-examples-3:
     name: Run dpsim-mqtt-import-export-MIMO VILLASnode example
     needs: [linux-fedora-examples]
     uses: ./.github/workflows/run_villas_example.yaml
     with:
       compose_file_path: examples/villas/docker-compose-tests
+      example_name: dpsim-mqtt-import-export-mimo
       continue_on_error: true
-      container_commands: |
-        docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "#" -u wildcard -v&
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-import-export-MIMO.py"
 
   test-villas-examples-4:
     name: Run dpsim-file VILLASnode example
     needs: [linux-fedora-examples]
     uses: ./.github/workflows/run_villas_example.yaml
     with:
       compose_file_path: examples/villas/docker-compose-tests
+      example_name: dpsim-file
       continue_on_error: true
-      container_commands: |
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "sleep 3 && tail -f /dpsim/logs/output.csv"&
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-file.py"
 
   test-villas-examples-5:
     name: Run mqtt-cigre-mv-pf-profiles VILLASnode example
     needs: [linux-fedora-examples]
     uses: ./.github/workflows/run_villas_example.yaml
     with:
       compose_file_path: examples/villas/docker-compose-tests
-      container_commands: |
-        docker exec dpsim-compose-mqtt-1 mosquitto_sub -t "#" -u wildcard -v&
-        docker exec dpsim-compose-dpsim-1 /bin/bash -c "cd /dpsim && python3 /dpsim/examples/villas/dpsim-mqtt-cigre-mv-pf-profiles.py"
+      example_name: mqtt-cigre-mv-pf-profiles
+      continue_on_error: true

.github/workflows/build_test_linux_fedora_minimal.yaml

@@ -2,8 +2,9 @@ name: Build & Test Fedora Minimal
 
 on:
   push:
+    branches:
+    - master
   pull_request:
-    types: [opened, synchronize, reopened]
 
 ## Build ##
 

.github/workflows/build_test_linux_rocky.yaml

@@ -2,8 +2,9 @@ name: Build & Test RockyLinux
 
 on:
   push:
+    branches:
+    - master
   pull_request:
-    types: [opened, synchronize, reopened]
 
 ## Build ##
 
@@ -59,9 +60,9 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{ github.workspace }}/build
-      run: cmake $GITHUB_WORKSPACE -DFETCH_SPDLOG=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DWITH_PYBIND=OFF
+      run: cmake $GITHUB_WORKSPACE -DFETCH_SPDLOG=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
 
     - name: Build every target
       shell: bash
       working-directory: ${{ github.workspace }}/build
-      run: cmake --build . --parallel $(nproc)
+      run: cmake --build . --parallel $(nproc)

.github/workflows/build_test_linux_rocky_profiling.yaml

@@ -3,68 +3,64 @@ name: Build & Profile RockyLinux
 on:
   workflow_dispatch:
 
-## Build ##
-
 jobs:
   profiling:
     name: Build with Profiling options
     runs-on: ubuntu-latest
     container: sogno/dpsim:dev-rocky
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: Create Build Environment
-      run: mkdir build
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
-    - name: Cache build directory
-      uses: actions/cache@v4
-      with:
-        path: ${{ github.workspace }}/build
-        key: build-cache-rocky-profiling-${{ github.ref }}
+      - name: Create Build Environment
+        run: mkdir build
 
-    - name: Configure CMake
-      shell: bash
-      working-directory: ${{ github.workspace }}/build
-      run: cmake $GITHUB_WORKSPACE -DWITH_PROFILING=ON -DWITH_ASAN=ON -DWITH_CUDA=OFF -DFETCH_SPDLOG=ON
+      - name: Cache build directory
+        uses: actions/cache@v4
+        with:
+          path: ${{ github.workspace }}/build
+          key: build-cache-rocky-profiling-${{ github.ref }}
 
-    - name: Build every target
-      shell: bash
-      working-directory: ${{ github.workspace }}/build
-      run: cmake --build . --parallel $(nproc)
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{ github.workspace }}/build
+        run: cmake $GITHUB_WORKSPACE -DWITH_PROFILING=ON -DWITH_ASAN=ON -DWITH_CUDA=OFF -DFETCH_SPDLOG=ON
 
+      - name: Build every target
+        shell: bash
+        working-directory: ${{ github.workspace }}/build
+        run: cmake --build . --parallel $(nproc)
 
-## Tests ##
   test-examples-1:
-    name: Test Examples 1/4
+    name: Test Examples 1/4 - WSCC_9bus_mult_coupled
     needs: [profiling]
-    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
+    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@main
     with:
-      path: ./build/dpsim/examples/cxx/WSCC_9bus_mult_decoupled
-      name: WSCC_9bus_mult_decoupled
+      path: ./build/dpsim/examples/cxx/WSCC_9bus_mult_coupled
+      name: WSCC_9bus_mult_coupled
 
   test-examples-2:
-    name: Test Examples 2/4
+    name: Test Examples 2/4 - WSCC_9bus_mult_decoupled
     needs: [profiling]
-    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
+    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@main
     with:
-      path: ./build/dpsim/examples/cxx/WSCC_9bus_mult_coupled
-      name: WSCC_9bus_mult_coupled
+      path: ./build/dpsim/examples/cxx/WSCC_9bus_mult_decoupled
+      name: WSCC_9bus_mult_decoupled
 
   test-examples-3:
-    name: Test Examples 3/4
+    name: Test Examples 3/4 - EMT_WSCC_9bus_split_decoupled
     needs: [profiling]
-    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
+    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@main
     with:
       path: ./build/dpsim/examples/cxx/EMT_WSCC_9bus_split_decoupled
-      name: WSCC_9bus_split_decoupled
+      name: EMT_WSCC_9bus_split_decoupled
 
   test-examples-4:
-    name: Test Examples 4/4
+    name: Test Examples 4/4 - DP_WSCC_9bus_split_decoupled
     needs: [profiling]
-    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@${{github.ref}}
+    uses: sogno-platform/dpsim/.github/workflows/run_and_profile_example.yaml@main
     with:
       path: ./build/dpsim/examples/cxx/DP_WSCC_9bus_split_decoupled
-      name: WSCC_9bus_split_decoupled
+      name: DP_WSCC_9bus_split_decoupled

.github/workflows/build_test_windows.yaml

@@ -2,8 +2,9 @@ name: Build & Test Windows
 
 on:
   push:
+    branches:
+    - master
   pull_request:
-    types: [opened, synchronize, reopened]
 
 ## Build ##
 
@@ -31,5 +32,6 @@ jobs:
         cd ${{ github.workspace }}
         cd build
         git describe --tags --abbrev=0 --match "v*"
-        cmake -DWITH_PYBIND=OFF ..
+        # TODO: Remove '-DCMAKE_POLICY_VERSION_MINIMUM=3.5' once spdlog version has been bumped
+        cmake -DWITH_PYBIND=OFF -DCMAKE_POLICY_VERSION_MINIMUM="3.5" ..
         cmake --build . --target dpsim --parallel

.github/workflows/container.yaml

@@ -25,6 +25,7 @@ jobs:
          tags: sogno/dpsim:dev-rocky
 
   create-docker-fedora-release:
+    needs: create-docker-fedora-dev
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -104,3 +105,23 @@ jobs:
          push: true
          tags: sogno/dpsim:manylinux
 
+  create-docker-binder:
+    needs: create-docker-fedora-dev
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_SECRET }}
+
+      - name: Build and push
+        id: docker_build_release
+        uses: docker/build-push-action@v5
+        with:
+         file: .binder/Dockerfile
+         push: true
+         tags: sogno/dpsim:binder