Merge branch 'develop'

forsyde · Mar 15, 2024 · 87a7876 · 87a7876
2 parents ff1b049 + 6fb8be1
commit 87a7876
Show file tree

Hide file tree

Showing 111 changed files with 3,905 additions and 2,114 deletions.
diff --git a/.github/workflows/test-case-studies.yml b/.github/workflows/test-case-studies.yml
@@ -16,7 +16,8 @@ jobs:
     strategy:
       matrix:
         jdk_distributions: [temurin, corretto, zulu]
-        jdk_version: ["17", "19"]
+        jdk_version: ["17", "21"]
+      fail-fast: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -48,178 +49,4 @@ jobs:
           name: test case logs
           path: |
             log.html
-            report.html
-  #     - name: Cache-out java imodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/imodules
-  #         key: java-imodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-  #     - name: Cache-out java emodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/emodules
-  #         key: java-emodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-  # build-scala:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Build scala
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install -y curl bash build-essential libssl-dev pkg-config dos2unix
-  #         cd ${{ github.workspace }}
-
-  #     - name: Cache-out scala imodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/imodules
-  #         key: scala-imodules-${{ github.ref }}
-  #     - name: Cache-out scala emodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/emodules
-  #         key: scala-emodules-${{ github.ref }}
-  # build-rust:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Build rust
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install -y curl bash build-essential libssl-dev pkg-config mingw-w64 musl-dev musl-tools
-  #         cd ${{ github.workspace }}
-  #         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y 
-  #         source "$HOME/.cargo/env"
-  #         cargo build --release
-  #         cp ./target/release/idesyde-orchestration idesyde
-  #     - name: Cache-out rust
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/idesyde
-  #         key: idesyde-${{ github.ref }}
-  # test-on-linux:
-  #   strategy:
-  #     matrix:
-  #       jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
-  #   runs-on: ubuntu-latest
-  #   needs: [build-java, build-scala, build-rust]
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-python@v4
-  #       with:
-  #         python-version: '3.10'
-  #     - name: Cache-in java imodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/java-imodules
-  #         key: java-imodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-  #         restore-keys: |
-  #           java-imodules-${{ github.ref }}-
-  #           java-imodules-
-  #     - name: Cache-in java emodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/java-emodules
-  #         key: java-emodules-${{ github.ref }}-${{ matrix.jabba_jdk }}
-  #         restore-keys: |
-  #           java-emodules-${{ github.ref }}-
-  #           java-emodules-
-  #     - name: Cache-in scala imodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/scala-imodules
-  #         key: scala-imodules-${{ github.ref }}
-  #         restore-keys: |
-  #           scala-imodules-
-  #     - name: Cache-in scala emodules
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/scala-emodules
-  #         key: scala-emodules-${{ github.ref }}
-  #         restore-keys: |
-  #           scala-emodules-
-  #     - name: Cache-in rust
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: ${{ github.workspace }}/idesyde
-  #         key: idesyde-${{ github.ref }}
-  #     - name: Build and Test cases
-  #       continue-on-error: true
-  #       run: |
-  #         sudo apt-get update
-  #         sudo apt-get install -y curl bash build-essential libssl-dev pkg-config mingw-w64 musl-dev musl-tools dos2unix
-  #         cd ${{ github.workspace }}
-  #         mkdir -p imodules
-  #         mkdir -p emodules
-  #         cp -r java-imodules/* imodules/
-  #         cp -r scala-imodules/* imodules/
-  #         cp -r java-emodules/* emodules/
-  #         cp -r scala-emodules/* emodules/
-  #         python -m pip install robotframework
-  #         python -m robot --exclude slow TestsBenchmark.robot
-  #     - name: Upload Robot Log
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: test-build-log-${{ github.ref }}.html
-  #         path: log.html
-  #     - name: Cache-out outputs
-  #       uses: actions/cache@v3
-  #       with:
-  #         enableCrossOsArchive: true
-  #         path: ${{ github.workspace }}/dist
-  #         key: dist-${{ github.ref }}-${{ matrix.jabba_jdk }}
-  # test-cases-linux:
-  #   strategy:
-  #     matrix:
-  #       jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
-  #       target: [x86_64-unknown-linux-musl]
-  #   runs-on: ubuntu-latest
-  #   needs: build-on-linux
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Cache-in outputs
-  #       uses: actions/cache@v3
-  #       with:
-  #         enableCrossOsArchive: true
-  #         path: ${{ github.workspace }}/dist
-  #    dist-     key: ${{ github.ref }}-${{ matrix.jabba_jdk }}
-  #     - uses: actions/setup-python@v4
-  #       with:
-  #         python-version: '3.10' 
-  #     - run: |
-  #         cd ${{ github.workspace }}
-  #         cp -r ${{ github.workspace }}/dist/x86_64-unknown-linux-musl/* .
-  #         mkdir -p /opt/jdk
-  #         curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | JABBA_COMMAND="install ${{ matrix.jabba_jdk }} -o /opt/jdk" bash
-  #         export JAVA_HOME=/opt/jdk
-  #         export PATH="$JAVA_HOME/bin:$PATH"
-  #         python -m pip install robotframework
-  #         python -m robot --exclude slow TestsBenchmark.robot
-  # test-cases-win:
-  #   strategy:
-  #     matrix:
-  #       jabba_jdk: [temurin@17, amazon-corretto@17, zulu@17, microsoft@17]
-  #   runs-on: windows-latest
-  #   needs: build-on-linux
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-python@v4
-  #       with:
-  #         python-version: '3.10' 
-  #     - name: Cache-in outputs
-  #       uses: actions/cache@v3
-  #       with:
-  #         enableCrossOsArchive: true
-  #         path: ${{ github.workspace }}/dist
-  #    dist-     key: ${{ github.ref }}-${{ matrix.jabba_jdk }}
-  #     - run: |
-  #         cd ${{ github.workspace }}
-  #         cp -r ${{ github.workspace }}/dist/x86_64-pc-windows-gnu/* .
-  #         [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-  #         Invoke-Expression (
-  #           Invoke-WebRequest https://github.com/Jabba-Team/jabba/raw/master/install.ps1 -UseBasicParsing
-  #         ).Content
-  #         jabba install ${{ matrix.jabba_jdk }}
-  #         jabba alias default ${{ matrix.jabba_jdk }}
-  #         python -m pip install robotframework
-  #         python -m robot --exclude slow TestsBenchmark.robot
+            report.html
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,20 +1,26 @@
 [workspace]
 members = [
-    "rust-core",
-    "rust-orchestration",
-    "rust-blueprints",
-    "rust-common",
-    "rust-bridge-matlab-simulink"
+  "rust-core",
+  "rust-orchestration",
+  "rust-blueprints",
+  "rust-common",
+  "rust-bridge-matlab-simulink",
+  "rust-bridge-java",
+  # "rust-bridge-ortools"
 ]
 description = "IDeSyDe Rust suite"
+resolver = "2"
 
 [workspace.dependencies]
-base64 = "0.21.5"
+env_logger = "0.11.2"
+base64 = "0.22.0"
 ciborium = "0.2.1"
 clap = { version = "4.2.1", features = ["derive"] }
-derive_builder = "0.12.0"
+cxx = "1.0"
+cxx-build = "1.0"
+derive_builder = "0.20.0"
 downcast-rs = "1.2.0"
-env_logger = "0.10.0"
+jni = { version = "0.21.1", features = ["invocation"] }
 log = "0.4.17"
 md5 = "0.7.0"
 num = "0.4.1"
@@ -23,21 +29,25 @@ prost = "0.12"
 prost-build = "0.12"
 quote = "1.0.27"
 rayon = "1.7"
-reqwest = { version = "0.11.18", default-features = false, features = ["blocking", "rustls-tls", "json", "multipart"] }  
-reqwest-eventsource = "0.5.0"
+reqwest = { version = "0.11.18", default-features = false, features = [
+  "blocking",
+  "rustls-tls",
+  "json",
+  "multipart",
+] }
 rmp-serde = "1.1"
 schemars = "0.8.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha2 = "0.10.8"
 sha3 = "0.10.6"
 syn = "2.0.15"
-tungstenite = {version = "0.20.0", features = ["rustls"]}
+tungstenite = { version = "0.21.0", features = ["rustls"] }
 url = "2.4.1"
-
-
+rusqlite = { version = "0.31.0", features = ["bundled", "blob", "functions"] }
+zip = "0.6.6"
 
 [workspace.package]
-version = "0.6.2"
+version = "0.8.0"
 authors = ["Rodolfo Jordao"]
-edition = "2021"
+edition = "2021"
diff --git a/TestsBenchmark.robot b/TestsBenchmark.robot
@@ -155,10 +155,10 @@ Test for examples_and_benchmarks/PANORAMA/flight-information-function
 #    ${NumFound} =    IDeSyDeLibrary.Try Explore    examples_and_benchmarks/PANORAMA/radar-aesa-function
 #    Should Be Equal As Integers    ${NumFound}    0
 
-Test for examples_and_benchmarks/small_and_explainable/sobel_and_2core_devicetree
-    ${NumFound} =    IDeSyDeLibrary.Try Explore
-    ...    examples_and_benchmarks/small_and_explainable/sobel_and_2core_devicetree
-    Should Not Be Equal As Integers    ${NumFound}    0
+# Test for examples_and_benchmarks/small_and_explainable/sobel_and_2core_devicetree
+    # ${NumFound} =    IDeSyDeLibrary.Try Explore
+    # ...    examples_and_benchmarks/small_and_explainable/sobel_and_2core_devicetree
+    # Should Not Be Equal As Integers    ${NumFound}    0
 
 Test for examples_and_benchmarks/small_and_explainable/sobel_to_bus_multicore
     ${NumFound} =    IDeSyDeLibrary.Try Explore