Merge pull request numpy#143 from SwayamInSync/main

Bundle SLEEF and submodules using meson wrap [sdist compatible]

Author: ngoldbaum

.github/workflows/build_wheels.yml

@@ -21,19 +21,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: recursive
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: ">=3.11.0"
 
-      - name: Verify QuadBLAS submodule
-        run: |
-          ls -la quaddtype/numpy_quaddtype/QBLAS/
-          ls -la quaddtype/numpy_quaddtype/QBLAS/include/quadblas/
-
       - name: Install cibuildwheel
         run: pip install cibuildwheel==3.1.4
 
@@ -46,21 +39,8 @@ jobs:
           CIBW_BEFORE_ALL: |
             yum update -y
             yum install -y cmake gcc gcc-c++ make git pkgconfig
-            # Install SLEEF in container
-            git clone --branch 3.8 https://github.com/shibatch/sleef.git
-            cd sleef
-            cmake -S . -B build \
-              -DSLEEF_BUILD_QUAD:BOOL=ON \
-              -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON \
-              -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-            cmake --build build/ --clean-first -j
-            cmake --install build --prefix /usr/local
           CIBW_ENVIRONMENT: >
-            CFLAGS="-I/usr/local/include -I{project}/numpy_quaddtype/QBLAS/include $CFLAGS"
-            CXXFLAGS="-I/usr/local/include -I{project}/numpy_quaddtype/QBLAS/include -fext-numeric-literals $CXXFLAGS"
-            LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib -Wl,-rpath,/usr/local/lib64 -Wl,-rpath,/usr/local/lib -fopenmp $LDFLAGS"
-            LD_LIBRARY_PATH="/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH"
-            PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+            LDFLAGS="-fopenmp"
           CIBW_REPAIR_WHEEL_COMMAND: |
             auditwheel repair -w {dest_dir} --plat manylinux_2_28_x86_64 {wheel}
           CIBW_TEST_COMMAND: |
@@ -89,8 +69,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: recursive
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -107,27 +85,6 @@ jobs:
           brew cleanup
           brew install $packages
 
-      - name: Install SLEEF
-        env:
-          MACOSX_DEPLOYMENT_TARGET: ${{ matrix.os == 'macos-13' && '13.0' || '14.0' }}
-        run: |
-          git clone --branch 3.8 https://github.com/shibatch/sleef.git
-          cd sleef
-          cmake -S . -B build \
-            -DSLEEF_BUILD_QUAD:BOOL=ON \
-            -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON \
-            -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-            -DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.os == 'macos-13' && '13.0' || '14.0' }} \
-            -DCMAKE_INSTALL_RPATH="@loader_path/../lib" \
-            -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
-          cmake --build build/ --clean-first -j
-          sudo cmake --install build --prefix /usr/local
-
-      - name: Verify QuadBLAS submodule
-        run: |
-          ls -la quaddtype/numpy_quaddtype/QBLAS/
-          ls -la quaddtype/numpy_quaddtype/QBLAS/include/quadblas/
-
       - name: Installing Python dependencies
         run: |
           pip install -U pip
@@ -142,11 +99,6 @@ jobs:
           CIBW_BUILD_VERBOSITY: "3"
           CIBW_ENVIRONMENT: >
             MACOSX_DEPLOYMENT_TARGET="${{ matrix.os == 'macos-13' && '13.0' || '14.0' }}"
-            DYLD_LIBRARY_PATH="/usr/local/lib:$DYLD_LIBRARY_PATH"
-            CFLAGS="-I/usr/local/include -I{project}/numpy_quaddtype/QBLAS/include $CFLAGS"
-            CXXFLAGS="-I/usr/local/include -I{project}/numpy_quaddtype/QBLAS/include $CXXFLAGS"
-            LDFLAGS="-L/usr/local/lib $LDFLAGS"
-            PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
           CIBW_REPAIR_WHEEL_COMMAND: >
             delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
           CIBW_TEST_COMMAND: |
@@ -176,8 +128,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: recursive
 
       - name: Setup MSVC
         uses: ilammy/msvc-dev-cmd@v1
@@ -193,21 +143,6 @@ jobs:
       - name: Install CMake
         uses: lukka/get-cmake@latest
 
-      - name: Verify QuadBLAS submodule
-        shell: pwsh
-        run: |
-          Get-ChildItem quaddtype/numpy_quaddtype/QBLAS/
-          Get-ChildItem quaddtype/numpy_quaddtype/QBLAS/include/quadblas/
-
-      - name: Clone and Build SLEEF
-        shell: pwsh
-        run: |
-          git clone --branch 3.8 https://github.com/shibatch/sleef.git
-          cd sleef
-          cmake -S . -B build -G "Visual Studio 17 2022" -A ${{ matrix.architecture == 'x86' && 'Win32' || 'x64' }} -DSLEEF_BUILD_QUAD:BOOL=ON -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-          cmake --build build --config Release
-          cmake --install build --prefix "C:/sleef" --config Release
-
       - name: Install build dependencies
         shell: bash -l {0}
         run: |
@@ -226,12 +161,8 @@ jobs:
           CIBW_BEFORE_BUILD: |
             pip install meson meson-python ninja numpy
           CIBW_ENVIRONMENT: >
-            INCLUDE="C:/sleef/include;{project}/numpy_quaddtype/QBLAS/include;$INCLUDE"
-            LIB="C:/sleef/lib;$LIB"
-            PATH="C:/sleef/bin;$PATH"
-            CFLAGS="/IC:/sleef/include /I{project}/numpy_quaddtype/QBLAS/include /DDISABLE_QUADBLAS $CFLAGS"
-            CXXFLAGS="/IC:/sleef/include /I{project}/numpy_quaddtype/QBLAS/include /DDISABLE_QUADBLAS $CXXFLAGS"
-            LDFLAGS="C:/sleef/lib/sleef.lib C:/sleef/lib/sleefquad.lib $LDFLAGS"
+            CFLAGS="/DDISABLE_QUADBLAS $CFLAGS"
+            CXXFLAGS="/DDISABLE_QUADBLAS $CXXFLAGS"
           CIBW_REPAIR_WHEEL_COMMAND: 'delvewheel repair -w {dest_dir} {wheel} --add-path C:\sleef\bin'
           CIBW_TEST_COMMAND: |
             pip install {package}[test]
@@ -258,49 +189,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          submodules: recursive
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: ">=3.11.0"
 
-      - name: Verify QuadBLAS submodule
-        run: |
-          ls -la quaddtype/numpy_quaddtype/QBLAS/
-          ls -la quaddtype/numpy_quaddtype/QBLAS/include/quadblas/
-
       - name: Install system dependencies
         run: |
           sudo apt-get update -y
           sudo apt-get install -y cmake gcc g++ make git pkg-config
 
-      - name: Install SLEEF
-        run: |
-          git clone --branch 3.8 https://github.com/shibatch/sleef.git
-          cd sleef
-          cmake -S . -B build \
-            -DSLEEF_BUILD_QUAD:BOOL=ON \
-            -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON \
-            -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-          cmake --build build/ --clean-first -j
-          sudo cmake --install build --prefix /usr/local
-
       - name: Install build dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install build
+          python -m pip install build pytest
 
-      - name: Build SDist
+      - name: Build SDist & test sdist
         env:
-          CFLAGS: "-I/usr/local/include -I$(pwd)/numpy_quaddtype/QBLAS/include"
-          CXXFLAGS: "-I/usr/local/include -I$(pwd)/numpy_quaddtype/QBLAS/include -fext-numeric-literals"
-          LDFLAGS: "-L/usr/local/lib64 -L/usr/local/lib -Wl,-rpath,/usr/local/lib64 -Wl,-rpath,/usr/local/lib -fopenmp"
-          LD_LIBRARY_PATH: "/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH"
-          PKG_CONFIG_PATH: "/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+          LDFLAGS: "-fopenmp"
         run: |
           python -m build --sdist --outdir dist/
+          pip install dist/*.tar.gz -v
+          pytest -s tests
         working-directory: ./quaddtype
 
       - name: Upload SDist artifact

.github/workflows/ci.yml

@@ -60,35 +60,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libmpfr-dev libssl-dev libfftw3-dev
 
-      - name: Install SLEEF
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y cmake gcc g++ make git pkg-config
-          git clone --branch 3.8 https://github.com/shibatch/sleef.git
-          cd sleef
-          cmake -S . -B build -DSLEEF_BUILD_QUAD:BOOL=ON -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-          cmake --build build/ --clean-first -j
-          sudo cmake --install build --prefix /usr/local
-
       - name: Install quaddtype
         working-directory: quaddtype
         run: |
-          # Initialize submodules first
-          git submodule update --init --recursive
-          ls -la numpy_quaddtype/QBLAS/
-
-          # Set environment variables with proper export and correct paths
-          export CFLAGS="-I/usr/local/include -I$(pwd)/numpy_quaddtype/QBLAS/include"
-          export CXXFLAGS="-I/usr/local/include -I$(pwd)/numpy_quaddtype/QBLAS/include -fext-numeric-literals"
-          export LDFLAGS="-L/usr/local/lib64 -L/usr/local/lib -Wl,-rpath,/usr/local/lib64 -Wl,-rpath,/usr/local/lib -fopenmp"
-          export LD_LIBRARY_PATH="/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH"
-
-          # Install with meson args to ensure the C++ flags are passed through
-          python -m pip install . -v --no-build-isolation \
-            -Cbuilddir=build \
-            -C'compile-args=-v' \
-            -Csetup-args="-Dbuildtype=debug" \
-            -Csetup-args="-Dcpp_args=-fext-numeric-literals"
+          export LDFLAGS="-fopenmp"
+          python -m pip install . -v
 
       - name: Run quaddtype tests
         working-directory: quaddtype

.gitignore

@@ -137,3 +137,8 @@ compile_commands.json
 *.whl
 .DS_Store
 .idea/
+
+# quaddtype
+/quaddtype/subprojects/qblas/
+/quaddtype/subprojects/sleef/
+.wraplock

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "quaddtype/numpy_quaddtype/QBLAS"]
-	path = quaddtype/numpy_quaddtype/QBLAS
-	url = https://github.com/SwayamInSync/QBLAS

quaddtype/LICENSE

@@ -0,0 +1,30 @@
+Copyright (c) 2022, NumPy Developers.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials provided
+       with the distribution.
+
+    * Neither the name of the NumPy Developers nor the names of any
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.