Commit ce68cdc7 authored by Graeme Stewart's avatar Graeme Stewart
Browse files

External/AtlasEigen deleted from 21.0


Former-commit-id: 389b56e854c285d9ad1cc11f9c2ec5d2f65b2189
parent 478d0f9b
# $Id: CMakeLists.txt 725736 2016-02-23 15:03:37Z krasznaa $
#
# Package building Eigen as part of the offline software build.
#
# The name of the package:
atlas_subdir( AtlasEigen )
# In release recompilation mode stop here:
if( ATLAS_RELEASE_MODE )
return()
endif()
# Build Eigen for the build area:
ExternalProject_Add( Eigen
PREFIX ${CMAKE_BINARY_DIR}
URL ${CMAKE_CURRENT_SOURCE_DIR}/src/eigen-3.1.3.tar.gz
INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}
PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmt/placement-new.patch
COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmt/typedef-warnings.patch
COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmt/register-warnings.patch
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/build
LOG_CONFIGURE 1 )
ExternalProject_Add_Step( Eigen buildinstall
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_BINARY_DIR}/build/ <INSTALL_DIR>
COMMENT "Installing Eigen into the build area"
DEPENDEES install )
add_dependencies( Package_AtlasEigen Eigen )
# And now install it:
install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build/
DESTINATION . USE_SOURCE_PERMISSIONS )
import os
from distutils import dir_util
pkg_name= "eigen"
pkg_ver = "3.1.3"
pkg_src = "%(pkg_root)s/src/%(pkg_name)s-%(pkg_ver)s.tar.bz2"
pkg_installarea_dir = "%(CMTINSTALLAREA)s/%(CMTCONFIG)s/include"
pkg_install_dir = "%(pkg_root)s/%(CMTCONFIG)s/pkg-build-install-%(pkg_name)s"
def configure(self):
return
def build(self):
sh = self.sh
msg = self.msg
env = self.env
os.remove('%(pkg_name)s-%(pkg_ver)s.tar.bz2' % self.env)
dir_util.copy_tree(self.sh.getcwd(), self.env['pkg_install_dir'])
os.system('cd %s; patch -p0 < %s/cmt/placement-new.patch' % (self.env['pkg_install_dir'], self.pkg_root))
os.system('cd %s; patch -p0 < %s/cmt/typedef-warnings.patch' % (self.env['pkg_install_dir'], self.pkg_root))
os.system('cd %s; patch -p0 < %s/cmt/register-warnings.patch' % (self.env['pkg_install_dir'], self.pkg_root))
return
def install(self):
return
--- Eigen/src/Core/util/Memory.h-orig 2013-11-25 18:06:35.437874520 +0100
+++ Eigen/src/Core/util/Memory.h 2013-11-26 19:48:25.995529454 +0100
@@ -611,6 +611,7 @@
/* this particular case. */ \
static void *operator new(size_t size, void *ptr) { return ::operator new(size,ptr); } \
void operator delete(void * memory, void *ptr) throw() { return ::operator delete(memory,ptr); } \
+ void *operator new[](size_t size, void* ptr) { return ::operator new[](size,ptr); } \
/* nothrow-new (returns zero instead of std::bad_alloc) */ \
EIGEN_MAKE_ALIGNED_OPERATOR_NEW_NOTHROW(NeedsToAlign) \
void operator delete(void *ptr, const std::nothrow_t&) throw() { \
--- Eigen/src/Core/products/SelfadjointMatrixVector.h-orig 2015-06-06 15:13:16.000000001 +0200
+++ Eigen/src/Core/products/SelfadjointMatrixVector.h 2015-06-06 15:20:08.000000001 +0200
@@ -71,8 +71,8 @@
for (Index j=FirstTriangular ? bound : 0;
j<(FirstTriangular ? size : bound);j+=2)
{
- register const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride;
- register const Scalar* EIGEN_RESTRICT A1 = lhs + (j+1)*lhsStride;
+ EIGEN_REGISTER const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride;
+ EIGEN_REGISTER const Scalar* EIGEN_RESTRICT A1 = lhs + (j+1)*lhsStride;
Scalar t0 = cjAlpha * rhs[j];
Packet ptmp0 = pset1<Packet>(t0);
@@ -139,7 +139,7 @@
}
for (Index j=FirstTriangular ? 0 : bound;j<(FirstTriangular ? bound : size);j++)
{
- register const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride;
+ EIGEN_REGISTER const Scalar* EIGEN_RESTRICT A0 = lhs + j*lhsStride;
Scalar t1 = cjAlpha * rhs[j];
Scalar t2(0);
--- Eigen/src/Core/arch/SSE/PacketMath.h-orig 2015-06-06 15:15:25.000000001 +0200
+++ Eigen/src/Core/arch/SSE/PacketMath.h 2015-06-06 15:18:56.000000001 +0200
@@ -491,8 +491,8 @@
// for GCC (eg., it does not like using std::min after the pstore !!)
EIGEN_ALIGN16 int aux[4];
pstore(aux, a);
- register int aux0 = aux[0]<aux[1] ? aux[0] : aux[1];
- register int aux2 = aux[2]<aux[3] ? aux[2] : aux[3];
+ EIGEN_REGISTER int aux0 = aux[0]<aux[1] ? aux[0] : aux[1];
+ EIGEN_REGISTER int aux2 = aux[2]<aux[3] ? aux[2] : aux[3];
return aux0<aux2 ? aux0 : aux2;
}
@@ -512,8 +512,8 @@
// for GCC (eg., it does not like using std::min after the pstore !!)
EIGEN_ALIGN16 int aux[4];
pstore(aux, a);
- register int aux0 = aux[0]>aux[1] ? aux[0] : aux[1];
- register int aux2 = aux[2]>aux[3] ? aux[2] : aux[3];
+ EIGEN_REGISTER int aux0 = aux[0]>aux[1] ? aux[0] : aux[1];
+ EIGEN_REGISTER int aux2 = aux[2]>aux[3] ? aux[2] : aux[3];
return aux0>aux2 ? aux0 : aux2;
}
--- Eigen/src/Core/util/Macros.h-orig 2015-06-06 15:18:36.000000001 +0200
+++ Eigen/src/Core/util/Macros.h 2015-06-06 15:18:58.000000001 +0200
@@ -407,4 +407,10 @@
const RHS \
>
+#ifdef __clang__
+# define EIGEN_REGISTER
+#else
+# define EIGEN_REGISTER register
+#endif
+
#endif // EIGEN_MACROS_H
package AtlasEigen
use AtlasPolicy AtlasPolicy-*
use PyCmt PyCmt-* Tools -no_auto_imports
include_path none
macro AtlasEigen_include $(AtlasEigen_cmtpath)/InstallArea/$(CMTCONFIG)/include
apply_pattern include_path extras=$(AtlasEigen_include)
apply_pattern set_root_include_path
private
apply_pattern make_pkgbuild \
name=eigen \
file=pkgbuild_eigen.py
end_private
--- Eigen/src/QR/HouseholderQR.h-orig 2015-03-18 19:15:30.000000001 +0100
+++ Eigen/src/QR/HouseholderQR.h 2015-03-18 19:15:34.000000001 +0100
@@ -232,7 +232,7 @@
{
typedef typename MatrixQR::Index Index;
typedef typename MatrixQR::Scalar Scalar;
- typedef typename MatrixQR::RealScalar RealScalar;
+ //typedef typename MatrixQR::RealScalar RealScalar;
typedef Block<MatrixQR,Dynamic,Dynamic> BlockType;
Index rows = mat.rows();
--- Eigen/src/Core/products/SelfadjointMatrixVector.h-orig 2015-03-18 19:17:37.000000001 +0100
+++ Eigen/src/Core/products/SelfadjointMatrixVector.h 2015-03-18 19:17:45.000000001 +0100
@@ -35,7 +35,7 @@
Scalar alpha)
{
typedef typename packet_traits<Scalar>::type Packet;
- typedef typename NumTraits<Scalar>::Real RealScalar;
+ //typedef typename NumTraits<Scalar>::Real RealScalar;
const Index PacketSize = sizeof(Packet)/sizeof(Scalar);
enum {
--- Eigen/src/Core/util/Memory.h-orig 2015-03-18 19:16:29.000000001 +0100
+++ Eigen/src/Core/util/Memory.h 2015-03-18 19:16:34.000000001 +0100
@@ -451,7 +451,7 @@
template<typename Scalar, typename Index>
static inline Index first_aligned(const Scalar* array, Index size)
{
- typedef typename packet_traits<Scalar>::type Packet;
+ //typedef typename packet_traits<Scalar>::type Packet;
enum { PacketSize = packet_traits<Scalar>::size,
PacketAlignedMask = PacketSize-1
};
--- Eigen/src/Eigenvalues/Tridiagonalization.h-orig 2015-03-18 19:13:57.000000001 +0100
+++ Eigen/src/Eigenvalues/Tridiagonalization.h 2015-03-18 19:14:01.000000001 +0100
@@ -425,7 +425,7 @@
template<typename MatrixType, typename DiagonalType, typename SubDiagonalType>
void tridiagonalization_inplace(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ)
{
- typedef typename MatrixType::Index Index;
+ //typedef typename MatrixType::Index Index;
//Index n = mat.rows();
eigen_assert(mat.cols()==mat.rows() && diag.size()==mat.rows() && subdiag.size()==mat.rows()-1);
tridiagonalization_inplace_selector<MatrixType>::run(mat, diag, subdiag, extractQ);
--- Eigen/src/Eigenvalues/ComplexSchur.h-orig 2015-03-18 19:14:40.000000001 +0100
+++ Eigen/src/Eigenvalues/ComplexSchur.h 2015-03-18 19:14:46.000000001 +0100
@@ -309,7 +309,7 @@
static void run(ComplexSchur<MatrixType>& _this, const MatrixType& matrix, bool computeU)
{
typedef typename ComplexSchur<MatrixType>::ComplexScalar ComplexScalar;
- typedef typename ComplexSchur<MatrixType>::ComplexMatrixType ComplexMatrixType;
+ //typedef typename ComplexSchur<MatrixType>::ComplexMatrixType ComplexMatrixType;
// Note: m_hess is over RealScalar; m_matT and m_matU is over ComplexScalar
_this.m_hess.compute(matrix);
## -*- python -*-
## waf imports
import waflib.Logs as msg
PACKAGE = {
"name": "External/AtlasEigen",
"authors": [ATLAS collaboration],
}
### ---------------------------------------------------------------------------
def pkg_deps(ctx):
## public dependencies
ctx.use_pkg("AtlasPolicy", version="AtlasPolicy-*", public=True)
## no private dependencies
## no runtime dependencies
return # pkg_deps
### ---------------------------------------------------------------------------
def options(ctx):
ctx.load("find_eigen")
return # options
### ---------------------------------------------------------------------------
def configure(ctx):
if ctx.hwaf_enabled_tag("STANDALONE"):
ctx.load("find_eigen")
ctx.find_eigen()
return
macro = ctx.hwaf_declare_macro
macro("AtlasEigen_native_version", "3.1.4")
macro("AtlasEigen_home", "${ATLAS_EXTERNAL}/eigen/${AtlasEigen_native_version}/${LCG_platform}")
macro("AtlasEigen_incdir", "${AtlasEigen_home}/include")
macro("AtlasEigen_export_paths", "${AtlasEigen_home}")
ctx.lcg_declare_external_package(
'AtlasEigen',
path='${AtlasEigen_home}',
incdir='${AtlasEigen_incdir}',
)
path = ctx.hwaf_subst_vars("${AtlasEigen_home}")
ctx.find_eigen(path_list=[path], extra_paths=[path])
return # configure
### ---------------------------------------------------------------------------
def build(ctx):
return # build
## EOF ##
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment