commit 2b47345ff54be47f71000722aafaf3d0a124c35c · pyrox.dev/nixpkgs

+37

pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch

···

       1
       1
       +
       From 44d0a3a9bd8c6fe59f6ccb44206a50a900bfcf4a Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Connor Baker <connor.baker@tweag.io>

     

       3
       3
       +
       Date: Tue, 31 Oct 2023 14:30:24 +0000

     

       4
       4
       +
       Subject: [PATCH] aarch64/math-vector.h: add NVCC include guard

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        sysdeps/aarch64/fpu/bits/math-vector.h | 6 +++---

     

       8
       8
       +
        1 file changed, 3 insertions(+), 3 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h

     

       11
       11
       +
       index 7c200599c1..583a426494 100644

     

       12
       12
       +
       --- a/sysdeps/aarch64/fpu/bits/math-vector.h

     

       13
       13
       +
       +++ b/sysdeps/aarch64/fpu/bits/math-vector.h

     

       14
       14
       +
       @@ -25,17 +25,17 @@

     

       15
       15
       +
        /* Get default empty definitions for simd declarations.  */

     

       16
       16
       +
        #include <bits/libm-simd-decl-stubs.h>

     

       17
       17
       +
        

     

       18
       18
       +
       -#if __GNUC_PREREQ(9, 0)

     

       19
       19
       +
       +#if __GNUC_PREREQ(9, 0) && !defined(__CUDACC__)

     

       20
       20
       +
        #  define __ADVSIMD_VEC_MATH_SUPPORTED

     

       21
       21
       +
        typedef __Float32x4_t __f32x4_t;

     

       22
       22
       +
        typedef __Float64x2_t __f64x2_t;

     

       23
       23
       +
       -#elif __glibc_clang_prereq(8, 0)

     

       24
       24
       +
       +#elif __glibc_clang_prereq(8, 0) && !defined(__CUDACC__)

     

       25
       25
       +
        #  define __ADVSIMD_VEC_MATH_SUPPORTED

     

       26
       26
       +
        typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t;

     

       27
       27
       +
        typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t;

     

       28
       28
       +
        #endif

     

       29
       29
       +
        

     

       30
       30
       +
       -#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)

     

       31
       31
       +
       +#if (__GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)) && !defined(__CUDACC__)

     

       32
       32
       +
        #  define __SVE_VEC_MATH_SUPPORTED

     

       33
       33
       +
        typedef __SVFloat32_t __sv_f32_t;

     

       34
       34
       +
        typedef __SVFloat64_t __sv_f64_t;

     

       35
       35
       +
       -- 

     

       36
       36
       +
       2.42.0

     

       37
       37
       +

+13 -1

pkgs/development/libraries/glibc/common.nix

···

       97
       97
        
             */

     

       98
       98
        
             ./reenable_DT_HASH.patch

     

       99
       99
        
           ]

     

       100
       100
       +
           /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost

     

       101
       101
       +
              every HPC piece of software, without this patch CUDA compilation on ARM

     

       102
       102
       +
              is effectively broken. See

     

       103
       103
       +
              https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2.

     

       104
       104
       +
           */

     

       105
       105
       +
           ++ (

     

       106
       106
       +
             let

     

       107
       107
       +
               isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64;

     

       108
       108
       +
               isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux;

     

       109
       109
       +
             in

     

       110
       110
       +
             lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch

     

       111
       111
       +
           )

     

       100
       112
        
           ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch

     

       101
       113
        
           ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;

     

       102
       114
        
       

     
···

       276
       288
        
       

     

       277
       289
        
           license = licenses.lgpl2Plus;

     

       278
       290
        
       

     

       279
       279
       -
           maintainers = with maintainers; [ eelco ma27 ];

     

       291
       291
       +
           maintainers = with maintainers; [ eelco ma27 connorbaker ];

     

       280
       292
        
           platforms = platforms.linux;

     

       281
       293
        
         } // (args.meta or {});

     

       282
       294
        
       })