remove mex files, add buliding to CI

sqlp · Apr 10, 2024 · af32e78 · af32e78
1 parent 4a91f13
commit af32e78
Show file tree

Hide file tree

Showing 172 changed files with 120 additions and 135 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,132 +1,86 @@
-name: Basic SeDuMi tests
-
-# Controls when the action will run.
+name: CI
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    branches: [ master ]
+    branches:
+      - master
+    tags:
+      - '*'
   pull_request:
-    branches: [ master ]
-
-  workflow_dispatch:
-
+    branches:
+      - master
 jobs:
-
-  matlab:
-    name: Matlab (latest) on Ubuntu (latest)
-    runs-on: ubuntu-latest
-
+  build-mex:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest,windows-latest,macos-latest,macos-14]
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Install MATLAB
-        uses: matlab-actions/setup-matlab@v1
-
-      - name: Run basic SeDuMi tests
-        uses: matlab-actions/run-command@v1
-        with:
-          command: cd examples; test_sedumi(1, 1);
-
-
-  macos-octave:
-    name: Octave (latest) on macOS (latest)
-    runs-on: macos-latest
-
+    - name: Retrieve the source code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Install MATLAB
+      uses: matlab-actions/setup-matlab@v2
+      with:
+        release: ${{ matrix.os == 'macos-14' && 'R2023b' || ( matrix.os == 'windows-latest' && 'R2021b' || 'R2021a' ) }}
+    - name: Build MATLAB MEX files
+      uses: matlab-actions/run-command@v2
+      with:
+        command: install_sedumi -rebuild
+    - name: Run test
+      uses: matlab-actions/run-command@v2
+      with:
+        command: "install_sedumi; cd examples; test_sedumi(1, 1)"
+    - name: Upload MATLAB MEX files
+      uses: actions/upload-artifact@v4
+      with:
+        name: mexfiles-${{ matrix.os }}
+        path: "*.mex*"
+  build-oct:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest,windows-latest,macos-latest,macos-14]
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Install Octave by homebrew
-        run: brew install octave
-
-      - name: Run basic SeDuMi tests
-        run: octave --eval "cd examples; test_sedumi(1, 1);"
-
-
-  windows-octave:
-    name: Octave (latest) on MS Windows (latest)
-    runs-on: windows-latest
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Install Octave by Chocolatey
-        run: choco install octave.portable
-
-      - name: Run basic SeDuMi tests
-        run: octave-cli.exe --eval "cd examples; test_sedumi(1, 1);"
-
-
-  ubuntu-20_04-octave:
-    name: Octave 5.2.0 on Ubuntu 20.04
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Install Octave
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install octave liboctave-dev libopenblas-dev
-
-      - name: Run basic SeDuMi tests
-        run: octave --eval "cd examples; test_sedumi(1, 1);"
-
-
-  ubuntu-18_04-octave:
-    name: Octave 4.2.2 on Ubuntu 18.04
-    runs-on: ubuntu-18.04
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Install Octave
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install octave liboctave-dev libopenblas-dev
-
-      - name: Run basic SeDuMi tests
-        run: octave --eval "cd examples; test_sedumi(1, 1);"
-
-
-  flatpak-octave:
-    name: Octave (latest) on Flatpak (latest)
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Install Octave
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install flatpak
-          flatpak remote-add --user --if-not-exists \
-                  flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak install --user -y flathub org.octave.Octave
-
-      - name: Run basic SeDuMi tests
-        run: |
-          flatpak run org.octave.Octave --eval "cd examples; test_sedumi(1, 1);"
-
-
-  snap-octave:
-    name: Octave (latest) on Snap (latest)
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-
-      - name: Install Octave
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install snapd
-          sudo snap install octave
-
-      - name: Run basic SeDuMi tests
-        run: snap run octave --eval "cd examples; test_sedumi(1, 1);"
+    - name: Retrieve the source code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Install Octave
+      shell: bash
+      run: |
+        if [ "${{ matrix.os }}" = ubuntu-latest ]; then
+          sudo apt update
+          sudo apt install --no-install-recommends octave liboctave-dev
+        elif [ "${{ matrix.os }}" = windows-latest ]; then
+          choco install octave.portable
+        else
+          brew install octave
+        fi
+    - name: Build Octave MEX files
+      if: matrix.os != 'windows-latest'
+      run: octave --eval "install_sedumi -rebuild"
+    - name: Build Octave MEX files
+      if: matrix.os == 'windows-latest'
+      shell: cmd
+      run: |
+        set PATH=C:\ProgramData\chocolatey\bin;%PATH%
+        which octave-cli.exe
+        octave-cli.exe --no-gui --eval "install_sedumi -rebuild"
+        if %errorlevel% neq 0 exit /b %errorlevel%
+    - name: Run test
+      if: matrix.os != 'windows-latest'
+      run: octave --eval "install_sedumi; test_sedumi(1, 1)"
+    - name: Run test
+      if: matrix.os == 'windows-latest'
+      shell: cmd
+      run: |
+        set PATH=C:\ProgramData\chocolatey\bin;%PATH%
+        octave-cli.exe --no-gui --eval "install_sedumi; cd examples; test_sedumi(1, 1)"
+    - name: Upload Octave MEX files
+      uses: actions/upload-artifact@v4
+      with:
+        name: mexfiles-oct-${{ matrix.os }}
+        path: "*.mex"
diff --git a/adendotd.mexa64 b/adendotd.mexa64
diff --git a/adendotd.mexglx b/adendotd.mexglx
diff --git a/adendotd.mexmaci64 b/adendotd.mexmaci64
diff --git a/adendotd.mexw32 b/adendotd.mexw32
diff --git a/adendotd.mexw64 b/adendotd.mexw64
diff --git a/adenscale.mexa64 b/adenscale.mexa64
diff --git a/adenscale.mexglx b/adenscale.mexglx
diff --git a/adenscale.mexmaci64 b/adenscale.mexmaci64
diff --git a/adenscale.mexw32 b/adenscale.mexw32
diff --git a/adenscale.mexw64 b/adenscale.mexw64
diff --git a/blkchol.mexa64 b/blkchol.mexa64
diff --git a/blkchol.mexglx b/blkchol.mexglx
diff --git a/blkchol.mexmaci64 b/blkchol.mexmaci64
diff --git a/blkchol.mexw32 b/blkchol.mexw32
diff --git a/blkchol.mexw64 b/blkchol.mexw64
diff --git a/bwblkslv.mexa64 b/bwblkslv.mexa64
diff --git a/bwblkslv.mexglx b/bwblkslv.mexglx
diff --git a/bwblkslv.mexmaci64 b/bwblkslv.mexmaci64
diff --git a/bwblkslv.mexw32 b/bwblkslv.mexw32
diff --git a/bwblkslv.mexw64 b/bwblkslv.mexw64
diff --git a/bwdpr1.mexa64 b/bwdpr1.mexa64
diff --git a/bwdpr1.mexglx b/bwdpr1.mexglx
diff --git a/bwdpr1.mexmaci64 b/bwdpr1.mexmaci64
diff --git a/bwdpr1.mexw32 b/bwdpr1.mexw32
diff --git a/bwdpr1.mexw64 b/bwdpr1.mexw64
diff --git a/cholsplit.mexa64 b/cholsplit.mexa64
diff --git a/cholsplit.mexglx b/cholsplit.mexglx
diff --git a/cholsplit.mexmaci64 b/cholsplit.mexmaci64
diff --git a/cholsplit.mexw32 b/cholsplit.mexw32
diff --git a/cholsplit.mexw64 b/cholsplit.mexw64
diff --git a/choltmpsiz.mexa64 b/choltmpsiz.mexa64
diff --git a/choltmpsiz.mexglx b/choltmpsiz.mexglx
diff --git a/choltmpsiz.mexmaci64 b/choltmpsiz.mexmaci64
diff --git a/choltmpsiz.mexw32 b/choltmpsiz.mexw32
diff --git a/choltmpsiz.mexw64 b/choltmpsiz.mexw64
diff --git a/ddot.mexa64 b/ddot.mexa64
diff --git a/ddot.mexglx b/ddot.mexglx
diff --git a/ddot.mexmaci64 b/ddot.mexmaci64
diff --git a/ddot.mexw32 b/ddot.mexw32
diff --git a/ddot.mexw64 b/ddot.mexw64
diff --git a/dpr1fact.mexa64 b/dpr1fact.mexa64
diff --git a/dpr1fact.mexglx b/dpr1fact.mexglx
diff --git a/dpr1fact.mexmaci64 b/dpr1fact.mexmaci64
diff --git a/dpr1fact.mexw32 b/dpr1fact.mexw32
diff --git a/dpr1fact.mexw64 b/dpr1fact.mexw64
diff --git a/extractA.mexa64 b/extractA.mexa64
diff --git a/extractA.mexglx b/extractA.mexglx
diff --git a/extractA.mexmaci64 b/extractA.mexmaci64
diff --git a/extractA.mexw32 b/extractA.mexw32
diff --git a/extractA.mexw64 b/extractA.mexw64
diff --git a/findblks.mexa64 b/findblks.mexa64
diff --git a/findblks.mexglx b/findblks.mexglx
diff --git a/findblks.mexmaci64 b/findblks.mexmaci64
diff --git a/findblks.mexw32 b/findblks.mexw32
diff --git a/findblks.mexw64 b/findblks.mexw64
diff --git a/finsymbden.mexa64 b/finsymbden.mexa64
diff --git a/finsymbden.mexglx b/finsymbden.mexglx
diff --git a/finsymbden.mexmaci64 b/finsymbden.mexmaci64
diff --git a/finsymbden.mexw32 b/finsymbden.mexw32
diff --git a/finsymbden.mexw64 b/finsymbden.mexw64
diff --git a/fwblkslv.mexa64 b/fwblkslv.mexa64
diff --git a/fwblkslv.mexglx b/fwblkslv.mexglx
diff --git a/fwblkslv.mexmaci64 b/fwblkslv.mexmaci64
diff --git a/fwblkslv.mexw32 b/fwblkslv.mexw32
diff --git a/fwblkslv.mexw64 b/fwblkslv.mexw64
diff --git a/fwdpr1.mexa64 b/fwdpr1.mexa64
diff --git a/fwdpr1.mexglx b/fwdpr1.mexglx
diff --git a/fwdpr1.mexmaci64 b/fwdpr1.mexmaci64
diff --git a/fwdpr1.mexw32 b/fwdpr1.mexw32
diff --git a/fwdpr1.mexw64 b/fwdpr1.mexw64
diff --git a/getada1.mexa64 b/getada1.mexa64
diff --git a/getada1.mexglx b/getada1.mexglx
diff --git a/getada1.mexmaci64 b/getada1.mexmaci64
diff --git a/getada1.mexw32 b/getada1.mexw32
diff --git a/getada1.mexw64 b/getada1.mexw64
diff --git a/getada2.mexa64 b/getada2.mexa64
diff --git a/getada2.mexglx b/getada2.mexglx
diff --git a/getada2.mexmaci64 b/getada2.mexmaci64
diff --git a/getada2.mexw32 b/getada2.mexw32
diff --git a/getada2.mexw64 b/getada2.mexw64
diff --git a/getada3.mexa64 b/getada3.mexa64
diff --git a/getada3.mexglx b/getada3.mexglx
diff --git a/getada3.mexmaci64 b/getada3.mexmaci64
diff --git a/getada3.mexw32 b/getada3.mexw32
diff --git a/getada3.mexw64 b/getada3.mexw64
diff --git a/givensrot.mexa64 b/givensrot.mexa64
diff --git a/givensrot.mexglx b/givensrot.mexglx
diff --git a/givensrot.mexmaci64 b/givensrot.mexmaci64
diff --git a/givensrot.mexw32 b/givensrot.mexw32
diff --git a/givensrot.mexw64 b/givensrot.mexw64
diff --git a/incorder.mexa64 b/incorder.mexa64
diff --git a/incorder.mexglx b/incorder.mexglx
diff --git a/incorder.mexmaci64 b/incorder.mexmaci64
diff --git a/incorder.mexw32 b/incorder.mexw32
diff --git a/incorder.mexw64 b/incorder.mexw64
diff --git a/install_sedumi.m b/install_sedumi.m
@@ -111,17 +111,33 @@ function install_sedumi( varargin )
 
 % Get first file of "targets64" and replace ".c" with mex-extension.
 % Keep order of "targets64".
+mext = mexext;
 mex_binaries = cellfun (@strtok, targets64, 'UniformOutput', false);
-mex_binaries = cellfun (@(x) strrep (x, '.c', ['.', mexext()]), ...
+mex_binaries = cellfun (@(x) strrep (x, '.c', ['.', mext]), ...
   mex_binaries, 'UniformOutput', false);
 
+fs = filesep();
 sedumi_path = mfilename ('fullpath');
-sedumi_path = sedumi_path(1:max ([1, strfind(sedumi_path, filesep ())]) - 1);
+sedumi_path = sedumi_path(1:max ([1, strfind(sedumi_path, fs)]) - 1);
 
+% Note the use of 0.01 here. That's because version 7 had more than 10
+% minor releases, so 7.10-7.14 need to be ordered after 7.01-7.09.
+VERSION  = [1, 0.01] * sscanf (version (), '%d.%d');
+COMPUTER = computer ();
 ISOCTAVE = (exist ('OCTAVE_VERSION', 'builtin') == 5);
 if (ISOCTAVE)
   prog = 'Octave';
   page_output_immediately (true, 'local');
+  switch COMPUTER
+  case 'x86_64-pc-linux-gnu'
+      mdir = 'o_lin';
+  case 'x86_64-apple-darwin21.6.0'
+      mdir = 'o_maci';
+  case 'aarch64-apple-darwin23.4.0'
+      mdir = 'o_maca';
+  case 'i686-w64-mingw32'
+      mdir = 'o_win';
+  end
 else
   prog = 'Matlab';
 end
@@ -141,11 +157,19 @@ function install_sedumi( varargin )
 % guarantee that rebuilding will work.
 if (~need_rebuild)
   fprintf ('Looking for existing binaries...');
-  nfound = count_mex_binaries ();
-  if (nfound == 0)
+  nfound = [0, 0];
+  for k = 1 : length(targets64)
+      targ = mex_binaries{k};
+      if exist( [ sedumi_path, fs, targ ], 'file' )
+          nfound(1) = nfound(1) + 1;
+      elseif ~isempty(mdir) && exist( [ sedumi_path, fs, mdir, fs, targ ], 'file' )
+          nfound(2) = nfound(2) + 1;
+      end
+  end
+  if sum(nfound) == 0
     fprintf ('none found; building...\n');
     need_rebuild = true;
-  elseif (nfound < length(targets64))
+  elseif sum(nfound) < length(targets64)
     fprintf ('incomplete set found.\n');
     disp (line_sep);
     error (['%s\n', ...
@@ -163,6 +187,7 @@ function install_sedumi( varargin )
 end
 
 if (need_rebuild)
+  mdir = ''
   disp ('Attempting to recompile the SeDuMi binaries:');
 
   % Customization by providing a mex template.
@@ -173,6 +198,7 @@ function install_sedumi( varargin )
     if (ISOCTAVE)
       % Matlab mex optimization '-O' corresponds to gcc '-O2',
       % whereas calling '-O' would result in gcc '-O1'.
+      flags{end+1} = '--mex';
       flags{end+1} = '-O2';
       flags{end+1} = '-DOCTAVE';
       flags{end+1} = '-Wall';
@@ -189,10 +215,6 @@ function install_sedumi( varargin )
         flags{end+1} = '-I/usr/include/openblas';
       end
     else % Matlab
-      % Note the use of 0.01 here. That's because version 7 had more than 10
-      % minor releases, so 7.10-7.14 need to be ordered after 7.01-7.09.
-      VERSION  = [1, 0.01] * sscanf (version (), '%d.%d');
-      COMPUTER = computer ();
       % The last Matlab release with a 32 bit version was R2015b.
       IS64BIT  = strcmp (COMPUTER(end-1:end), '64');
       flags{end+1} = '-O';  % optimize
@@ -273,6 +295,15 @@ function install_sedumi( varargin )
   else
     fprintf ('already there.\n');
   end
+  if (ISOCTAVE && ~isempty(mdir))
+    fprintf ('   Octave MEX directory...       ');
+    if (~is_on_search_path (fullfile(sedumi_path, mdir)))
+      addpath (fullfile(sedumi_path, mdir));
+      fprintf ('added.\n');
+    else
+      fprintf ('already there.\n');
+    end
+  end
   fprintf ('   Conversion directory... ');
   if (~is_on_search_path (fullfile (sedumi_path, 'conversion')))
     addpath (fullfile (sedumi_path, 'conversion'));

diff --git a/invcholfac.mexa64 b/invcholfac.mexa64
diff --git a/invcholfac.mexglx b/invcholfac.mexglx
diff --git a/invcholfac.mexmaci64 b/invcholfac.mexmaci64
diff --git a/invcholfac.mexw32 b/invcholfac.mexw32
diff --git a/invcholfac.mexw64 b/invcholfac.mexw64
diff --git a/iswnbr.mexa64 b/iswnbr.mexa64
diff --git a/iswnbr.mexglx b/iswnbr.mexglx
diff --git a/iswnbr.mexmaci64 b/iswnbr.mexmaci64
diff --git a/iswnbr.mexw32 b/iswnbr.mexw32
diff --git a/iswnbr.mexw64 b/iswnbr.mexw64
diff --git a/ordmmdmex.mexa64 b/ordmmdmex.mexa64
diff --git a/ordmmdmex.mexglx b/ordmmdmex.mexglx
diff --git a/ordmmdmex.mexmaci64 b/ordmmdmex.mexmaci64
diff --git a/ordmmdmex.mexw32 b/ordmmdmex.mexw32
diff --git a/ordmmdmex.mexw64 b/ordmmdmex.mexw64
diff --git a/partitA.mexa64 b/partitA.mexa64
diff --git a/partitA.mexglx b/partitA.mexglx
diff --git a/partitA.mexmaci64 b/partitA.mexmaci64
diff --git a/partitA.mexw32 b/partitA.mexw32
diff --git a/partitA.mexw64 b/partitA.mexw64
diff --git a/psdframeit.mexa64 b/psdframeit.mexa64
diff --git a/psdframeit.mexglx b/psdframeit.mexglx
diff --git a/psdframeit.mexmaci64 b/psdframeit.mexmaci64
diff --git a/psdframeit.mexw32 b/psdframeit.mexw32
diff --git a/psdframeit.mexw64 b/psdframeit.mexw64
diff --git a/psdinvjmul.mexa64 b/psdinvjmul.mexa64
diff --git a/psdinvjmul.mexglx b/psdinvjmul.mexglx
diff --git a/psdinvjmul.mexmaci64 b/psdinvjmul.mexmaci64
diff --git a/psdinvjmul.mexw32 b/psdinvjmul.mexw32
diff --git a/psdinvjmul.mexw64 b/psdinvjmul.mexw64
diff --git a/qblkmul.mexa64 b/qblkmul.mexa64
diff --git a/qblkmul.mexglx b/qblkmul.mexglx
diff --git a/qblkmul.mexmaci64 b/qblkmul.mexmaci64
diff --git a/qblkmul.mexw32 b/qblkmul.mexw32
diff --git a/qblkmul.mexw64 b/qblkmul.mexw64
diff --git a/qrK.mexa64 b/qrK.mexa64
diff --git a/qrK.mexglx b/qrK.mexglx
diff --git a/qrK.mexmaci64 b/qrK.mexmaci64
diff --git a/qrK.mexw32 b/qrK.mexw32
diff --git a/qrK.mexw64 b/qrK.mexw64
diff --git a/quadadd.mexa64 b/quadadd.mexa64
diff --git a/quadadd.mexglx b/quadadd.mexglx
diff --git a/quadadd.mexmaci64 b/quadadd.mexmaci64
diff --git a/quadadd.mexw32 b/quadadd.mexw32
diff --git a/quadadd.mexw64 b/quadadd.mexw64
diff --git a/sortnnz.mexa64 b/sortnnz.mexa64
diff --git a/sortnnz.mexglx b/sortnnz.mexglx
diff --git a/sortnnz.mexmaci64 b/sortnnz.mexmaci64
diff --git a/sortnnz.mexw32 b/sortnnz.mexw32
diff --git a/sortnnz.mexw64 b/sortnnz.mexw64
diff --git a/sqrtinv.mexa64 b/sqrtinv.mexa64
diff --git a/sqrtinv.mexglx b/sqrtinv.mexglx
diff --git a/sqrtinv.mexmaci64 b/sqrtinv.mexmaci64
diff --git a/sqrtinv.mexw32 b/sqrtinv.mexw32
diff --git a/sqrtinv.mexw64 b/sqrtinv.mexw64
diff --git a/symbfwblk.mexa64 b/symbfwblk.mexa64
diff --git a/symbfwblk.mexglx b/symbfwblk.mexglx
diff --git a/symbfwblk.mexmaci64 b/symbfwblk.mexmaci64
diff --git a/symbfwblk.mexw32 b/symbfwblk.mexw32
diff --git a/symbfwblk.mexw64 b/symbfwblk.mexw64
diff --git a/symfctmex.mexa64 b/symfctmex.mexa64
diff --git a/symfctmex.mexglx b/symfctmex.mexglx
diff --git a/symfctmex.mexmaci64 b/symfctmex.mexmaci64
diff --git a/symfctmex.mexw32 b/symfctmex.mexw32
diff --git a/symfctmex.mexw64 b/symfctmex.mexw64
diff --git a/urotorder.mexa64 b/urotorder.mexa64
diff --git a/urotorder.mexglx b/urotorder.mexglx
diff --git a/urotorder.mexmaci64 b/urotorder.mexmaci64
diff --git a/urotorder.mexw32 b/urotorder.mexw32
diff --git a/urotorder.mexw64 b/urotorder.mexw64
diff --git a/vecsym.mexa64 b/vecsym.mexa64
diff --git a/vecsym.mexglx b/vecsym.mexglx
diff --git a/vecsym.mexmaci64 b/vecsym.mexmaci64
diff --git a/vecsym.mexw32 b/vecsym.mexw32
diff --git a/vecsym.mexw64 b/vecsym.mexw64