halide new release 2018/02/15 -> 2019/08/27
This commit is contained in:
parent
2a9d82fe2f
commit
1392ea8543
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2018_02_15";
|
||||
version = "2019_08_27";
|
||||
|
||||
in llvmPackages.stdenv.mkDerivation {
|
||||
|
||||
@ -13,7 +13,7 @@ in llvmPackages.stdenv.mkDerivation {
|
||||
owner = "halide";
|
||||
repo = "Halide";
|
||||
rev = "release_${version}";
|
||||
sha256 = "14lmpbxydx7ii0pxds6rgq5vw4i6yfjsq0bai1l5wwpv1rnwmbxd";
|
||||
sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n";
|
||||
};
|
||||
|
||||
patches = [ ./nix.patch ];
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 40a685b7e..c452efd09 100644
|
||||
index 4ba384324..7e23038f7 100644
|
||||
--- a/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}")
|
||||
|
||||
@ -39,17 +39,18 @@ index 132c80e6a..36ce865f2 100644
|
||||
endif()
|
||||
endforeach()
|
||||
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
|
||||
+++ 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
|
||||
PRIVATE
|
||||
halide_blas
|
||||
- cblas # XXX fragile
|
||||
+ ${BLAS_LIBRARIES}
|
||||
Halide
|
||||
${HALIDE_COMPILER_LIB}
|
||||
)
|
||||
--
|
||||
2.15.0
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
|
@ -3745,7 +3745,7 @@ in
|
||||
|
||||
halibut = callPackage ../tools/typesetting/halibut { };
|
||||
|
||||
halide = callPackage ../development/compilers/halide { llvmPackages=llvmPackages_6; };
|
||||
halide = callPackage ../development/compilers/halide { };
|
||||
|
||||
ham = pkgs.perlPackages.ham;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user