Merge pull request #214 from wegank/port-to-windows-0

Author: ederc

.github/workflows/msolve.yml

@@ -13,19 +13,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - macos-26-intel
+        include:
+          - { os: ubuntu-latest, shell: bash }
+          - { os: macos-latest, shell: bash }
+          - { os: macos-26-intel, shell: bash }
+          - { os: windows-latest, shell: msys2 }
+    defaults:
+      run:
+        shell: ${{ matrix.shell }} {0}
     steps:
+      - name: Disable CRLF conversion on Windows
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+               git config --global core.autocrlf false
+               git config --global core.eol lf
       - uses: actions/checkout@v6
+      - name: Set up MSYS2
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
       - name: "Install dependencies"
         run: |
                if [ "$RUNNER_OS" == "Linux" ]; then
                     # sharutils is for uudecode
                     sudo apt install libgmp-dev libflint-dev libmpfr-dev libntl-dev
                elif [ "$RUNNER_OS" == "macOS" ]; then
                     brew install autoconf automake libtool gmp flint mpfr ntl
+               elif [ "$RUNNER_OS" == "Windows" ]; then
+                    pacman -S --noconfirm autotools mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-gmp mingw-w64-ucrt-x86_64-flint mingw-w64-ucrt-x86_64-mpfr mingw-w64-ucrt-x86_64-ntl
                else
                     echo "$RUNNER_OS not supported"
                     exit 1
@@ -34,7 +52,7 @@ jobs:
         run: ./autogen.sh
       - name: configure
         run: |
-               if [ "$RUNNER_OS" == "Linux" ]; then
+               if [ "$RUNNER_OS" == "Linux" ] || [ "$RUNNER_OS" == "Windows" ]; then
                     ./configure
                elif [ "$RUNNER_OS" == "macOS" ]; then
                     ./configure LDFLAGS="-L$(brew --prefix)/lib/" \
@@ -52,7 +70,7 @@ jobs:
         run: cat test-suite.log || true
       - name: make distcheck
         run: |
-               if [ "$RUNNER_OS" == "Linux" ]; then
+               if [ "$RUNNER_OS" == "Linux" ] || [ "$RUNNER_OS" == "Windows" ]; then
                     make distcheck
                elif [ "$RUNNER_OS" == "macOS" ]; then
                     make distcheck LDFLAGS="-L$(brew --prefix)/lib/" \
@@ -67,22 +85,41 @@ jobs:
 
   build-fixed-seed:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 10
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
+        include:
+          - { os: ubuntu-latest, shell: bash }
+          - { os: macos-latest, shell: bash }
+          - { os: macos-26-intel, shell: bash }
+          - { os: windows-latest, shell: msys2 }
+    defaults:
+      run:
+        shell: ${{ matrix.shell }} {0}
     steps:
+      - name: Disable CRLF conversion on Windows
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+               git config --global core.autocrlf false
+               git config --global core.eol lf
       - uses: actions/checkout@v6
+      - name: Set up MSYS2
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
       - name: "Install dependencies"
         run: |
                if [ "$RUNNER_OS" == "Linux" ]; then
                     # sharutils is for uudecode
                     sudo apt install libgmp-dev libflint-dev libmpfr-dev libntl-dev
                elif [ "$RUNNER_OS" == "macOS" ]; then
                     brew install autoconf automake libtool gmp flint mpfr ntl
+               elif [ "$RUNNER_OS" == "Windows" ]; then
+                    pacman -S --noconfirm autotools mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-gmp mingw-w64-ucrt-x86_64-flint mingw-w64-ucrt-x86_64-mpfr mingw-w64-ucrt-x86_64-ntl
                else
                     echo "$RUNNER_OS not supported"
                     exit 1
@@ -91,7 +128,7 @@ jobs:
         run: ./autogen.sh
       - name: configure
         run: |
-               if [ "$RUNNER_OS" == "Linux" ]; then
+               if [ "$RUNNER_OS" == "Linux" ] || [ "$RUNNER_OS" == "Windows" ]; then
                     ./configure
                elif [ "$RUNNER_OS" == "macOS" ]; then
                     ./configure LDFLAGS="-L$(brew --prefix)/lib/" \
@@ -109,7 +146,7 @@ jobs:
         run: cat test-suite.log || true
       - name: make distcheck with fixed seed
         run: |
-               if [ "$RUNNER_OS" == "Linux" ]; then
+               if [ "$RUNNER_OS" == "Linux" ] || [ "$RUNNER_OS" == "Windows" ]; then
                     make distcheck DISTCHECK_CONFIGURE_FLAGS="SEED=1617753600"
                elif [ "$RUNNER_OS" == "macOS" ]; then
                     make distcheck LDFLAGS="-L$(brew --prefix)/lib/" \

src/fglm/Makefile.am

@@ -6,6 +6,7 @@ libfglm_la_CFLAGS		= $(SIMD_FLAGS) $(CPUEXT_FLAGS) $(OPENMP_CFLAGS) -Wall -Wextr
 
 EXTRA_DIST	=		fglm.h \
                 libfglm.h \
+					aligned_alloc.h \
 								berlekamp_massey.c \
 								data_fglm.c \
 								fglm_core.c \

src/fglm/aligned_alloc.h

@@ -0,0 +1,50 @@
+/* This file is part of msolve.
+ *
+ * msolve is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * msolve is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with msolve.  If not, see <https://www.gnu.org/licenses/>
+ *
+ * Authors:
+ * Jérémy Berthomieu
+ * Christian Eder
+ * Mohab Safey El Din */
+
+#ifndef ALIGNED_ALLOC_HEADER_H
+#define ALIGNED_ALLOC_HEADER_H
+
+#ifdef _WIN32
+
+#include <errno.h>
+#include <malloc.h>
+
+static inline int posix_memalign(void **__memptr, size_t __alignment, size_t __size)
+{
+    void *p = _aligned_malloc(__size, __alignment);
+    if (!p)
+    {
+        return ENOMEM;
+    }
+    *__memptr = p;
+    return 0;
+}
+#endif
+
+static inline void posix_memalign_free(void *__p)
+{
+#ifdef _WIN32
+    _aligned_free(__p);
+#else
+    free(__p);
+#endif
+}
+
+#endif /* ALIGNED_ALLOC_HEADER_H */

src/fglm/data_fglm.c

@@ -27,14 +27,15 @@
 #include <flint/ulong_extras.h>
 #include "../msolve/streams.h"
 
+#include "aligned_alloc.h"
 
 static inline void free_sp_mat_fglm(sp_matfglm_t *mat){
   if(mat!=NULL){
-    free(mat->dense_mat);
-    free(mat->triv_idx);
-    free(mat->triv_pos);
-    free(mat->dense_idx);
-    free(mat->dst);
+    posix_memalign_free(mat->dense_mat);
+    posix_memalign_free(mat->triv_idx);
+    posix_memalign_free(mat->triv_pos);
+    posix_memalign_free(mat->dense_idx);
+    posix_memalign_free(mat->dst);
     free(mat);
   }
 }
@@ -81,10 +82,10 @@ static inline fglm_data_t *allocate_fglm_data(szmat_t nrows, szmat_t ncols, szma
 
 
 static inline void free_fglm_data(fglm_data_t *data){
-  free(data->vecinit);
-  free(data->res);
-  free(data->vecmult);
-  free(data->vvec);
+  posix_memalign_free(data->vecinit);
+  posix_memalign_free(data->res);
+  posix_memalign_free(data->vecmult);
+  posix_memalign_free(data->vvec);
   free(data->pts);
   free(data);
 }

src/fglm/fglm_core.c

@@ -72,6 +72,8 @@ double omp_get_wtime(void) { return realtime();}
 #include "../upolmat/nmod_poly_mat_pmbasis.c"
 #endif
 
+#include "aligned_alloc.h"
+
 void print_fglm_data(
         FILE *file,
         const md_t * const st,
@@ -614,9 +616,9 @@ static void generate_matrix_sequence(sp_matfglm_t *matxn, fglm_data_t *data,
     exit(1);
 #endif
   }
-  free(Rmat);
-  free(res);
-  free(tres);
+  posix_memalign_free(Rmat);
+  posix_memalign_free(res);
+  posix_memalign_free(tres);
 
 }
 #endif
@@ -1338,7 +1340,7 @@ param_t *nmod_fglm_compute_trace_data(sp_matfglm_t *matrix, mod_t prime,
 #endif
 
 #if DEBUGFGLM >= 1
-  FILE *fmat = fopen("/tmp/matrix.fglm", "w");
+  FILE *fmat = fopen("/tmp/matrix.fglm", "wb");
   display_fglm_matrix(fmat, matrix);
   fclose(fmat);
 #endif
@@ -1540,7 +1542,7 @@ int nmod_fglm_compute_apply_trace_data(sp_matfglm_t *matrix,
 #endif
 
 #if DEBUGFGLM >= 1
-  FILE *fmat = fopen("/tmp/matrix.fglm", "w");
+  FILE *fmat = fopen("/tmp/matrix.fglm", "wb");
   display_fglm_matrix(fmat, matrix);
   fclose(fmat);
 #endif
@@ -1759,7 +1761,7 @@ param_t *nmod_fglm_guess_colon(sp_matfglmcol_t *matrix,
 #endif
 
 #if DEBUGFGLM >= 1
-  FILE *fmat = fopen("/tmp/matrix.fglm", "w");
+  FILE *fmat = fopen("/tmp/matrix.fglm", "wb");
   display_fglm_colon_matrix(fmat, matrix);
   fclose(fmat);
 #endif

src/msolve/Makefile.am

@@ -8,6 +8,7 @@ libmsolve_la_LIBADD		=	../usolve/libusolve.la ../fglm/libfglm.la ../neogb/libneo
 
 EXTRA_DIST	=	  msolve-data.h \
 								msolve.h \
+								getdelim.h \
 								msolve-data.c \
 								duplicate.c \
 								hilbert.c \