Unverified Commit d67818b5 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #268094 from doronbehar/pkg/xtensor 

xsimd10: remove
parents 828eedd2 3af5377f

pkgs/development/libraries/xsimd/10.nix

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cmake

, doctest

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "xsimd";

  version = "10.0.0";



  src = fetchFromGitHub {

    owner = "xtensor-stack";

    repo = "xsimd";

    rev = finalAttrs.version;

    sha256 = "sha256-+ewKbce+rjNWQ0nQzm6O4xSwgzizSPpDPidkQYuoSTU=";

  };



  nativeBuildInputs = [

    cmake

  ];

  patches = lib.optionals stdenv.isDarwin [

    # https://github.com/xtensor-stack/xsimd/issues/807

    ./disable-test_error_gamma-test.patch

  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [

    # https://github.com/xtensor-stack/xsimd/issues/798

    ./disable-polar-test.patch

  ];



  cmakeFlags = [

    "-DBUILD_TESTS=${if (finalAttrs.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}"

  ];



  doCheck = true;

  nativeCheckInputs = [

    doctest

  ];

  checkTarget = "xtest";



  meta = with lib; {

    description = "C++ wrappers for SIMD intrinsics";

    homepage = "https://github.com/xtensor-stack/xsimd";

    license = licenses.bsd3;

    maintainers = with maintainers; [ tobim ];

    platforms = platforms.all;

  };

})

pkgs/development/libraries/xtensor/default.nix

+13 −5
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, cmake

, doctest

, enableAssertions ? false

, enableBoundChecks ? false # Broadcasts don't pass bound checks

, nlohmann_json

, xtl

# Although this dependency is of the same GitHub organization, xtensor don't

# support xsimd 11 yet, see:

# https://github.com/xtensor-stack/xtensor/issues/2721

, xsimd10

, xsimd

}:



stdenv.mkDerivation (finalAttrs: {
@@ -23,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { 
    rev = finalAttrs.version;

    hash = "sha256-dVbpcBW+jK9nIl5efk5LdKdBm8CkaJWEZ0ZY7ZuApwk=";

  };

  patches = [

    # Support for xsimd 11

    (fetchpatch {

      url = "https://github.com/xtensor-stack/xtensor/commit/77a650a8018e0be6fcc76bf66685ff352ae23ef1.patch";

      hash = "sha256-vOdUzzsSK+lYcA7fZXWOTVV202GZC0DhkMMjzggnmWE=";

    })

    # A single test fails on Darwin, see:

    # https://github.com/xtensor-stack/xtensor/issues/2718

    ./remove-failing-test_xinfo.patch

  ];



  nativeBuildInputs = [

    cmake
@@ -33,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ] ++ lib.optionals (!(stdenv.isAarch64 && stdenv.isLinux)) [

    # xsimd support is broken on aarch64-linux, see:

    # https://github.com/xtensor-stack/xsimd/issues/945

    xsimd10

    xsimd

  ];



  cmakeFlags = let

pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff --git i/test/CMakeLists.txt w/test/CMakeLists.txt

index 46127597..727b66bd 100644

--- i/test/CMakeLists.txt

+++ w/test/CMakeLists.txt

@@ -189,7 +189,6 @@ set(XTENSOR_TESTS

     test_xhistogram.cpp

     test_xpad.cpp

     test_xindex_view.cpp

-    test_xinfo.cpp

     test_xio.cpp

     test_xlayout.cpp

     test_xmanipulation.cpp

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -25679,8 +25679,6 @@ with pkgs; 














  xsimd = callPackage ../development/libraries/xsimd { };



























  xsimd10 = callPackage ../development/libraries/xsimd/10.nix { };



























  xtensor = callPackage ../development/libraries/xtensor { };





























  xtl = callPackage ../development/libraries/xtl { };