MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Christian Kögler 2019-09-29 13:45:50 +02:00
parent 2a9d82fe2f
commit 1392ea8543
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/halide/default.nix
View file

@ -3,7 +3,7 @@
}: }:
let let
version = "2018_02_15"; version = "2019_08_27";
in llvmPackages.stdenv.mkDerivation { in llvmPackages.stdenv.mkDerivation {
@ -13,7 +13,7 @@ in llvmPackages.stdenv.mkDerivation {
owner = "halide"; owner = "halide";
repo = "Halide"; repo = "Halide";
rev = "release_${version}"; rev = "release_${version}";
sha256 = "14lmpbxydx7ii0pxds6rgq5vw4i6yfjsq0bai1l5wwpv1rnwmbxd"; sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n";
}; };
patches = [ ./nix.patch ]; patches = [ ./nix.patch ];

23
pkgs/development/compilers/halide/nix.patch
View file

@ -1,11 +1,11 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40a685b7e..c452efd09 100644 index 4ba384324..7e23038f7 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -49,10 +49,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") @@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}") set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}")
-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS) -file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS)
-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM) -file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM)
-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG) -file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG)
@ -14,7 +14,7 @@ index 40a685b7e..c452efd09 100644
+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR}) +find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR})
+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR}) +find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR})
+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR}) +find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR})
# LLVM doesn't appear to expose --system-libs via its CMake interface, # LLVM doesn't appear to expose --system-libs via its CMake interface,
# so we must shell out to llvm-config to find this info # so we must shell out to llvm-config to find this info
diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt
@ -27,7 +27,7 @@ index 132c80e6a..36ce865f2 100644
set(OpenBLAS_EXTRA_LIBS) set(OpenBLAS_EXTRA_LIBS)
- set(BLAS_VENDORS OpenBLAS ATLAS) - set(BLAS_VENDORS OpenBLAS ATLAS)
+ set(BLAS_VENDORS OpenBLAS) + set(BLAS_VENDORS OpenBLAS)
# TODO # TODO
# there are more vendors we could add here that support the cblas interface # there are more vendors we could add here that support the cblas interface
@@ -41,6 +41,7 @@ if (CBLAS_FOUND) @@ -41,6 +41,7 @@ if (CBLAS_FOUND)
@ -39,17 +39,18 @@ index 132c80e6a..36ce865f2 100644
endif() endif()
endforeach() endforeach()
diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt
index 4b95eb3bb..1daa97437 100644 index cc02eb0a4..c20419a0d 100644
--- a/apps/linear_algebra/tests/CMakeLists.txt --- a/apps/linear_algebra/tests/CMakeLists.txt
+++ b/apps/linear_algebra/tests/CMakeLists.txt +++ b/apps/linear_algebra/tests/CMakeLists.txt
@@ -19,6 +19,6 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable) @@ -19,7 +19,7 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable)
target_link_libraries(test_halide_blas target_link_libraries(test_halide_blas
PRIVATE PRIVATE
halide_blas halide_blas
- cblas # XXX fragile - cblas # XXX fragile
+ ${BLAS_LIBRARIES} + ${BLAS_LIBRARIES}
Halide ${HALIDE_COMPILER_LIB}
) )
--
2.15.0 --
2.23.0

2
pkgs/top-level/all-packages.nix
View file

@ -3745,7 +3745,7 @@ in
halibut = callPackage ../tools/typesetting/halibut { }; halibut = callPackage ../tools/typesetting/halibut { };
halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; }; halide = callPackage ../development/compilers/halide { };
ham = pkgs.perlPackages.ham; ham = pkgs.perlPackages.ham;