preesm · hmiomand · Jun 24, 2024 · Mar 11, 2024 · Mar 11, 2024 · Mar 11, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,17 +1,19 @@
 name: Build & Test
 on:
   push:
-  #pull_request:
+  pull_request:
   schedule:
     - cron:  '0 7 * * MON'
-
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    # Prevent workflow from running twice when push to PR from main repo,
-    # maintains workflow run when PR from forked repo
-    #if: github.event_name != 'pull_request' ||
-    #  github.event.pull_request.head.repo.full_name !=
-    #  github.event.pull_request.base.repo.full_name
+    # Prevent workflow from running twice when push to PR from main repo, maintains workflow run when PR from forked repo
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: Build & Test
     strategy:
       matrix:
@@ -20,58 +22,78 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
+
       - name: Git Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
       - name: Set up Maven
-        uses: stCarolas/setup-maven@v4.5
+        uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.6.3
+
+      - name: Restore m2 cache # Only trigger on feature branch
+        if: github.ref != 'refs/heads/develop'
+        uses: actions/cache/restore@v4
+        with:
+          key: ${{ matrix.os }}-maven-m2- # This lookup will fail, the restore-keys entry will be used, falling back on the most recent cache
+          path: ~/.m2/repository
+          restore-keys: ${{ matrix.os }}-maven-m2-
+
       - name: Build & Test
         shell: bash
         run: releng/build_and_test.sh --ci
+
+      - name: Save m2 cache # Only trigger on develop unscheduled
+        if: github.ref == 'refs/heads/develop' && github.event.schedule != '0 7 * * MON'
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ matrix.os }}-maven-m2-${{ github.run_id }}
+
       - name: Analyze with SONAR
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: mvn -B -e -c -Dtycho.mode=maven jacoco:report -Djacoco.dataFile=../../target/jacoco.exec -Dsonar.projectKey=preesm_preesm -Dsonar.token=$SONAR_TOKEN sonar:sonar
-      # - name: Archive production artifacts
-      #   uses: actions/upload-artifact@v3
-      #   with:
-      #     name: preesm-products
-      #     path: releng/org.preesm.product/target/org.preesm.product-*.zip
+
       - name: Archive Linux product
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-products
           path: releng/org.preesm.product/target/products/preesm-*-linux.gtk.x86_64.zip
+
       - name: Archive macOS aarch64 product
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mac-aarch64-products
           path: releng/org.preesm.product/target/products/preesm-*-macosx.cocoa.aarch64.zip
+
       - name: Archive macOS x86_64 product
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: mac-x86-products
           path: releng/org.preesm.product/target/products/preesm-*-macosx.cocoa.x86_64.zip
+
       - name: Archive Windows product
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: windows-products
           path: releng/org.preesm.product/target/products/preesm-*-win32.win32.x86_64.zip
 
       - name: Generate changelog
+        if: github.ref == 'refs/heads/develop' && github.event.schedule != '0 7 * * MON'
         shell: bash
         run: git log $(git describe --tags --abbrev=0)..HEAD --oneline --no-decorate > dev-changelog.txt
 
       - name: Upload changelog
-        uses: actions/upload-artifact@v3
+        if: github.ref == 'refs/heads/develop' && github.event.schedule != '0 7 * * MON'
+        uses: actions/upload-artifact@v4
         with:
           name: changelog
           path: dev-changelog.txt
@@ -85,38 +107,41 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Download Linux artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: linux-products
+
       - name: Download Mac aarch64 artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mac-aarch64-products
+
       - name: Download Mac x86 artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: mac-x86-products
+
       - name: Download Windows artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: windows-products
 
       - name: Download changelog
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: changelog
 
-      # - name: Display structure of downloaded files
-      #   run: ls -R
       - name: Generate release tag
         id: tag
         run: |
           echo "release_tag=DevBuild_$(date +"%Y.%m.%d_%H-%M")" >> $GITHUB_OUTPUT
+
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           fail_on_unmatched_files: true
-          prerelease: true
+          draft: true
+          prerelease: false
           tag_name: ${{ steps.tag.outputs.release_tag }}
           #body: Check commit history for detailled changes.
           body_path: dev-changelog.txt

diff --git a/plugins/org.preesm.algorithm/META-INF/MANIFEST.MF b/plugins/org.preesm.algorithm/META-INF/MANIFEST.MF
@@ -18,17 +18,14 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ui.forms,
  wrapped.net.sourceforge.jexcelapi.jxl,
  org.jgrapht.core;bundle-version="1.5.1";visibility:=reexport,
- wrapped.com.github.yannrichet.JMathArray;bundle-version="1.0.0",
  org.apache.commons.lang3,
  org.eclipse.xtend.lib;bundle-version="2.15.0";visibility:=reexport,
  org.eclipse.xtext.util;bundle-version="2.15.0",
  wrapped.org.ojalgo.ojalgo;bundle-version="44.0.0",
- wrapped.jfree.jcommon;bundle-version="1.0.16",
+ wrapped.org.jfree.jcommon;bundle-version="1.0.24",
  wrapped.org.jfree.jfreechart,
- wrapped.gov.nist.math.jama;bundle-version="1.0.3",
  wrapped.org.jacorb.jacorb-idl-compiler,
  com.fasterxml.jackson.core.jackson-core,
- com.fasterxml.jackson.module.jackson-module-jsonSchema,
  com.fasterxml.jackson.core.jackson-annotations,
  com.fasterxml.jackson.core.jackson-databind,
  org.preesm.workflow;visibility:=reexport,

diff --git a/plugins/org.preesm.algorithm/src/org/preesm/algorithm/clustering/ClusteringHelper.java b/plugins/org.preesm.algorithm/src/org/preesm/algorithm/clustering/ClusteringHelper.java
@@ -88,7 +88,7 @@ private ClusteringHelper() {
    *
    */
   public static final List<DataInputPort> getExternalyConnectedPorts(final Schedule cluster) {
-    List<DataInputPort> res = new ArrayList<>();
+    final List<DataInputPort> res = new ArrayList<>();
     final List<AbstractActor> actors = ScheduleUtil.getAllReferencedActors(cluster);
     for (final AbstractActor actor : actors) {
       final EList<DataInputPort> dataInputPorts = actor.getDataInputPorts();
@@ -115,7 +115,7 @@ public static final List<DataInputPort> getExternalyConnectedPorts(final Schedul
    */
   public static final boolean isActorDelayed(AbstractActor actor) {
     // Retrieve every Fifo with delay connected to actor
-    for (DataPort dp : actor.getAllDataPorts()) {
+    for (final DataPort dp : actor.getAllDataPorts()) {
       if (dp.getFifo().getDelay() != null) {
         return true;
       }
@@ -132,11 +132,10 @@ public static final boolean isActorDelayed(AbstractActor actor) {
    */
   public static final long getParallelismDepth(Schedule schedule, long iterator) {
 
-    if (schedule instanceof HierarchicalSchedule) {
-      HierarchicalSchedule hierSchedule = (HierarchicalSchedule) schedule;
+    if (schedule instanceof final HierarchicalSchedule hierSchedule) {
       long maxDepth = iterator;
       long tmpIterator;
-      for (Schedule child : hierSchedule.getChildren()) {
+      for (final Schedule child : hierSchedule.getChildren()) {
         tmpIterator = getParallelismDepth(child, iterator);
         if (tmpIterator > maxDepth) {
           maxDepth = tmpIterator;
@@ -162,20 +161,20 @@ public static final long getMemorySpaceNeededFor(Schedule schedule) {
     long result = 0;
     if (schedule instanceof HierarchicalSchedule) {
       // Add memory space needed for children in result
-      for (Schedule child : schedule.getChildren()) {
+      for (final Schedule child : schedule.getChildren()) {
         result += getMemorySpaceNeededFor(child);
       }
       // If it is a parallel hierarchical schedule with no attached actor, multiply child memory space result by the
       // repetition of it
       if (!schedule.hasAttachedActor()) {
-        long rep = schedule.getRepetition();
+        final long rep = schedule.getRepetition();
         result *= rep;
       } else {
         // Estimate every internal buffer size
-        PiGraph graph = (PiGraph) ((HierarchicalSchedule) schedule).getAttachedActor();
-        List<Fifo> fifos = ClusteringHelper.getInternalClusterFifo(graph);
-        Map<AbstractVertex, Long> brv = PiBRV.compute(graph, BRVMethod.LCM);
-        for (Fifo fifo : fifos) {
+        final PiGraph graph = (PiGraph) ((HierarchicalSchedule) schedule).getAttachedActor();
+        final List<Fifo> fifos = ClusteringHelper.getInternalClusterFifo(graph);
+        final Map<AbstractVertex, Long> brv = PiBRV.compute(graph, BRVMethod.LCM);
+        for (final Fifo fifo : fifos) {
           result += brv.get(fifo.getSource()) * fifo.getSourcePort().getExpression().evaluate();
         }
       }
@@ -197,8 +196,8 @@ public static final long getExecutionTimeOf(Schedule schedule, Scenario scenario
     } else {
       // Retrieve timing from actors
       final List<AbstractActor> actors = ScheduleUtil.getAllReferencedActors(schedule);
-      AbstractActor actor = actors.get(0);
-      long actorTiming = scenario.getTimings().evaluateExecutionTimeOrDefault(actor, component);
+      final AbstractActor actor = actors.get(0);
+      final long actorTiming = scenario.getTimings().evaluateExecutionTimeOrDefault(actor, component);
       timing = schedule.getRepetition() * actorTiming;
     }
 
@@ -210,15 +209,15 @@ private static long getExecutionTimeOfHierarchical(Schedule schedule, Scenario s
     // If schedule is sequential
     if (schedule instanceof SequentialSchedule) {
       // Sum timings of all childrens together
-      for (Schedule child : schedule.getChildren()) {
+      for (final Schedule child : schedule.getChildren()) {
         timing += getExecutionTimeOf(child, scenario, component);
       }
     } else {
       // If schedule is parallel
       // Search for the maximun time taken by childrens
       long max = 0;
-      for (Schedule child : schedule.getChildren()) {
-        long result = getExecutionTimeOf(child, scenario, component);
+      for (final Schedule child : schedule.getChildren()) {
+        final long result = getExecutionTimeOf(child, scenario, component);
         if (result > max) {
           max = result;
         }
@@ -264,10 +263,9 @@ public static Fifo getOutsideIncomingFifo(final Fifo inFifo) {
     final AbstractActor sourceActor = (AbstractActor) inFifo.getSource();
     if (sourceActor instanceof DataInputInterface) {
       return ((DataInputPort) ((DataInputInterface) sourceActor).getGraphPort()).getIncomingFifo();
-    } else {
-      throw new PreesmRuntimeException(
-          "ClusteringHelper: cannot find outside-cluster incoming fifo from " + inFifo.getTarget());
     }
+    throw new PreesmRuntimeException(
+        "ClusteringHelper: cannot find outside-cluster incoming fifo from " + inFifo.getTarget());
   }
 
   /**
@@ -281,10 +279,9 @@ public static Fifo getOutsideOutgoingFifo(final Fifo inFifo) {
     final AbstractActor targetActor = (AbstractActor) inFifo.getTarget();
     if (targetActor instanceof DataOutputInterface) {
       return ((DataOutputPort) ((DataOutputInterface) targetActor).getGraphPort()).getOutgoingFifo();
-    } else {
-      throw new PreesmRuntimeException(
-          "ClusteringHelper: cannot find outside-cluster outgoing fifo from " + inFifo.getSource());
     }
+    throw new PreesmRuntimeException(
+        "ClusteringHelper: cannot find outside-cluster outgoing fifo from " + inFifo.getSource());
   }
 
   /**
@@ -298,9 +295,8 @@ public static Parameter getSetterParameter(final ConfigInputPort port) {
     final ISetter setter = port.getIncomingDependency().getSetter();
     if (setter instanceof ConfigInputInterface) {
       return getSetterParameter(((ConfigInputInterface) port.getIncomingDependency().getSetter()).getGraphPort());
-    } else {
-      return (Parameter) setter;
     }
+    return (Parameter) setter;
   }
 
   /**
@@ -314,7 +310,7 @@ public static Parameter getSetterParameter(final ConfigInputPort port) {
    */
   public static List<Pair<AbstractActor, AbstractActor>> getClusterizableCouples(final PiGraph graph,
       final Map<AbstractVertex, Long> brv, Scenario scenario) {
-    List<Pair<AbstractActor, AbstractActor>> couples = PiSDFMergeabilty.getConnectedCouple(graph, brv);
+    final List<Pair<AbstractActor, AbstractActor>> couples = PiSDFMergeabilty.getConnectedCouple(graph, brv);
     // Remove couples of actors that are not in the same constraints
     ClusteringHelper.removeConstrainedCouples(couples, scenario);
     return couples;
@@ -327,11 +323,10 @@ public static List<Pair<AbstractActor, AbstractActor>> getClusterizableCouples(f
    *          scenario
    */
   public static void removeConstrainedCouples(List<Pair<AbstractActor, AbstractActor>> couples, Scenario scenario) {
-    List<Pair<AbstractActor, AbstractActor>> tmpCouples = new LinkedList<>();
-    tmpCouples.addAll(couples);
+    final List<Pair<AbstractActor, AbstractActor>> tmpCouples = new LinkedList<>(couples);
     couples.clear();
-    for (Pair<AbstractActor, AbstractActor> couple : tmpCouples) {
-      List<ComponentInstance> componentList = getListOfCommonComponent(
+    for (final Pair<AbstractActor, AbstractActor> couple : tmpCouples) {
+      final List<ComponentInstance> componentList = getListOfCommonComponent(
           Arrays.asList(couple.getLeft(), couple.getRight()), scenario);
       if (!componentList.isEmpty()) {
         couples.add(couple);
@@ -347,10 +342,9 @@ public static void removeConstrainedCouples(List<Pair<AbstractActor, AbstractAct
    * @return List of components
    */
   public static List<ComponentInstance> getListOfCommonComponent(List<AbstractActor> actorList, Scenario scenario) {
-    List<ComponentInstance> globalList = new LinkedList<>();
-    globalList.addAll(scenario.getPossibleMappings(actorList.get(0)));
-    for (AbstractActor actor : actorList) {
-      List<ComponentInstance> componentList = scenario.getPossibleMappings(actor);
+    final List<ComponentInstance> globalList = new LinkedList<>(scenario.getPossibleMappings(actorList.get(0)));
+    for (final AbstractActor actor : actorList) {
+      final List<ComponentInstance> componentList = scenario.getPossibleMappings(actor);
       globalList.retainAll(componentList);
     }
     return globalList;