Try to run CI on windows

.github/workflows/tests.yml

@@ -15,6 +15,7 @@ jobs:
         include:
           - os: ubuntu-20.04
           - os: macos-11
+          - os: windows-2019
     steps:
       - uses: actions/checkout@v3
 

mops/CMakeLists.txt

@@ -139,8 +139,14 @@ check_cxx_compiler_flag("-Wunknown-pragmas" COMPILER_SUPPORTS_WPRAGMAS)
 if (MOPS_OPENMP)
     find_package(OpenMP)
     if(OpenMP_CXX_FOUND)
-        message(STATUS "OpenMP is enabled")
-        target_link_libraries(mops PUBLIC OpenMP::OpenMP_CXX)
+        if (MSVC)
+            # MSVC only supports an old version of OpenMP, let's disable it
+            # until we change the code to work with this version
+            message(STATUS "OpenMP was found, but is disabled on MSVC")
+        else()
+            message(STATUS "OpenMP is enabled")
+            target_link_libraries(mops PUBLIC OpenMP::OpenMP_CXX)
+        endif()
     else()
         message(WARNING "Could not find OpenMP")
         if(COMPILER_SUPPORTS_WPRAGMAS)
@@ -153,6 +159,20 @@ else()
     endif()
 endif()
 
+check_cxx_source_compiles("struct s {int *restrict x;}; int main() {return 0;}" HAVE_RESTRICT)
+check_cxx_source_compiles("struct s {int *__restrict__ x;}; int main() {return 0;}" HAVE___RESTRICT__)
+check_cxx_source_compiles("struct s {int *__restrict x;}; int main() {return 0;}" HAVE___RESTRICT)
+
+if (HAVE_RESTRICT)
+    target_compile_definitions(mops PUBLIC "MOPS_RESTRICT=restrict")
+elseif (HAVE___RESTRICT__)
+    target_compile_definitions(mops PUBLIC "MOPS_RESTRICT=__restrict__")
+elseif (HAVE___RESTRICT)
+    target_compile_definitions(mops PUBLIC "MOPS_RESTRICT=__restrict")
+else()
+    target_compile_definitions(mops PUBLIC "MOPS_RESTRICT=")
+endif()
+
 if (MOPS_ARCH_NATIVE)
     check_cxx_compiler_flag("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
     # for some reason COMPILER_SUPPORTS_MARCH_NATIVE is true with Apple clang,

mops/include/mops/tensor.h

@@ -1,50 +1,49 @@
 #ifndef MOPS_TENSOR_H
 #define MOPS_TENSOR_H
 
-#include <stddef.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct mops_tensor_3d_f32_t {
-    float *__restrict__ data;
+    float *MOPS_RESTRICT data;
     int64_t shape[3];
 };
 
 struct mops_tensor_3d_f64_t {
-    double *__restrict__ data;
+    double *MOPS_RESTRICT data;
     int64_t shape[3];
 };
 
 struct mops_tensor_2d_f32_t {
-    float *__restrict__ data;
+    float *MOPS_RESTRICT data;
     int64_t shape[2];
 };
 
 struct mops_tensor_2d_f64_t {
-    double *__restrict__ data;
+    double *MOPS_RESTRICT data;
     int64_t shape[2];
 };
 
 struct mops_tensor_1d_f32_t {
-    float *__restrict__ data;
+    float *MOPS_RESTRICT data;
     int64_t shape[1];
 };
 
 struct mops_tensor_1d_f64_t {
-    double *__restrict__ data;
+    double *MOPS_RESTRICT data;
     int64_t shape[1];
 };
 
 struct mops_tensor_1d_i32_t {
-    int32_t *__restrict__ data;
+    int32_t *MOPS_RESTRICT data;
     int64_t shape[1];
 };
 
 struct mops_tensor_2d_i32_t {
-    int32_t *__restrict__ data;
+    int32_t *MOPS_RESTRICT data;
     int64_t shape[2];
 };
 

mops/include/mops/tensor.hpp

@@ -7,7 +7,7 @@ namespace mops {
 template <typename scalar_t, size_t N_DIMS> struct Tensor {
     /// Pointer to the first element of the tensor. The data must be
     /// contiguous and in row-major order.
-    scalar_t *__restrict__ data;
+    scalar_t *MOPS_RESTRICT data;
     /// Shape of the tensor
     size_t shape[N_DIMS];
 };

pyproject.toml

@@ -43,15 +43,15 @@ repository = "https://github.com/lab-cosmo/mops"
 [build-system]
 requires = [
     "setuptools >=68",
-    "cmake <3.28",  # this should be changed once cmake 3.28.1 is on PyPI
+    "cmake",
 ]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
 zip-safe = false
 
 [tool.setuptools.packages.find]
-where = ["python/mops/src/"]
+where = ["python/mops/src"]
 
 ### ======================================================================== ###
 [tool.pytest.ini_options]

scripts/check-format.sh

@@ -1,12 +1,23 @@
 #!/bin/bash
 
-for file in $(find . -type f \( -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" -o -name "*.cu" -o -name "*.cuh" \)  \
--not -path "*/external/*" -not -path "*/build/*" -not -path "*/.tox/*"); do
-    clang-format -i "$file"
-    if git diff --quiet "$file"; then
-    echo "✅ $file is properly formatted."
-    else
-    echo "❌ $file is not properly formatted. Please run './scripts/format.sh' from the mops root directory"
-    exit 1
+ALL_FILES=$(
+    find . -type f \( -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" -o -name "*.cu" -o -name "*.cuh" \) \
+        -not -path "*/external/*"  \
+        -not -path "*/build/*"     \
+        -not -path "*/.tox/*"      \
+    )
+
+ERRORS=0
+for file in $ALL_FILES; do
+    if ! clang-format --dry-run --Werror "$file"; then
+        ((ERRORS = ERRORS + 1))
     fi
 done
+
+if [[ $ERRORS == 0 ]]; then
+    echo "✅ all files are properly formatted"
+else
+    echo "❌ there are $ERRORS files not not properly formatted."
+    echo "Please run './scripts/format.sh' from the mops root directory"
+    exit $ERRORS
+fi