From 96b783ddb0ef71a85e6840e8a1d60008add9d07d Mon Sep 17 00:00:00 2001
From: Peter Urban <peter.urban@ugent.be>
Date: Mon, 30 Sep 2024 13:02:12 +0200
Subject: [PATCH] remove mac intel support

---
 .github/workflows/ci-mac.yml                  | 70 -------------------
 src/pymodule/module.cpp                       |  2 +-
 .../image/.docstrings/make_wci.doc.hpp        |  2 +-
 .../watercolumn/image/make_wci.hpp            |  2 +-
 4 files changed, 3 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml
index 0b0b01f..c146726 100644
--- a/.github/workflows/ci-mac.yml
+++ b/.github/workflows/ci-mac.yml
@@ -54,75 +54,6 @@ concurrency:
   #BUILD_TYPE: Release
   
 jobs:
-  macos:
-    name: CI ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        cxx_compiler: ["$(brew --prefix llvm@18)/bin/clang++"] 
-        llvm: ["$(brew --prefix llvm@18)"]
-        boost: ["$(brew --prefix boost)"]
-        libomp: ["$(brew --prefix libomp)"]
-        os: ["macos-12"] 
-                
-    # env does not work here because is resolved as string and not command 
-    # env:
-    #   CXX: ${{ matrix.cxx_compiler }}
-      
-    steps:
-    
-    - uses: actions/setup-python@v3
-      with:
-        python-version: '3.12'
-        
-    - name: checkout main repository
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
-        lfs: false
-
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2
-      with:
-        key: super-ci-mac-2  # name for the cache
-        
-    # uninstall clang 15
-    - run: brew uninstall llvm@15
-
-    - run: brew install coreutils llvm@18
-        
-    - run: brew install libomp boost
-    
-    - run: pip install meson meson-python ninja pytest numpy
-    
-    # LDFLAGS="-L/opt/homebrew/opt/libomp/lib" CPPFLAGS="-I/opt/homebrew/opt/libomp/include" 
-    - name: configure meson
-      run: |
-        BOOST_ROOT=${{ matrix.boost }} CXX=${{ matrix.llvm }}/bin/clang++  LDFLAGS="-L${{ matrix.llvm }}/lib/c++ -L${{ matrix.llvm }}/lib -L${{ matrix.boost }}/lib -undefined dynamic_lookup -Wl,-no_fixup_chains -Wl,-dead_strip -Wl,-rpath, ${{ matrix.llvm }}/lib/c++" CPPFLAGS="-I${{ matrix.llvm }}/include -I${{ matrix.boost }}/include" meson setup builddir/; meson configure builddir -Dpython.install_env=auto
-    - name: compile project
-      run: meson compile -C builddir/
-
-    - name: test (cpp)
-      run: meson test -C builddir/ --print-errorlogs
-
-    - name: install project
-      run: sudo meson install -C builddir/
-
-    - name: install pip requirements
-      run: pip install -r requirements.txt
-
-    - name: test (pytest)
-      run: pytest -v
-      
-    - name: 'Upload error log'
-      uses: actions/upload-artifact@v4
-      if: failure()
-      with:
-        name: ${{matrix.container}}_testlog
-        path: builddir/meson-logs/meson-log.txt
-        retention-days: 5
-
   macos_arm:
     name: CI ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -161,7 +92,6 @@ jobs:
     
     - run: pip install meson meson-python ninja pytest numpy
     
-    # LDFLAGS="-L/opt/homebrew/opt/libomp/lib" CPPFLAGS="-I/opt/homebrew/opt/libomp/include" 
     - name: configure meson
       run: |
         meson setup builddir -Dpython.install_env=auto
diff --git a/src/pymodule/module.cpp b/src/pymodule/module.cpp
index 9c2c20b..4a9e2cc 100644
--- a/src/pymodule/module.cpp
+++ b/src/pymodule/module.cpp
@@ -7,7 +7,7 @@
 
 #define FORCE_IMPORT_ARRAY // this is needed for xtensor-python but must only be included once
 
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 #include "watercolumn/module.hpp"
 
diff --git a/src/themachinethatgoesping/pingprocessing/watercolumn/image/.docstrings/make_wci.doc.hpp b/src/themachinethatgoesping/pingprocessing/watercolumn/image/.docstrings/make_wci.doc.hpp
index 3e03f0b..c6340fb 100644
--- a/src/themachinethatgoesping/pingprocessing/watercolumn/image/.docstrings/make_wci.doc.hpp
+++ b/src/themachinethatgoesping/pingprocessing/watercolumn/image/.docstrings/make_wci.doc.hpp
@@ -1,4 +1,4 @@
-//sourcehash: f053c2f903eb29c1af6f809e4988c4e49b82e3f449b5395881af324425bbc25b
+//sourcehash: c6964683f8029122d654c6e082febdbfc6057f469b95b2440cd9488b23dfd480
 
 /*
   This file contains docstrings for use in the Python bindings.
diff --git a/src/themachinethatgoesping/pingprocessing/watercolumn/image/make_wci.hpp b/src/themachinethatgoesping/pingprocessing/watercolumn/image/make_wci.hpp
index 5c6a99c..a71a464 100644
--- a/src/themachinethatgoesping/pingprocessing/watercolumn/image/make_wci.hpp
+++ b/src/themachinethatgoesping/pingprocessing/watercolumn/image/make_wci.hpp
@@ -11,7 +11,7 @@
 
 #include <xtensor/xmath.hpp>
 #include <xtensor/xtensor.hpp>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 #include <themachinethatgoesping/echosounders/filetemplates/datatypes/i_ping.hpp>