Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.5.3 updates #24

Merged
merged 6 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,36 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019,macos-11,ubuntu-20.04]
os: [windows-2019,macos-13,ubuntu-20.04]
runs-on: ${{ matrix.os }}
steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install latest HELICS release
uses: gmlc-tdc/helics-action/install@main
- name: Set up MATLAB
uses: matlab-actions/setup-matlab@v1.1.1
uses: matlab-actions/setup-matlab@v2.2.0
with:
release: R2021a
release: R2023b
- name: Set up MEX
uses: matlab-actions/run-command@v1
uses: matlab-actions/run-command@v2
with:
command: mex -setup
- name: Build matHELICS
uses: matlab-actions/run-command@v1
uses: matlab-actions/run-command@v2
with:
command: buildHelicsInterface('helics',true)
- name: store package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-matHELICS
path: matHELICS.*
- name: run startup
uses: matlab-actions/run-command@v1
uses: matlab-actions/run-command@v2
with:
command: addpath('helics'), helicsStartup
- name: run tests
uses: matlab-actions/run-command@v1
uses: matlab-actions/run-command@v2
with:
command: addpath('tests'),addpath('helics'),runAllTests

2 changes: 1 addition & 1 deletion buildHelicsInterface.m
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function buildHelicsInterface(targetPath,makePackage)
end
inputPath=fileparts(mfilename('fullpath'));
isOctave = (exist('OCTAVE_VERSION', 'builtin') ~= 0);
HelicsVersion='3.5.2';
HelicsVersion='3.5.3';
% set up platform specific names and locations
targetTarFile=fullfile(targetPath,['helicsTar',HelicsVersion,'.tar.gz']);
if ismac
Expand Down
1 change: 1 addition & 0 deletions matlabBindings/+helics/HelicsFederateFlags.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
% HELICS_FLAG_SINGLE_THREAD_FEDERATE: value:27 flag indicating that the federate will only interact on a single thread
% HELICS_FLAG_MULTI_THREAD_CORE: value:28 flag indicating use of a thread safe core
% HELICS_FLAG_SINGLE_THREAD_CORE: value:29 flag indicating use of a single threaded core
% HELICS_FLAG_REENTRANT: value:38 flag indicating the federate can be reentrant
% HELICS_FLAG_IGNORE_TIME_MISMATCH_WARNINGS: value:67 used to not display warnings on mismatched requested times
% HELICS_FLAG_STRICT_CONFIG_CHECKING: value:75 specify that checking on configuration files should be strict and throw and error on any invalid values
% HELICS_FLAG_USE_JSON_SERIALIZATION: value:79 specify that the federate should use json serialization for all data types
Expand Down
1 change: 1 addition & 0 deletions matlabBindings/+helics/HelicsHandleOptions.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
% HELICS_HANDLE_OPTION_SINGLE_CONNECTION_ONLY: value:407 specify that only a single connection is allowed for an interface
% HELICS_HANDLE_OPTION_MULTIPLE_CONNECTIONS_ALLOWED: value:409 specify that multiple connections are allowed for an interface
% HELICS_HANDLE_OPTION_BUFFER_DATA: value:411 specify that the last data should be buffered and sent on subscriptions after init
% HELICS_HANDLE_OPTION_RECONNECTABLE: value:412 specify that the handle can be reconnected for reentrant federates
% HELICS_HANDLE_OPTION_STRICT_TYPE_CHECKING: value:414 specify that the types should be checked strictly for pub/sub and filters
% HELICS_HANDLE_OPTION_RECEIVE_ONLY: value:422 specify that the handle is receive only
% HELICS_HANDLE_OPTION_SOURCE_ONLY: value:423 specify that the handle is source only
Expand Down
92 changes: 92 additions & 0 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[tool.poetry]
name = "mathelics"
version = "0.1.0"
description = ""
authors = ["afisher1"]
readme = "README.md"

[tool.poetry.dependencies]
python = "^3.10"
cffi = "^1.15.1"
clang = "14"


[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"