remove mac intel support

.github/workflows/ci-mac.yml

@@ -54,76 +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/[email protected]
-      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" 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 }}
@@ -162,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

src/pymodule/amplitudecorrection/functions/module.hpp

@@ -50,7 +50,7 @@ void init_m_functions(pybind11::module& m)
 
     // range correction
     submodule.def("get_sample_numbers_plus_half",
-                  &get_sample_numbers_plus_half<xt::pytensor<float, 1>, int64_t>,
+                  &get_sample_numbers_plus_half<xt::pytensor<float, 1>, int32_t>,
                   DOC_functions(get_sample_numbers_plus_half),
                   py::arg("first_sample_nr"),
                   py::arg("last_sample_nr"),
@@ -63,28 +63,86 @@ void init_m_functions(pybind11::module& m)
                   py::arg("sound_velocity_m_s"));
 
     submodule.def("approximate_ranges",
-                  &approximate_ranges<xt::pytensor<float, 1>, int64_t>,
+                  py::overload_cast<float, float, int32_t, int32_t, int32_t>(
+                      &approximate_ranges<xt::pytensor<float, 1>, int32_t>),
                   DOC_functions(approximate_ranges),
                   py::arg("sample_interval_s"),
                   py::arg("sound_velocity_m_s"),
                   py::arg("first_sample_nr"),
                   py::arg("last_sample_nr"),
                   py::arg("step") = 1);
 
+    submodule.def("approximate_ranges",
+                  py::overload_cast<float, float, const xt::pytensor<int32_t, 1>&>(
+                      &approximate_ranges<xt::pytensor<float, 1>, xt::pytensor<int32_t, 1>>),
+                  DOC_functions(approximate_ranges_2),
+                  py::arg("sample_interval_s"),
+                  py::arg("sound_velocity_m_s"),
+                  py::arg("sample_numbers"));
+
     submodule.def("compute_cw_range_correction",
                   &compute_cw_range_correction<xt::pytensor<float, 1>>,
                   DOC_functions(compute_cw_range_correction),
                   py::arg("ranges_m"),
                   py::arg("absorption_db_m"),
                   py::arg("tvg_factor"));
 
-    submodule.def("apply_wci_correction",
-                  &apply_wci_correction<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
-                  DOC_functions(apply_wci_correction),
+    submodule.def("apply_beam_sample_correction",
+                  &apply_beam_sample_correction<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
+                  DOC_functions(apply_beam_sample_correction),
                   py::arg("wci"),
                   py::arg("per_beam_offset"),
                   py::arg("per_sample_offset"),
                   py::arg("mp_cores") = 1);
+
+    submodule.def("apply_beam_correction",
+                  &apply_beam_correction<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
+                  DOC_functions(apply_beam_correction),
+                  py::arg("wci"),
+                  py::arg("per_beam_offset"),
+                  py::arg("mp_cores") = 1);
+
+    submodule.def("apply_sample_correction",
+                  &apply_sample_correction<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
+                  DOC_functions(apply_sample_correction),
+                  py::arg("wci"),
+                  py::arg("per_sample_offset"),
+                  py::arg("mp_cores") = 1);
+
+    submodule.def(
+        "apply_beam_sample_correction_loop",
+        &apply_beam_sample_correction_loop<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
+        DOC_functions(apply_beam_sample_correction_loop),
+        py::arg("wci"),
+        py::arg("per_beam_offset"),
+        py::arg("per_sample_offset"),
+        py::arg("mp_cores") = 1);
+
+    submodule.def(
+        "apply_beam_sample_correction_xtensor2",
+        &apply_beam_sample_correction_xtensor2<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
+        DOC_functions(apply_beam_sample_correction_xtensor2),
+        py::arg("wci"),
+        py::arg("per_beam_offset"),
+        py::arg("per_sample_offset"),
+        py::arg("mp_cores") = 1);
+    submodule.def(
+        "apply_beam_sample_correction_xtensor3",
+        &apply_beam_sample_correction_xtensor3<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
+        DOC_functions(apply_beam_sample_correction_xtensor3),
+        py::arg("wci"),
+        py::arg("per_beam_offset"),
+        py::arg("per_sample_offset"),
+        py::arg("mp_cores") = 1);
+
+    submodule.def(
+        "apply_beam_sample_correction_xsimd",
+        &apply_beam_sample_correction_xsimd<xt::pytensor<float, 2>, xt::pytensor<float, 1>>,
+        DOC_functions(apply_beam_sample_correction_xsimd),
+        py::arg("wci"),
+        py::arg("per_beam_offset"),
+        py::arg("per_sample_offset"),
+        py::arg("mp_cores") = 1);
 }
 
 } // namespace py_functions

src/pymodule/geoprocessing/backtracers/c_backtracedwci.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/backtracers/c_btconstantsvp.cpp

@@ -12,7 +12,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp>  // Numpy bindings
+#include <xtensor-python/pytensor.hpp>  // Numpy bindings
 #include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 #include <xtensor/xadapt.hpp> // Numpy bindings

src/pymodule/geoprocessing/backtracers/c_i_backtracer.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_beamsampleparameters.cpp

@@ -12,7 +12,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_raytraceresult.cpp

@@ -12,7 +12,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_raytraceresults.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_sampledirections.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_sampledirectionsrange.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_sampledirectionstime.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_sampleindices.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/datastructures/c_xyz.cpp

@@ -12,7 +12,7 @@
 // -- include pybind11 headers
 #include <pybind11/eigen.h>
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/raytracers/c_i_raytracer.cpp

@@ -11,7 +11,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/geoprocessing/raytracers/c_rtconstantsvp.cpp

@@ -15,7 +15,7 @@
 
 // -- include pybind11 headers
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp>  // Numpy bindings
+#include <xtensor-python/pytensor.hpp>  // Numpy bindings
 #include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 #include <xtensor/xadapt.hpp> // Numpy bindings

src/pymodule/module.cpp

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #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 <pybind11/iostream.h>
 #include <pybind11/pybind11.h>

src/pymodule/signalprocessing/datastructures/c_cwsignalparameters.cpp

@@ -12,7 +12,7 @@
 // -- include pybind11 headers
 #include <pybind11/eigen.h>
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/signalprocessing/datastructures/c_fmsignalparameters.cpp

@@ -12,7 +12,7 @@
 // -- include pybind11 headers
 #include <pybind11/eigen.h>
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/pymodule/signalprocessing/datastructures/c_genericsignalparameters.cpp

@@ -12,7 +12,7 @@
 // -- include pybind11 headers
 #include <pybind11/eigen.h>
 #include <pybind11/stl.h>
-#include <xtensor-python/pyarray.hpp> // Numpy bindings
+#include <xtensor-python/pytensor.hpp> // Numpy bindings
 
 namespace themachinethatgoesping {
 namespace algorithms {

src/themachinethatgoesping/algorithms/amplitudecorrection/functions/.docstrings/rangecorrection.doc.hpp

@@ -1,4 +1,4 @@
-//sourcehash: 449e2ac24adaedde10a18e765cfb777059a926172151583846f99e67ba681c04
+//sourcehash: dc65b20c5b98bd8cd1ccdc2c90c6d9cb5381f4277602d31839d11b1132321279
 
 /*
   This file contains docstrings for use in the Python bindings.
@@ -42,6 +42,8 @@ static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_f
 
 static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_approximate_ranges = R"doc()doc";
 
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_approximate_ranges_2 = R"doc()doc";
+
 static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_compute_cw_range_correction = R"doc()doc";
 
 static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_get_sample_numbers_plus_half = R"doc()doc";

src/themachinethatgoesping/algorithms/amplitudecorrection/functions/.docstrings/wcicorrection.doc.hpp

@@ -1,4 +1,4 @@
-//sourcehash: 9f9b40bf69cc0bc6ec707420219e7f552a786bcfa4cc47a6f78c86291bd384ae
+//sourcehash: a302a9f48e1b20efdf9ab01a6bae5c8fea7eea95c0e2aafc2ed22d54e3dbd97a
 
 /*
   This file contains docstrings for use in the Python bindings.
@@ -38,7 +38,23 @@
 #endif
 
 
-static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_wci_correction = R"doc()doc";
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_beam_correction = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_beam_sample_correction = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_beam_sample_correction_loop = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_beam_sample_correction_xsimd = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_beam_sample_correction_xtensor2 = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_beam_sample_correction_xtensor3 = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_apply_sample_correction = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_assert_wci_axis_shape = R"doc()doc";
+
+static const char *__doc_themachinethatgoesping_algorithms_amplitudecorrection_functions_assert_wci_beam_sample_shape = R"doc()doc";
 
 #if defined(__GNUG__)
 #pragma GCC diagnostic pop