git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #70015 from ck3d/halide-2019-08-27
bbfd905markuskowa
pkgs/development/compilers/halide/default.nix+3−3
@@ -3,7 +3,7 @@
3}:
3}:
4
4
5let
5let
6− version = "2018_02_15";
6+ version = "2019_08_27";
7
7
8in llvmPackages.stdenv.mkDerivation {
8in llvmPackages.stdenv.mkDerivation {
9
9
@@ -13,7 +13,7 @@ in llvmPackages.stdenv.mkDerivation {
13 owner = "halide";
13 owner = "halide";
14 repo = "Halide";
14 repo = "Halide";
15 rev = "release_${version}";
15 rev = "release_${version}";
16− sha256 = "14lmpbxydx7ii0pxds6rgq5vw4i6yfjsq0bai1l5wwpv1rnwmbxd";
16+ sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n";
17 };
17 };
18
18
19 patches = [ ./nix.patch ];
19 patches = [ ./nix.patch ];
@@ -58,7 +58,7 @@ in llvmPackages.stdenv.mkDerivation {
58 description = "C++ based language for image processing and computational photography";
58 description = "C++ based language for image processing and computational photography";
59 homepage = "https://halide-lang.org";
59 homepage = "https://halide-lang.org";
60 license = licenses.mit;
60 license = licenses.mit;
61− platforms = platforms.linux;
61+ platforms = [ "i686-linux" "x86_64-linux" ];
62 maintainers = [ maintainers.ck3d ];
62 maintainers = [ maintainers.ck3d ];
63 };
63 };
64}
64}
pkgs/development/compilers/halide/nix.patch+12−11
@@ -1,11 +1,11 @@
1diff --git a/CMakeLists.txt b/CMakeLists.txt
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index 40a685b7e..c452efd09 100644
2+index 4ba384324..7e23038f7 100644
3--- a/CMakeLists.txt
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
4+++ b/CMakeLists.txt
5−@@ -49,10 +49,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
5+@@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
6−
6+
7 set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}")
7 set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}")
8−
8+
9-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS)
9-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS)
10-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM)
10-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM)
11-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG)
11-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG)
@@ -14,7 +14,7 @@ index 40a685b7e..c452efd09 100644
14+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR})
14+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR})
15+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR})
15+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR})
16+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR})
16+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR})
17−
17+
18 # LLVM doesn't appear to expose --system-libs via its CMake interface,
18 # LLVM doesn't appear to expose --system-libs via its CMake interface,
19 # so we must shell out to llvm-config to find this info
19 # so we must shell out to llvm-config to find this info
20diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt
20diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt
@@ -27,7 +27,7 @@ index 132c80e6a..36ce865f2 100644
27 set(OpenBLAS_EXTRA_LIBS)
27 set(OpenBLAS_EXTRA_LIBS)
28- set(BLAS_VENDORS OpenBLAS ATLAS)
28- set(BLAS_VENDORS OpenBLAS ATLAS)
29+ set(BLAS_VENDORS OpenBLAS)
29+ set(BLAS_VENDORS OpenBLAS)
30−
30+
31 # TODO
31 # TODO
32 # there are more vendors we could add here that support the cblas interface
32 # there are more vendors we could add here that support the cblas interface
33@@ -41,6 +41,7 @@ if (CBLAS_FOUND)
33@@ -41,6 +41,7 @@ if (CBLAS_FOUND)
@@ -39,17 +39,18 @@ index 132c80e6a..36ce865f2 100644
39 endif()
39 endif()
40 endforeach()
40 endforeach()
41diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt
41diff --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
43--- a/apps/linear_algebra/tests/CMakeLists.txt
43--- a/apps/linear_algebra/tests/CMakeLists.txt
44+++ b/apps/linear_algebra/tests/CMakeLists.txt
44+++ 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)
46 target_link_libraries(test_halide_blas
46 target_link_libraries(test_halide_blas
47 PRIVATE
47 PRIVATE
48 halide_blas
48 halide_blas
49- cblas # XXX fragile
49- cblas # XXX fragile
50+ ${BLAS_LIBRARIES}
50+ ${BLAS_LIBRARIES}
51− Halide
51+ ${HALIDE_COMPILER_LIB}
52 )
52 )
53+
53−--
54+--
54−2.15.0
55+2.23.0
55
56
pkgs/top-level/all-packages.nix+1−1
@@ -3749,7 +3749,7 @@ in
3749
3749
3750 halibut = callPackage ../tools/typesetting/halibut { };
3750 halibut = callPackage ../tools/typesetting/halibut { };
3751
3751
3752− halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; };
3752+ halide = callPackage ../development/compilers/halide { };
3753
3753
3754 ham = pkgs.perlPackages.ham;
3754 ham = pkgs.perlPackages.ham;
3755
3755