Skip to content

Commit

Permalink
fix #385, #388 statistics module
Browse files Browse the repository at this point in the history
  • Loading branch information
Nelson-numerical-software committed Jan 1, 2021
1 parent 4b0665b commit 0957ceb
Show file tree
Hide file tree
Showing 52 changed files with 1,275 additions and 78 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,12 @@
# 0.5.XX (2021-01-XX)

## Bug Fixes:

- [#388](http://github.com/Nelson-numerical-software/nelson/issues/388): Windows x64 build failed (elementary_functions module was too big).


- [#385](http://github.com/Nelson-numerical-software/nelson/issues/385): `corrcoef`, `mean`, `var`, `cov` moved in statistics module.

## Compilation:

- 0.5 family (CHANGELOG)
Expand Down
22 changes: 22 additions & 0 deletions NelSon.sln
Expand Up @@ -38,6 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NelSon-cli", "modules\main\
{964FF907-D58A-48B6-A03B-3F6CF48CBE41} = {964FF907-D58A-48B6-A03B-3F6CF48CBE41}
{17135B09-BC25-448E-9750-C09A87FDE6F8} = {17135B09-BC25-448E-9750-C09A87FDE6F8}
{31EFFD09-DC10-4163-BC2F-4F285F96A7D6} = {31EFFD09-DC10-4163-BC2F-4F285F96A7D6}
{9AC8560A-9E4C-4430-9938-63D6377890EB} = {9AC8560A-9E4C-4430-9938-63D6377890EB}
{A52B940C-3987-4DB4-9785-45CBBE5D0B23} = {A52B940C-3987-4DB4-9785-45CBBE5D0B23}
{7EAA9510-D91B-41A7-B27D-B4994B6EF069} = {7EAA9510-D91B-41A7-B27D-B4994B6EF069}
{636D4715-9889-4A8E-9404-3B05CB7734D1} = {636D4715-9889-4A8E-9404-3B05CB7734D1}
Expand Down Expand Up @@ -91,6 +92,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NelSon-cli", "modules\main\
{1BF47B95-0985-4267-9644-A50C7E186C47} = {1BF47B95-0985-4267-9644-A50C7E186C47}
{2391A997-6A1F-49EF-8A7A-92769F13B1F7} = {2391A997-6A1F-49EF-8A7A-92769F13B1F7}
{AB85E897-56B7-4792-8A8E-F3797BE2B7CC} = {AB85E897-56B7-4792-8A8E-F3797BE2B7CC}
{0C41339D-F889-4C5F-9D0C-689605FC43C2} = {0C41339D-F889-4C5F-9D0C-689605FC43C2}
{DDCCE99F-2EB8-4692-9E79-84F5FE42B7DE} = {DDCCE99F-2EB8-4692-9E79-84F5FE42B7DE}
{9067DFA1-CE20-4CAA-97E2-34D3C6A2AD7D} = {9067DFA1-CE20-4CAA-97E2-34D3C6A2AD7D}
{B1129CA6-B4DE-43D1-84C9-C1C7F0787E5E} = {B1129CA6-B4DE-43D1-84C9-C1C7F0787E5E}
Expand Down Expand Up @@ -418,6 +420,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsIpc", "modules\ipc\src\c
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsIpc_builtin", "modules\ipc\builtin\c\nlsIpc_builtin.vcxproj", "{20244504-06DA-42F2-9DF1-21740C2054F3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsStatistics", "modules\statistics\src\c\nlsStatistics.vcxproj", "{9AC8560A-9E4C-4430-9938-63D6377890EB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsStatistics_builtin", "modules\statistics\builtin\c\nlsStatistics_builtin.vcxproj", "{0C41339D-F889-4C5F-9D0C-689605FC43C2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -1438,6 +1444,22 @@ Global
{20244504-06DA-42F2-9DF1-21740C2054F3}.Release|Win32.Build.0 = Release|Win32
{20244504-06DA-42F2-9DF1-21740C2054F3}.Release|x64.ActiveCfg = Release|x64
{20244504-06DA-42F2-9DF1-21740C2054F3}.Release|x64.Build.0 = Release|x64
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Debug|Win32.ActiveCfg = Debug|Win32
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Debug|Win32.Build.0 = Debug|Win32
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Debug|x64.ActiveCfg = Debug|x64
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Debug|x64.Build.0 = Debug|x64
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Release|Win32.ActiveCfg = Release|Win32
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Release|Win32.Build.0 = Release|Win32
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Release|x64.ActiveCfg = Release|x64
{9AC8560A-9E4C-4430-9938-63D6377890EB}.Release|x64.Build.0 = Release|x64
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Debug|Win32.ActiveCfg = Debug|Win32
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Debug|Win32.Build.0 = Debug|Win32
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Debug|x64.ActiveCfg = Debug|x64
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Debug|x64.Build.0 = Debug|x64
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Release|Win32.ActiveCfg = Release|Win32
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Release|Win32.Build.0 = Release|Win32
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Release|x64.ActiveCfg = Release|x64
{0C41339D-F889-4C5F-9D0C-689605FC43C2}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 3 additions & 2 deletions appveyor.yml
Expand Up @@ -16,14 +16,15 @@ platform:
- x64

#init:
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
# - ps: $blockRdp = $true

install:
- ps: (new-object net.webclient).DownloadFile("https://download.microsoft.com/download/4/A/6/4A6AAED8-200C-457C-AB86-37505DE4C90D/msmpisetup.exe", "C:\build_chain\MSMpiSetup.exe")
- C:/build_chain/MSMpiSetup.exe -unattend -minimal
- set PATH=C:\Program Files\Microsoft MPI\Bin;%PATH%
- SET PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\15.0\Bin\;C:\Program Files (x86)\Inno Setup 6;%PATH%
- SET sePreferredToolArchitecture=x64
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %platform%

before_build:
Expand All @@ -36,7 +37,7 @@ before_build:

build_script:
- cd "c:\build_chain\nelson"
- msbuild nelson.sln /p:Configuration=Release /p:Platform=%NELSON_PLATFORM% /target:"NelSon-gui" /m:4
- msbuild nelson.sln /p:Configuration=Release /p:Platform=%NELSON_PLATFORM% /target:"NelSon-gui" /m:4

after_build:
- if %platform%==x64 (set GENERATED_EXE=Nelson-%APPVEYOR_BUILD_VERSION%-x86-64.exe) else (set GENERATED_EXE=Nelson-%APPVEYOR_BUILD_VERSION%-x86-32.exe)
Expand Down
3 changes: 2 additions & 1 deletion modules/CMakeLists.txt
Expand Up @@ -88,7 +88,8 @@ list(
webtools
graphics
mex
ipc)
ipc
statistics)
list(APPEND moduleslist main)
# ==============================================================================
if(NOT WITHOUT_FFTW AND NOT LGPL21_ONLY)
Expand Down
Expand Up @@ -179,7 +179,6 @@
<ClCompile Include="..\cpp\colonBuiltin.cpp" />
<ClCompile Include="..\cpp\complexBuiltin.cpp" />
<ClCompile Include="..\cpp\conjBuiltin.cpp" />
<ClCompile Include="..\cpp\corrcoefBuiltin.cpp" />
<ClCompile Include="..\cpp\ctransposeBuiltin.cpp" />
<ClCompile Include="..\cpp\dec2baseBuiltin.cpp" />
<ClCompile Include="..\cpp\dispBuiltin.cpp" />
Expand Down Expand Up @@ -215,7 +214,6 @@
<ClCompile Include="..\cpp\logBuiltin.cpp" />
<ClCompile Include="..\cpp\ltBuiltin.cpp" />
<ClCompile Include="..\cpp\maxBuiltin.cpp" />
<ClCompile Include="..\cpp\meanBuiltin.cpp" />
<ClCompile Include="..\cpp\minBuiltin.cpp" />
<ClCompile Include="..\cpp\minusBuiltin.cpp" />
<ClCompile Include="..\cpp\mldivideBuiltin.cpp" />
Expand Down Expand Up @@ -251,7 +249,6 @@
<ClCompile Include="..\cpp\transposeBuiltin.cpp" />
<ClCompile Include="..\cpp\uminusBuiltin.cpp" />
<ClCompile Include="..\cpp\uplusBuiltin.cpp" />
<ClCompile Include="..\cpp\varBuiltin.cpp" />
<ClCompile Include="..\cpp\vertcatBuiltin.cpp" />
<ClCompile Include="dllMain.c" />
</ItemGroup>
Expand Down Expand Up @@ -293,7 +290,6 @@
<ClInclude Include="..\include\colonBuiltin.hpp" />
<ClInclude Include="..\include\complexBuiltin.hpp" />
<ClInclude Include="..\include\conjBuiltin.hpp" />
<ClInclude Include="..\include\corrcoefBuiltin.hpp" />
<ClInclude Include="..\include\ctransposeBuiltin.hpp" />
<ClInclude Include="..\include\dec2baseBuiltin.hpp" />
<ClInclude Include="..\include\dispBuiltin.hpp" />
Expand Down Expand Up @@ -328,7 +324,6 @@
<ClInclude Include="..\include\logBuiltin.hpp" />
<ClInclude Include="..\include\ltBuiltin.hpp" />
<ClInclude Include="..\include\maxBuiltin.hpp" />
<ClInclude Include="..\include\meanBuiltin.hpp" />
<ClInclude Include="..\include\minBuiltin.hpp" />
<ClInclude Include="..\include\minusBuiltin.hpp" />
<ClInclude Include="..\include\mldivideBuiltin.hpp" />
Expand Down Expand Up @@ -365,7 +360,6 @@
<ClInclude Include="..\include\transposeBuiltin.hpp" />
<ClInclude Include="..\include\uminusBuiltin.hpp" />
<ClInclude Include="..\include\uplusBuiltin.hpp" />
<ClInclude Include="..\include\varBuiltin.hpp" />
<ClInclude Include="..\include\vertcatBuiltin.hpp" />
</ItemGroup>
<ItemGroup>
Expand Down
Expand Up @@ -255,12 +255,6 @@
<ClCompile Include="..\cpp\flipudBuiltin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\meanBuiltin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\varBuiltin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\findBuiltin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -270,9 +264,6 @@
<ClCompile Include="..\cpp\isscalarBuiltin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\corrcoefBuiltin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\CMakeLists.txt" />
Expand Down Expand Up @@ -526,12 +517,6 @@
<ClInclude Include="..\include\flipudBuiltin.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\meanBuiltin.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\varBuiltin.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\findBuiltin.hpp">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -541,8 +526,5 @@
<ClInclude Include="..\include\isscalarBuiltin.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\corrcoefBuiltin.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
9 changes: 0 additions & 9 deletions modules/elementary_functions/builtin/cpp/Gateway.cpp
Expand Up @@ -102,12 +102,9 @@
#include "minBuiltin.hpp"
#include "fliplrBuiltin.hpp"
#include "flipudBuiltin.hpp"
#include "meanBuiltin.hpp"
#include "varBuiltin.hpp"
#include "findBuiltin.hpp"
#include "isvectorBuiltin.hpp"
#include "isscalarBuiltin.hpp"
#include "corrcoefBuiltin.hpp"
//=============================================================================
using namespace Nelson;
//=============================================================================
Expand Down Expand Up @@ -280,16 +277,10 @@ static const nlsGateway gateway[] = {
CPP_BUILTIN_WITH_EVALUATOR },
{ "flipud", (void*)Nelson::ElementaryFunctionsGateway::flipudBuiltin, 1, 1,
CPP_BUILTIN_WITH_EVALUATOR },
{ "mean", (void*)Nelson::ElementaryFunctionsGateway::meanBuiltin, 1, 4,
CPP_BUILTIN_WITH_EVALUATOR },
{ "var", (void*)Nelson::ElementaryFunctionsGateway::varBuiltin, 1, 3,
CPP_BUILTIN_WITH_EVALUATOR },
{ "find", (void*)Nelson::ElementaryFunctionsGateway::findBuiltin, 3, 3,
CPP_BUILTIN_WITH_EVALUATOR },
{ "isvector", (void*)Nelson::ElementaryFunctionsGateway::isvectorBuiltin, 1, 1, CPP_BUILTIN },
{ "isscalar", (void*)Nelson::ElementaryFunctionsGateway::isscalarBuiltin, 1, 1, CPP_BUILTIN },
{ "corrcoef", (void*)Nelson::ElementaryFunctionsGateway::corrcoefBuiltin, 1, 1,
CPP_BUILTIN_WITH_EVALUATOR },
};
//=============================================================================
NLSGATEWAYFUNC(gateway)
Expand Down
Expand Up @@ -30,26 +30,30 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -182,7 +186,6 @@
<ClCompile Include="..\cpp\ComplexConstructor.cpp" />
<ClCompile Include="..\cpp\ComplexTranspose.cpp" />
<ClCompile Include="..\cpp\ConcatenateNdArray.cpp" />
<ClCompile Include="..\cpp\CorrelationCoefficients.cpp" />
<ClCompile Include="..\cpp\DecimalToBase.cpp" />
<ClCompile Include="..\cpp\DotLeftDivide.cpp" />
<ClCompile Include="..\cpp\DotPower.cpp" />
Expand All @@ -201,7 +204,6 @@
<ClCompile Include="..\cpp\Logarithm1p.cpp" />
<ClCompile Include="..\cpp\Logarithm2.cpp" />
<ClCompile Include="..\cpp\Maximum.cpp" />
<ClCompile Include="..\cpp\Mean.cpp" />
<ClCompile Include="..\cpp\Minimum.cpp" />
<ClCompile Include="..\cpp\Sort.cpp" />
<ClCompile Include="..\cpp\SortCellHelpers.cpp" />
Expand Down Expand Up @@ -256,7 +258,6 @@
<ClCompile Include="..\cpp\TruncateFunctions.cpp" />
<ClCompile Include="..\cpp\UnaryMinus.cpp" />
<ClCompile Include="..\cpp\UnaryPlus.cpp" />
<ClCompile Include="..\cpp\Variance.cpp" />
<ClCompile Include="..\cpp\VertCat.cpp" />
<ClCompile Include="dllMain.c" />
</ItemGroup>
Expand Down Expand Up @@ -290,7 +291,6 @@
<ClInclude Include="..\include\ComplexConstructor.hpp" />
<ClInclude Include="..\include\ComplexTranspose.hpp" />
<ClInclude Include="..\include\ConcatenateNdArray.hpp" />
<ClInclude Include="..\include\CorrelationCoefficients.hpp" />
<ClInclude Include="..\include\DecimalToBase.hpp" />
<ClInclude Include="..\include\DotLeftDivide.hpp" />
<ClInclude Include="..\include\DotPower.hpp" />
Expand Down Expand Up @@ -320,7 +320,6 @@
<ClInclude Include="..\include\Logarithm2.hpp" />
<ClInclude Include="..\include\MatrixMultiplication.hpp" />
<ClInclude Include="..\include\Maximum.hpp" />
<ClInclude Include="..\include\Mean.hpp" />
<ClInclude Include="..\include\Minimum.hpp" />
<ClInclude Include="..\include\Modulo.hpp" />
<ClInclude Include="..\include\NaturalLogarithm.hpp" />
Expand Down Expand Up @@ -348,7 +347,6 @@
<ClInclude Include="..\include\TruncateFunctions.hpp" />
<ClInclude Include="..\include\UnaryMinus.hpp" />
<ClInclude Include="..\include\UnaryPlus.hpp" />
<ClInclude Include="..\include\Variance.hpp" />
<ClInclude Include="..\include\VertCat.hpp" />
</ItemGroup>
<ItemGroup>
Expand Down
Expand Up @@ -231,21 +231,12 @@
<ClCompile Include="..\cpp\Flip.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\Mean.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\BinaryOperatorsHelpers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\Variance.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\Find.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\cpp\CorrelationCoefficients.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\AbsoluteValue.hpp">
Expand Down Expand Up @@ -503,21 +494,12 @@
<ClInclude Include="..\include\Flip.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\Mean.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\BinaryOperatorsHelpers.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\Variance.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\Find.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\CorrelationCoefficients.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\CMakeLists.txt" />
Expand Down
6 changes: 6 additions & 0 deletions modules/linear_algebra/src/include/lapack_eigen.hpp
Expand Up @@ -30,6 +30,12 @@
//=============================================================================
#include <complex>
//=============================================================================
#pragma warning(disable : 4190)
#ifndef lapack_complex_float
#define lapack_complex_float std::complex<float>
#endif
//=============================================================================
#ifndef lapack_complex_double
#define lapack_complex_double std::complex<double>
#endif
//=============================================================================
1 change: 1 addition & 0 deletions modules/modules.iss
Expand Up @@ -90,4 +90,5 @@ Source: {#RootPath}modules\modules.nls; DestDir: {app}\modules\; AfterInstall: A
#include "graphics/module.iss"
#include "mex/module.iss"
#include "ipc/module.iss"
#include "statistics/module.iss"
;==============================================================================
6 changes: 4 additions & 2 deletions modules/modules.nls.in
Expand Up @@ -79,7 +79,8 @@ modules_list = [
"webtools";
"graphics";
"mex";
"ipc"
"ipc";
"statistics";
];
// ============================================================================
// optional modules
Expand Down Expand Up @@ -148,6 +149,7 @@ modules_help_list = [
"webtools";
"mex";
"graphics";
"ipc"
"ipc";
"statistics";
];
// ============================================================================

0 comments on commit 0957ceb

Please sign in to comment.