fixing conflict

Author: SwayamInSync

.github/workflows/big_endian.yml

@@ -22,7 +22,7 @@ permissions:
 
 jobs:
   big_endian_tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     continue-on-error: true
     strategy:
       fail-fast: false
@@ -49,7 +49,7 @@ jobs:
 
     name: "${{ matrix.BUILD_PROP[0] }}"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-tags: true
@@ -66,7 +66,7 @@ jobs:
           sudo apt install -y ninja-build gcc-${TOOLCHAIN_NAME} g++-${TOOLCHAIN_NAME} gfortran-${TOOLCHAIN_NAME}
 
       - name: Cache docker container
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: container-cache
         with:
           path: ~/docker_${{ matrix.BUILD_PROP[1] }}

.github/workflows/build_wheels.yml

@@ -20,7 +20,7 @@ jobs:
     name: Build wheels on Linux
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -61,7 +61,7 @@ jobs:
           python -m cibuildwheel --output-dir wheelhouse
         working-directory: ./quaddtype
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           path: ./quaddtype/wheelhouse/*.whl
           name: wheels-linux
@@ -74,7 +74,7 @@ jobs:
         os: [macos-14, macos-15, macos-15-intel]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -125,7 +125,7 @@ jobs:
           python -m cibuildwheel --output-dir wheelhouse
         working-directory: ./quaddtype
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           path: ./quaddtype/wheelhouse/*.whl
           name: wheels-${{ matrix.os }}
@@ -139,7 +139,7 @@ jobs:
         architecture: [x64]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup MSVC
         uses: ilammy/msvc-dev-cmd@v1
@@ -185,7 +185,7 @@ jobs:
           if (-not (Test-Path wheelhouse/*.whl)) { throw "Wheel was not created" }
         working-directory: ./quaddtype
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           path: ./quaddtype/wheelhouse/*.whl
           name: wheels-windows-${{ matrix.architecture }}
@@ -194,7 +194,7 @@ jobs:
     name: Build SDist
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -222,7 +222,7 @@ jobs:
         working-directory: ./quaddtype
 
       - name: Upload SDist artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: sdist
           path: ./quaddtype/dist/*.tar.gz
@@ -248,7 +248,7 @@ jobs:
 
     steps:
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           pattern: "*"
           path: dist

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup Python
         uses: actions/setup-python@v6
         with:

.github/workflows/typecheck.yml

@@ -20,12 +20,12 @@ jobs:
     timeout-minutes: 2
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      - uses: astral-sh/setup-uv@v7.1.3
+      - uses: astral-sh/setup-uv@v7.1.6
         with:
           activate-environment: true
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: install
         working-directory: quaddtype

.gitignore

@@ -141,6 +141,7 @@ compile_commands.json
 # quaddtype
 /quaddtype/subprojects/qblas/
 /quaddtype/subprojects/sleef/
+/quaddtype/subprojects/pythoncapi-compat/
 .wraplock
 
 # docs

quaddtype/README.md

@@ -42,8 +42,11 @@ Building the `numpy-quaddtype` package:
 python3 -m venv temp
 source temp/bin/activate
 
-# Install the package
-pip install numpy pytest meson-python
+# Install NumPy from source
+pip install "numpy @ git+https://github.com/numpy/numpy.git"
+
+# Install build and test dependencies
+pip install pytest meson meson-python
 
 # To build without QBLAS (default for MSVC)
 # export CFLAGS="-DDISABLE_QUADBLAS"

quaddtype/meson.build

@@ -25,8 +25,9 @@ if sleef_dep.found() and sleef_dep.type_name() != 'internal'
   # SLEEF found system-wide - verify quad-precision support
   cpp = meson.get_compiler('cpp')
   sleefquad_lib = cpp.find_library('sleefquad', required: false)
+  tlfloat_lib = cpp.find_library('tlfloat', required: false)
 
-  if sleefquad_lib.found()
+  if sleefquad_lib.found() and tlfloat_lib.found()
     sleefquad_test_code = '''
     #include <sleefquad.h>
 
@@ -40,40 +41,48 @@ if sleef_dep.found() and sleef_dep.type_name() != 'internal'
     # this should compile and link
     quad_works = cpp.links(
       sleefquad_test_code,
-      dependencies: [sleef_dep, sleefquad_lib],
+      dependencies: [sleef_dep, sleefquad_lib, tlfloat_lib],
       name: 'SLEEF quad-precision support'
     )
 
     if quad_works
       sleefquad_dep = declare_dependency(
         dependencies: [sleef_dep, sleefquad_lib]
       )
+      tlfloat_dep = declare_dependency(
+        dependencies: [tlfloat_lib]
+      )
       use_system_sleef = true
     else
-      fallback_reason = 'quad-precision support is not working'
+      fallback_reason = 'System-wide SLEEF installation found but a test for quad precision support failed.'
     endif
   else
-    fallback_reason = 'sleefquad library is missing'
+    fallback_reason = 'System-wide SLEEF installation does not have a sleefquad library.'
   endif
 else
-  fallback_reason = 'SLEEF not found system-wide'
+  fallback_reason = 'Cannot find system-wide SLEEF installation.'
 endif
 
 if use_system_sleef
   message('Using system-wide SLEEF installation with quad-precision support')
 else
-  warning('Falling back to SLEEF subproject: ' + fallback_reason)
   sleef_subproj = subproject('sleef')
   sleef_dep = sleef_subproj.get_variable('sleef_dep')
   sleefquad_dep = sleef_subproj.get_variable('sleefquad_dep')
-  message('Using SLEEF subproject')
+  tlfloat_dep = sleef_subproj.get_variable('tlfloat_dep')
+  warning(fallback_reason)
+  message('Proceeding with vendored SLEEF subproject instead')
 endif
 
 incdir_numpy = run_command(py,
   ['-c', 'import numpy; print(numpy.get_include())'],
   check : true
 ).stdout().strip()
 
+# pythoncapi-compat for portable C API usage across Python versions
+pythoncapi_compat_subproj = subproject('pythoncapi-compat')
+pythoncapi_compat_inc = pythoncapi_compat_subproj.get_variable('incdir')
+
 # print numpy version used
 numpy_version = run_command(py,
   ['-c', 'import numpy; print(numpy.__version__)'],
@@ -84,7 +93,7 @@ message('Using NumPy version: @0@'.format(numpy_version))
 npymath_path = incdir_numpy / '..' / 'lib'
 npymath_lib = c.find_library('npymath', dirs: npymath_path)
 
-dependencies = [py_dep, qblas_dep, sleef_dep, sleefquad_dep, npymath_lib]
+dependencies = [py_dep, qblas_dep, sleef_dep, sleefquad_dep, tlfloat_dep, npymath_lib]
 
 # Add OpenMP dependency (optional, for threading)
 openmp_dep = dependency('openmp', required: false, static: false)
@@ -99,6 +108,11 @@ if not is_windows
     if cpp.has_argument('-fext-numeric-literals')
         add_project_arguments('-fext-numeric-literals', language: 'cpp')
     endif
+    
+    # Suppress warnings from system headers (sleefquad.h has many unused inline functions)
+    if cpp.has_argument('-Wno-unused-function')
+        add_project_arguments('-Wno-unused-function', language: ['c', 'cpp'])
+    endif
 endif
 
 # Thread-local storage detection (borrowed from NumPy)
@@ -144,6 +158,7 @@ includes = include_directories(
         'numpy_quaddtype/src',
     ]
 )
+pythoncapi_includes = pythoncapi_compat_inc
 
 srcs = [
     'numpy_quaddtype/src/quad_common.h',
@@ -198,5 +213,5 @@ py.extension_module('_quaddtype_main',
   dependencies: dependencies,
   install: true,
   subdir: 'numpy_quaddtype',
-  include_directories: [includes, build_includes],
+  include_directories: [includes, build_includes, pythoncapi_includes],
 )

quaddtype/numpy_quaddtype/__init__.py

@@ -1,3 +1,5 @@
+import enum
+
 from ._quaddtype_main import (
     QuadPrecision,
     QuadPrecDType,
@@ -10,8 +12,16 @@
 
 __version__ = "0.2.0"
 
+
+class QuadBackend(enum.IntEnum):
+    """Backend type for QuadPrecision computations."""
+    SLEEF = 0
+    LONGDOUBLE = 1
+
+
 __all__ = [
-    'QuadPrecision', 'QuadPrecDType', 'SleefQuadPrecision', 'LongDoubleQuadPrecision',
+    'QuadPrecision', 'QuadPrecDType', 'QuadBackend',
+    'SleefQuadPrecision', 'LongDoubleQuadPrecision',
     'SleefQuadPrecDType', 'LongDoubleQuadPrecDType', 'is_longdouble_128', 
     # Constants
     'pi', 'e', 'log2e', 'log10e', 'ln2', 'ln10', 'max_value', 'epsilon',

quaddtype/numpy_quaddtype/__init__.pyi

@@ -1,4 +1,5 @@
 from typing import Final
+import enum
 
 from ._quaddtype_main import (
     QuadPrecDType,
@@ -10,9 +11,14 @@ from ._quaddtype_main import (
     set_num_threads,
 )
 
+class QuadBackend(enum.IntEnum):
+    SLEEF = 0
+    LONGDOUBLE = 1
+
 __all__ = [
     "QuadPrecision",
     "QuadPrecDType",
+    "QuadBackend",
     "SleefQuadPrecision",
     "LongDoubleQuadPrecision",
     "SleefQuadPrecDType",

quaddtype/numpy_quaddtype/_quaddtype_main.pyi

@@ -4,6 +4,8 @@ import numpy as np
 from numpy._typing import _128Bit  # pyright: ignore[reportPrivateUsage]
 from typing_extensions import Never, Self, override
 
+from numpy_quaddtype import QuadBackend
+
 _Backend: TypeAlias = Literal["sleef", "longdouble"]
 _IntoQuad: TypeAlias = (
     QuadPrecision
@@ -20,6 +22,10 @@ _ScalarItemArg: TypeAlias = Literal[0, -1] | tuple[Literal[0, -1]] | tuple[()]
 class QuadPrecDType(np.dtype[QuadPrecision]):  # type: ignore[misc]  # pyright: ignore[reportGeneralTypeIssues]
     def __new__(cls, /, backend: _Backend = "sleef") -> Self: ...
 
+    # QuadPrecDType specific attributes
+    @property
+    def backend(self) -> QuadBackend: ...
+
     # `numpy.dtype` overrides
     names: None  # pyright: ignore[reportIncompatibleVariableOverride]
     @property
@@ -123,7 +129,7 @@ class QuadPrecision(np.floating[_128Bit]):
     @override
     def __add__(self, other: _IntoQuad, /) -> Self: ...  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]
     @override
-    def __radd__(self, other: _IntoQuad, /) -> Self: ...  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]
+    def __radd__(self, other: _IntoQuad, /) -> Self: ...  # type: ignore[override, misc]  # pyright: ignore[reportIncompatibleMethodOverride]
     @override
     def __sub__(self, other: _IntoQuad, /) -> Self: ...  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]
     @override