Skip to content

Commit fa773b8

Browse files
fix #665 parfeval with background thread pool)
* parallel module template * allow to assign in handle array * allows overload struct(handle) and fieldnames(handle) if available * do not allow to concate handle with different category * handle display header * fetchOutputs * changelog 0.6.6 * 0.6.6.x family * backgroundPool, fetchOutputs, parfeval help files * codacy warnings * CodeQL warning
1 parent 5787a74 commit fa773b8

File tree

256 files changed

+5378
-1284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+5378
-1284
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7-
## 0.6.X (UNRELEASED)
7+
## 0.6.6 (UNRELEASED)
88

99
### Added
1010

11+
- Parallel functions (part 1):
12+
13+
- `parfeval`: Run function on parallel background thread pool worker.
14+
- `backgroundPool`: Environment for running code in the background.
15+
- `fetchOutputs`: Retrieve results from function running in the background.
16+
1117
- [#666](http://github.com/Nelson-numerical-software/nelson/issues/666): `ls` function: List folder contents.
1218

1319
- [#655](http://github.com/Nelson-numerical-software/nelson/issues/655): help viewer embedded (available on all platforms).
@@ -20,6 +26,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
2026

2127
- [#668](http://github.com/Nelson-numerical-software/nelson/issues/668): `maxNumCompThreads` detects numbers of physical cores on Windows.
2228

29+
- matrix of handles supported.
30+
2331
### Fixed
2432

2533
- [#659](http://github.com/Nelson-numerical-software/nelson/issues/659): qhelpgenerator on macOs after brew Qt6.3.0 update.

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ project(Nelson)
2222
# ==============================================================================
2323
set(Nelson_VERSION_MAJOR_DEFAULT 0)
2424
set(Nelson_VERSION_MINOR_DEFAULT 6)
25-
set(Nelson_VERSION_MAINTENANCE_DEFAULT 5)
25+
set(Nelson_VERSION_MAINTENANCE_DEFAULT 6)
2626
set(Nelson_VERSION_BUILD_DEFAULT 0)
2727
# ==============================================================================
2828
if(NOT DEFINED CMAKE_INSTALL_PREFIX)

NelSon.sln

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29728.190
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32421.90
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NelSon-gui", "modules\main\nelson_gui\NelSon-gui.vcxproj", "{F34BD496-D9B3-4C25-A9E9-C91EB3E35C12}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -75,6 +75,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NelSon-cli", "modules\main\
7575
{34B4A66D-9703-400E-9F00-B595F8C72808} = {34B4A66D-9703-400E-9F00-B595F8C72808}
7676
{221D076E-3B43-42CC-8EE7-159424BE4CF2} = {221D076E-3B43-42CC-8EE7-159424BE4CF2}
7777
{EA091C71-85C9-417A-B5AA-211455D6FC79} = {EA091C71-85C9-417A-B5AA-211455D6FC79}
78+
{8620B873-E578-4F09-A46C-00539356604E} = {8620B873-E578-4F09-A46C-00539356604E}
7879
{D8992275-39D6-486D-AEA8-445E49B419E8} = {D8992275-39D6-486D-AEA8-445E49B419E8}
7980
{EF054E75-90E8-46B3-AA42-F1C424F0DC3C} = {EF054E75-90E8-46B3-AA42-F1C424F0DC3C}
8081
{A510477A-3415-4E46-8C98-8579823ADF91} = {A510477A-3415-4E46-8C98-8579823ADF91}
@@ -124,6 +125,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NelSon-cli", "modules\main\
124125
{59D86CCC-61D2-4BB7-80C0-E0CCB668AA7F} = {59D86CCC-61D2-4BB7-80C0-E0CCB668AA7F}
125126
{AC0F66CE-C661-4D56-8FE7-8D0AE72E5BF9} = {AC0F66CE-C661-4D56-8FE7-8D0AE72E5BF9}
126127
{78B885D2-1630-42DE-9829-E791D77BB175} = {78B885D2-1630-42DE-9829-E791D77BB175}
128+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA} = {B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}
127129
{5E1776D7-EDDC-4AA7-A085-BAEFA057D5EB} = {5E1776D7-EDDC-4AA7-A085-BAEFA057D5EB}
128130
{F6495DD9-6FF5-485B-9393-767327A4DD79} = {F6495DD9-6FF5-485B-9393-767327A4DD79}
129131
{3389E1DA-B13E-46E0-A6BF-67E7D207ABAB} = {3389E1DA-B13E-46E0-A6BF-67E7D207ABAB}
@@ -451,6 +453,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsDisplay_format", "module
451453
EndProject
452454
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsDisplay_format_builtin", "modules\display_format\builtin\c\nlsDisplay_format_builtin.vcxproj", "{C2034CB9-7ACD-4B87-9F89-DDFE0FDECC62}"
453455
EndProject
456+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsParallel", "modules\parallel\src\c\nlsParallel.vcxproj", "{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}"
457+
EndProject
458+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsParallel_builtin", "modules\parallel\builtin\c\nlsParallel_builtin.vcxproj", "{8620B873-E578-4F09-A46C-00539356604E}"
459+
EndProject
454460
Global
455461
GlobalSection(SolutionConfigurationPlatforms) = preSolution
456462
Debug|Win32 = Debug|Win32
@@ -1559,6 +1565,22 @@ Global
15591565
{C2034CB9-7ACD-4B87-9F89-DDFE0FDECC62}.Release|Win32.Build.0 = Release|Win32
15601566
{C2034CB9-7ACD-4B87-9F89-DDFE0FDECC62}.Release|x64.ActiveCfg = Release|x64
15611567
{C2034CB9-7ACD-4B87-9F89-DDFE0FDECC62}.Release|x64.Build.0 = Release|x64
1568+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Debug|Win32.ActiveCfg = Debug|Win32
1569+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Debug|Win32.Build.0 = Debug|Win32
1570+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Debug|x64.ActiveCfg = Debug|x64
1571+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Debug|x64.Build.0 = Debug|x64
1572+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Release|Win32.ActiveCfg = Release|Win32
1573+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Release|Win32.Build.0 = Release|Win32
1574+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Release|x64.ActiveCfg = Release|x64
1575+
{B472F9D3-B1A1-44AE-8C50-4CCE4520E2AA}.Release|x64.Build.0 = Release|x64
1576+
{8620B873-E578-4F09-A46C-00539356604E}.Debug|Win32.ActiveCfg = Debug|Win32
1577+
{8620B873-E578-4F09-A46C-00539356604E}.Debug|Win32.Build.0 = Debug|Win32
1578+
{8620B873-E578-4F09-A46C-00539356604E}.Debug|x64.ActiveCfg = Debug|x64
1579+
{8620B873-E578-4F09-A46C-00539356604E}.Debug|x64.Build.0 = Debug|x64
1580+
{8620B873-E578-4F09-A46C-00539356604E}.Release|Win32.ActiveCfg = Release|Win32
1581+
{8620B873-E578-4F09-A46C-00539356604E}.Release|Win32.Build.0 = Release|Win32
1582+
{8620B873-E578-4F09-A46C-00539356604E}.Release|x64.ActiveCfg = Release|x64
1583+
{8620B873-E578-4F09-A46C-00539356604E}.Release|x64.Build.0 = Release|x64
15621584
EndGlobalSection
15631585
GlobalSection(SolutionProperties) = preSolution
15641586
HideSolutionNode = FALSE

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 0.6.5.{build}
1+
version: 0.6.6.{build}
22
image: Visual Studio 2022
33

44
environment:

modules/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ list(
7979
ipc
8080
statistics
8181
validators
82-
polynomial_functions)
82+
polynomial_functions
83+
parallel)
8384
list(APPEND moduleslist main)
8485
# ==============================================================================
8586
if (NOT LGPL21_ONLY)

modules/api_nelson/src/c/resources.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ END
4848
//
4949

5050
VS_VERSION_INFO VERSIONINFO
51-
FILEVERSION 0,6,5,0
52-
PRODUCTVERSION 0,6,5,0
51+
FILEVERSION 0,6,6,0
52+
PRODUCTVERSION 0,6,6,0
5353
FILEFLAGSMASK 0x17L
5454
#ifdef _DEBUG
5555
FILEFLAGS 0x1L
@@ -68,8 +68,8 @@ BEGIN
6868
VALUE "InternalName", "api_nelson"
6969
VALUE "OriginalFilename", "libnlsapi_nelson.dll"
7070
VALUE "ProductName", "Nelson (api_nelson)"
71-
VALUE "ProductVersion", "0,6,5,0"
72-
VALUE "FileVersion", "0,6,5,0"
71+
VALUE "ProductVersion", "0,6,6,0"
72+
VALUE "FileVersion", "0,6,6,0"
7373
VALUE "LegalCopyright", "Nelson Copyright (C) 2016-present"
7474
VALUE "Comments", "All rights reserved."
7575
VALUE "CompanyName", "Allan CORNET"

modules/assert_functions/builtin/c/resources.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ END
4848
//
4949

5050
VS_VERSION_INFO VERSIONINFO
51-
FILEVERSION 0,6,5,0
52-
PRODUCTVERSION 0,6,5,0
51+
FILEVERSION 0,6,6,0
52+
PRODUCTVERSION 0,6,6,0
5353
FILEFLAGSMASK 0x17L
5454
#ifdef _DEBUG
5555
FILEFLAGS 0x1L
@@ -68,8 +68,8 @@ BEGIN
6868
VALUE "InternalName", "assert_functions_builtin"
6969
VALUE "OriginalFilename", "libnlsassert_functions_builtin.dll"
7070
VALUE "ProductName", "Nelson (assert_functions_builtin)"
71-
VALUE "ProductVersion", "0,6,5,0"
72-
VALUE "FileVersion", "0,6,5,0"
71+
VALUE "ProductVersion", "0,6,6,0"
72+
VALUE "FileVersion", "0,6,6,0"
7373
VALUE "LegalCopyright", "Nelson Copyright (C) 2016-present"
7474
VALUE "Comments", "All rights reserved."
7575
VALUE "CompanyName", "Allan CORNET"

modules/assert_functions/src/c/resources.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ END
4848
//
4949

5050
VS_VERSION_INFO VERSIONINFO
51-
FILEVERSION 0,6,5,0
52-
PRODUCTVERSION 0,6,5,0
51+
FILEVERSION 0,6,6,0
52+
PRODUCTVERSION 0,6,6,0
5353
FILEFLAGSMASK 0x17L
5454
#ifdef _DEBUG
5555
FILEFLAGS 0x1L
@@ -68,8 +68,8 @@ BEGIN
6868
VALUE "InternalName", "assert_functions"
6969
VALUE "OriginalFilename", "libnlsassert_functions.dll"
7070
VALUE "ProductName", "Nelson (assert_functions)"
71-
VALUE "ProductVersion", "0,6,5,0"
72-
VALUE "FileVersion", "0,6,5,0"
71+
VALUE "ProductVersion", "0,6,6,0"
72+
VALUE "FileVersion", "0,6,6,0"
7373
VALUE "LegalCopyright", "Nelson Copyright (C) 2016-present"
7474
VALUE "Comments", "All rights reserved."
7575
VALUE "CompanyName", "Allan CORNET"

modules/audio/builtin/c/resources.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ END
4848
//
4949

5050
VS_VERSION_INFO VERSIONINFO
51-
FILEVERSION 0,6,5,0
52-
PRODUCTVERSION 0,6,5,0
51+
FILEVERSION 0,6,6,0
52+
PRODUCTVERSION 0,6,6,0
5353
FILEFLAGSMASK 0x17L
5454
#ifdef _DEBUG
5555
FILEFLAGS 0x1L
@@ -68,8 +68,8 @@ BEGIN
6868
VALUE "InternalName", "audio_builtin"
6969
VALUE "OriginalFilename", "libnlsaudio_builtin.dll"
7070
VALUE "ProductName", "Nelson (audio_builtin)"
71-
VALUE "ProductVersion", "0,6,5,0"
72-
VALUE "FileVersion", "0,6,5,0"
71+
VALUE "ProductVersion", "0,6,6,0"
72+
VALUE "FileVersion", "0,6,6,0"
7373
VALUE "LegalCopyright", "Nelson Copyright (C) 2016-present"
7474
VALUE "Comments", "All rights reserved."
7575
VALUE "CompanyName", "Allan CORNET"

modules/audio/builtin/cpp/audioplayer_getBuiltin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Nelson::AudioGateway::audioplayer_getBuiltin(int nLhs, const ArrayOfVector& argI
3030
auto* objPlayer = (AudioplayerObject*)param1.getContentAsHandleScalar();
3131
ArrayOf res;
3232
if (!objPlayer->get(propertyName, res)) {
33-
Error(ERROR_WRONG_ARGUMENT_2_VALUE);
33+
Error(ERROR_WRONG_ARGUMENT_2_VALUE + L" " + propertyName);
3434
}
3535
retval << res;
3636
return retval;

0 commit comments

Comments
 (0)