Merge pull request #187380 from sifmelcara/xsimd-8.1.0

This commit is contained in:
Sandro 2022-08-30 17:23:07 +02:00 committed by GitHub
commit eabd578fe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,35 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
let
version = "7.5.0";
darwin_src = fetchFromGitHub {
owner = "xtensor-stack";
repo = "xsimd";
rev = version;
sha256 = "eGAdRSYhf7rbFdm8g1Tz1ZtSVu44yjH/loewblhv9Vs=";
# Avoid requiring apple_sdk. We're doing this here instead of in the patchPhase
# because this source is directly used in arrow-cpp.
# pyconfig.h defines _GNU_SOURCE to 1, so we need to stamp that out too.
# Upstream PR with a better fix: https://github.com/xtensor-stack/xsimd/pull/463
postFetch = ''
mkdir $out
tar -xf $downloadedFile --directory=$out --strip-components=1
substituteInPlace $out/include/xsimd/types/xsimd_scalar.hpp \
--replace 'defined(__APPLE__)' 0 \
--replace 'defined(_GNU_SOURCE)' 0
'';
};
stdenv.mkDerivation rec {
pname = "xsimd";
version = "8.1.0";
src = fetchFromGitHub {
owner = "xtensor-stack";
repo = "xsimd";
rev = version;
sha256 = "0c9pq5vz43j99z83w3b9qylfi66mn749k1afpv5cwfxggbxvy63f";
sha256 = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk=";
};
in stdenv.mkDerivation {
pname = "xsimd";
inherit version;
src = if stdenv.hostPlatform.isDarwin then darwin_src else src;
nativeBuildInputs = [ cmake ];
@ -38,13 +16,14 @@ in stdenv.mkDerivation {
doCheck = true;
checkInputs = [ gtest ];
checkTarget = "xtest";
GTEST_FILTER = let
GTEST_FILTER =
let
# Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456
filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [
"error_gamma_test/sse_double.gamma"
"error_gamma_test/avx_double.gamma"
"error_gamma_test/*"
];
in "-${builtins.concatStringsSep ":" filteredTests}";
in
"-${builtins.concatStringsSep ":" filteredTests}";
meta = with lib; {
description = "C++ wrappers for SIMD intrinsics";