Merge pull request #77657 from bhipple/remove/blitz

blitz: remove package
This commit is contained in:
Marek Mahut 2020-01-17 10:56:24 +01:00 committed by GitHub
commit 4a49a784c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 131 deletions

View file

@ -1,33 +0,0 @@
diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h
--- blitz-0.10/blitz/bzdebug.h 2012-05-11 22:11:13.000000000 +0200
+++ blitz-0.10.new/blitz/bzdebug.h 2012-06-28 15:42:38.060656045 +0200
@@ -117,15 +117,15 @@
}
}
- #define BZASSERT(X) checkAssert(X, __FILE__, __LINE__)
- #define BZPRECONDITION(X) checkAssert(X, __FILE__, __LINE__)
- #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__)
- #define BZSTATECHECK(X,Y) checkAssert(X == Y, __FILE__, __LINE__)
+ #define BZASSERT(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZPRECONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__)
+ #define BZSTATECHECK(X,Y) blitz::checkAssert(X == Y, __FILE__, __LINE__)
#define BZPRECHECK(X,Y) \
{ \
if ((assertFailMode == false) && (!(X))) \
BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \
- checkAssert(X, __FILE__, __LINE__); \
+ blitz::checkAssert(X, __FILE__, __LINE__); \
}
#define BZ_DEBUG_MESSAGE(X) \
@@ -138,7 +138,7 @@
}
#define BZ_DEBUG_PARAM(X) X
- #define BZ_PRE_FAIL checkAssert(0)
+ #define BZ_PRE_FAIL blitz::checkAssert(0)
#define BZ_ASM_DEBUG_MARKER
#elif defined(BZ_DEBUG)

View file

@ -1,13 +0,0 @@
diff --git a/testsuite/stencil-et.cpp b/testsuite/stencil-et.cpp
index b23e979..fe6b5ed 100644
--- a/testsuite/stencil-et.cpp
+++ b/testsuite/stencil-et.cpp
@@ -44,7 +44,7 @@ void test_expr(const T1& d1, const T2& d2)
BZTEST(all(d1==d2));
}
*/
-#define test_expr(d1,d2) BZTEST(all((d1)==(d2)));
+#define test_expr(d1,d2) BZTEST(all((d1)-(d2)<=1e-7));
// Test two vector expressions for equality
template<typename T1, typename T2>

View file

@ -1,81 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gfortran, texinfo
# Select SIMD alignment width (in bytes) for vectorization.
, simdWidth ? 1
# Pad arrays to simdWidth by default?
# Note: Only useful if simdWidth > 1
, enablePadding ? false
# Activate serialization through Boost.Serialize?
, enableSerialization ? true, boost ? null
# Activate test-suite?
# WARNING: Some of the tests require up to 1700MB of memory to compile.
, doCheck ? true
}:
assert enableSerialization -> boost != null;
let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation {
name = "blitz++-0.10";
src = fetchurl {
url = mirror://sourceforge/blitz/blitz-0.10.tar.gz;
sha256 = "153g9sncir6ip9l7ssl6bhc4qzh0qr3lx2d15qm68hqxj7kg0kl0";
};
patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gfortran texinfo ]
++ optional (boost != null) boost;
configureFlags =
[ "--enable-shared"
"--enable-fortran"
"--enable-optimize"
"--with-pic=yes"
"--enable-html-docs"
"--disable-doxygen"
"--disable-dot"
"--disable-latex-docs"
"--enable-simd-width=${toString simdWidth}"
]
++ optional enablePadding "--enable-array-length-padding"
++ optional enableSerialization "--enable-serialization"
++ optionals (boost != null) [ "--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib" ]
++ optional stdenv.is64bit "--enable-64bit"
;
enableParallelBuilding = true;
buildFlags = [ "lib" "info" "pdf" "html" ];
installTargets = [ "install" "install-info" "install-pdf" "install-html" ];
inherit doCheck;
checkTarget = "check-testsuite check-examples";
meta = {
description = "Fast multi-dimensional array library for C++";
homepage = https://sourceforge.net/projects/blitz/;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.aherrmann ];
longDescription = ''
Blitz++ is a C++ class library for scientific computing which provides
performance on par with Fortran 77/90. It uses template techniques to
achieve high performance. Blitz++ provides dense arrays and vectors,
random number generators, and small vectors (useful for representing
multicomponent or vector fields).
'';
broken = true; # failing test, ancient version, no library user in nixpkgs => if you care to fix it, go ahead
};
}

View file

@ -1205,10 +1205,6 @@ in
bliss = callPackage ../applications/science/math/bliss { };
blitz = callPackage ../development/libraries/blitz {
boost = boost160;
};
blobfuse = callPackage ../tools/filesystems/blobfuse { };
blockdiag = with python3Packages; toPythonApplication blockdiag;