Merge pull request #293 from Nelson-numerical-software/mex

C MEX API

Author: Nelson-numerical-software

.travis.yml

@@ -124,7 +124,7 @@ before_install:
       brew unlink libffi;
       brew install libffi;
       brew unlink libffi;
-      brew link --force libffi;
+      brew link libffi --force;
       brew uninstall icu4c;
       brew install icu4c;
       brew unlink icu4c;
@@ -134,7 +134,9 @@ before_install:
       brew install pkg-config;
       brew install pkgconfig;
       brew install gettext;
-      brew link --force gettext;
+      brew link gettext --force;
+      echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.zshrc;
+      source ~/.zshrc;
       brew install boost;
       brew install libxml2;
       brew install cmake;
@@ -145,6 +147,7 @@ before_install:
       brew install taglib;
       brew install libgit2;
       brew install hdf5;
+      brew install libmatio;
       brew install eigen;
       brew install libomp;
       fi
@@ -153,7 +156,8 @@ install:
   - if [ `uname` = "Linux" ]; then git clone https://github.com/eigenteam/eigen-git-mirror /tmp/eigen && mkdir /tmp/eigen-build && cd /tmp/eigen && git checkout 3.3.7 && cd - && cd /tmp/eigen-build && cmake . /tmp/eigen && make -j4 && sudo make install && cd -; fi
   - if [ `uname` = "Linux" ]; then git clone https://github.com/live-clones/hdf5.git /tmp/hdf5-1_10_5 && cd /tmp/hdf5-1_10_5 && git checkout hdf5-1_10_5 && ./configure --quiet --prefix=/usr/local --enable-shared --disable-deprecated-symbols --disable-hl --disable-strict-format-checks --disable-memory-alloc-sanity-check --disable-instrument --disable-parallel --disable-trace --disable-asserts --with-pic --with-default-api-version=v110 CFLAGS="-w" && sudo make install -C src; fi
   - if [ `uname` = "Linux" ]; then git clone https://github.com/tbeu/matio /tmp/matio && cd /tmp/matio && git checkout v1.5.16 && cd /tmp/matio && ./autogen.sh && ./configure --enable-shared --enable-mat73=yes --enable-extended-sparse=no --with-pic --with-hdf5=/usr/local && make && sudo make install; fi
-  - if [ `uname` = "Darwin" ]; then git clone https://github.com/tbeu/matio /tmp/matio && cd /tmp/matio && git checkout master && cd /tmp/matio && ./autogen.sh && ./configure --enable-shared --enable-mat73=yes --enable-extended-sparse=no --with-pic --with-hdf5=/usr/local/Cellar/hdf5/1.12.0/ && make && sudo make install; fi
+  - if [ `uname` = "Darwin" ]; then git clone https://github.com/live-clones/hdf5.git /tmp/hdf5-1_10_5 && cd /tmp/hdf5-1_10_5 && git checkout hdf5-1_10_5 && ./configure --quiet --prefix=/usr/local --enable-shared --disable-deprecated-symbols --disable-hl --disable-strict-format-checks --disable-memory-alloc-sanity-check --disable-instrument --disable-parallel --disable-trace --disable-asserts --with-pic --with-default-api-version=v110 CFLAGS="-w" && sudo make install -C src; fi
+  - if [ `uname` = "Darwin" ]; then git clone https://github.com/tbeu/matio /tmp/matio && cd /tmp/matio && git checkout v1.5.16 && cd /tmp/matio && ./autogen.sh && ./configure --enable-shared --enable-mat73=yes --enable-extended-sparse=no --with-pic --with-hdf5=/usr/local && make && sudo make install; fi
   - if [ `uname` = "Darwin" ]; then cd ~; git clone https://github.com/Nelson-numerical-software/slicot_f2c.git; fi 
 
 before_script:

CHANGELOG.md

@@ -1,3 +1,25 @@
+# 0.4.4 (2020-04-29)
+
+* lookandfeel builtin: default current application look and feel.
+
+* clear builtin extended to clear mex functions.
+
+* mex function used to build MEX files.
+
+* [IN PROGRESS] MEX C API allows to access Nelson, GNU Octave and commercial software functions.
+
+  documentation and tests will be extended in next version.
+
+  Feedback and external tests are welcome.
+
+Compilation:
+------------
+
+* MacOs X Catalina fully working.
+
+* Ubuntu 20.04 LTS supported.
+
+
 # 0.4.3 (2020-03-30)
 
 * mean builtin: Mean elements of an array with nanflag and 'all' support.

CMakeLists.txt

@@ -33,7 +33,7 @@ set(CMAKE_INSTALL_PREFIX "$ENV{HOME}")
 #============================================================================== 
 set (Nelson_VERSION_MAJOR_DEFAULT 0)
 set (Nelson_VERSION_MINOR_DEFAULT 4)
-set (Nelson_VERSION_MAINTENANCE_DEFAULT 3)
+set (Nelson_VERSION_MAINTENANCE_DEFAULT 4)
 set (Nelson_VERSION_BUILD_DEFAULT 0)
 #============================================================================== 
 if(DEFINED ENV{NELSON_VERSION_MAJOR})

NelSon.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29728.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NelSon-gui", "modules\main\nelson_gui\NelSon-gui.vcxproj", "{F34BD496-D9B3-4C25-A9E9-C91EB3E35C12}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -257,6 +257,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		modules\modules.nls.in = modules\modules.nls.in
 		modules\modules.nls.vc = modules\modules.nls.vc
 		tools\innosetup\Nelson.iss = tools\innosetup\Nelson.iss
+		modules\mex\src\c\nlsMex.vcxproj = modules\mex\src\c\nlsMex.vcxproj
 		etc\startup.nls = etc\startup.nls
 	EndProjectSection
 EndProject
@@ -404,6 +405,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsWebtools", "modules\webt
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsWebtools_builtin", "modules\webtools\builtin\c\nlsWebtools_builtin.vcxproj", "{9CAC9DB7-E5FF-40F6-BB14-1A64A7A059B6}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nlsMex", "modules\mex\src\c\nlsMex.vcxproj", "{A3EEB626-83DB-426D-B483-37A478EE8166}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -1384,6 +1387,14 @@ Global
 		{9CAC9DB7-E5FF-40F6-BB14-1A64A7A059B6}.Release|Win32.Build.0 = Release|Win32
 		{9CAC9DB7-E5FF-40F6-BB14-1A64A7A059B6}.Release|x64.ActiveCfg = Release|x64
 		{9CAC9DB7-E5FF-40F6-BB14-1A64A7A059B6}.Release|x64.Build.0 = Release|x64
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Debug|Win32.Build.0 = Debug|Win32
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Debug|x64.ActiveCfg = Debug|x64
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Debug|x64.Build.0 = Debug|x64
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Release|Win32.ActiveCfg = Release|Win32
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Release|Win32.Build.0 = Release|Win32
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Release|x64.ActiveCfg = Release|x64
+		{A3EEB626-83DB-426D-B483-37A478EE8166}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -64,6 +64,8 @@ these own data types and operations on these data types by using overload.
 
 - Interfacing C/C++ or Fortran with Nelson (build and load external code on the fly).
 
+- MEX C API compatibility.
+
 - RESTful API web service.
 
 - The QML engine enables nelson programs to display and manipulate graphical content using Qt's QML framework.
@@ -136,6 +138,7 @@ The systems listed here without CI or binaries are known to build and operate, b
 | Windows 7+       | x86-64 (64-bit)  | ✓  | ✓        |
 |                  | i686 (32-bit)    | ✓  | ✓        |
 | MacOS 10.10+     | x86-64 (64-bit)  | ✓  |          |
+| Ubuntu 20.04     | x86-64 (64-bit)  |    |          |
 | Ubuntu 18.04     | x86-64 (64-bit)  | ✓  |          |
 | Ubuntu 16.04     | x86-64 (64-bit)  | ✓  |          |
 | Debian 10        | x86-64 (64-bit)  | ✓  |          |

ROADMAP.md

@@ -24,7 +24,7 @@ Please feel free to file issues on this repository if you have questions, concer
 - MAT File I/O module (DONE v0.3.3),
 - HDF5 used as default data file format (.nh5) (DONE v0.3.2),
 - Profiling and Coverage Tools for Nelson's language (DONE v0.3.4),
-- Mex module,
+- Mex module (Part 1 - v0.4.4),
 - completion,
 - graphics output,
 - some basic openCV functions,

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.4.3.{build}
+version: 0.4.4.{build}
 image: Visual Studio 2019
 
 environment:

modules/CMakeLists.txt

@@ -85,6 +85,7 @@ matio
 profiler
 file_archiver
 webtools
+mex
 )
 LIST(APPEND moduleslist main)
 #==============================================================================

modules/api_nelson/src/c/resources.rc

@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,3,0
- PRODUCTVERSION 0,4,3,0
+ FILEVERSION 0,4,4,0
+ PRODUCTVERSION 0,4,4,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,8 +68,8 @@ BEGIN
             VALUE "InternalName", "api_nelson"
             VALUE "OriginalFilename", "libnlsapi_nelson.dll"
             VALUE "ProductName", "Nelson (api_nelson)"
-            VALUE "ProductVersion", "0,4,3,0"
-            VALUE "FileVersion", "0,4,3,0"
+            VALUE "ProductVersion", "0,4,4,0"
+            VALUE "FileVersion", "0,4,4,0"
             VALUE "LegalCopyright", "Nelson Copyright (C) 2016-present"
             VALUE "Comments", "All rights reserved."
             VALUE "CompanyName", "Allan CORNET"

modules/assert_functions/builtin/c/resources.rc

@@ -48,8 +48,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,3,0
- PRODUCTVERSION 0,4,3,0
+ FILEVERSION 0,4,4,0
+ PRODUCTVERSION 0,4,4,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,8 +68,8 @@ BEGIN
             VALUE "InternalName", "assert_functions_builtin"
             VALUE "OriginalFilename", "libnlsassert_functions_builtin.dll"
             VALUE "ProductName", "Nelson (assert_functions_builtin)"
-            VALUE "ProductVersion", "0,4,3,0"
-            VALUE "FileVersion", "0,4,3,0"
+            VALUE "ProductVersion", "0,4,4,0"
+            VALUE "FileVersion", "0,4,4,0"
             VALUE "LegalCopyright", "Nelson Copyright (C) 2016-present"
             VALUE "Comments", "All rights reserved."
             VALUE "CompanyName", "Allan CORNET"