git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #70015 from ck3d/halide-2019-08-27

halide new release 2018/02/15 -> 2019/08/27

commitbbfd90563e730bb09024a7ef0b8bc98922d95a9d authormarkuskowa <markus.kowalewski@gmail.com> dateMon 30 Sep 2019, 17:22 (7 years ago) parent2b9ceb48bc8184
3 files changed+16−15
pkgs/development/compilers/halide/default.nix+3−3 pkgs/development/compilers/halide/nix.patch+12−11 pkgs/top-level/all-packages.nix+1−1
pkgs/development/compilers/halide/default.nix+3−3
@@ -3,7 +3,7 @@
33}:
44
55let
6− version = "2018_02_15";
6+ version = "2019_08_27";
77
88in llvmPackages.stdenv.mkDerivation {
99
@@ -13,7 +13,7 @@ in llvmPackages.stdenv.mkDerivation {
1313 owner = "halide";
1414 repo = "Halide";
1515 rev = "release_${version}";
16− sha256 = "14lmpbxydx7ii0pxds6rgq5vw4i6yfjsq0bai1l5wwpv1rnwmbxd";
16+ sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n";
1717 };
1818
1919 patches = [ ./nix.patch ];
@@ -58,7 +58,7 @@ in llvmPackages.stdenv.mkDerivation {
5858 description = "C++ based language for image processing and computational photography";
5959 homepage = "https://halide-lang.org";
6060 license = licenses.mit;
61− platforms = platforms.linux;
61+ platforms = [ "i686-linux" "x86_64-linux" ];
6262 maintainers = [ maintainers.ck3d ];
6363 };
6464}
pkgs/development/compilers/halide/nix.patch+12−11
@@ -1,11 +1,11 @@
11diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index 40a685b7e..c452efd09 100644
2+index 4ba384324..7e23038f7 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
5−@@ -49,10 +49,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
6−
5+@@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
6+
77 set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}")
8−
8+
99-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS)
1010-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM)
1111-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG)
@@ -14,7 +14,7 @@ index 40a685b7e..c452efd09 100644
1414+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR})
1515+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR})
1616+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR})
17−
17+
1818 # LLVM doesn't appear to expose --system-libs via its CMake interface,
1919 # so we must shell out to llvm-config to find this info
2020diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt
@@ -27,7 +27,7 @@ index 132c80e6a..36ce865f2 100644
2727 set(OpenBLAS_EXTRA_LIBS)
2828- set(BLAS_VENDORS OpenBLAS ATLAS)
2929+ set(BLAS_VENDORS OpenBLAS)
30−
30+
3131 # TODO
3232 # there are more vendors we could add here that support the cblas interface
3333@@ -41,6 +41,7 @@ if (CBLAS_FOUND)
@@ -39,17 +39,18 @@ index 132c80e6a..36ce865f2 100644
3939 endif()
4040 endforeach()
4141diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt
42−index 4b95eb3bb..1daa97437 100644
42+index cc02eb0a4..c20419a0d 100644
4343--- a/apps/linear_algebra/tests/CMakeLists.txt
4444+++ b/apps/linear_algebra/tests/CMakeLists.txt
45−@@ -19,6 +19,6 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
45+@@ -19,7 +19,7 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
4646 target_link_libraries(test_halide_blas
4747 PRIVATE
4848 halide_blas
4949- cblas # XXX fragile
5050+ ${BLAS_LIBRARIES}
51− Halide
51+ ${HALIDE_COMPILER_LIB}
5252 )
53−--
54−2.15.0
53+
54+--
55+2.23.0
5556
pkgs/top-level/all-packages.nix+1−1
@@ -3749,7 +3749,7 @@ in
37493749
37503750 halibut = callPackage ../tools/typesetting/halibut { };
37513751
3752− halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; };
3752+ halide = callPackage ../development/compilers/halide { };
37533753
37543754 ham = pkgs.perlPackages.ham;
37553755