From f5f45d751c151b6e28e24905c99248973990bffa Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Mon, 1 Oct 2007 17:07:38 +0000 Subject: [PATCH] Move the meta loop unrolling to a separate file, Loop.h --- src/internal/Loop.h | 54 +++++++++++++++++++++++++++++++++++++++++++ src/internal/Object.h | 27 +--------------------- 2 files changed, 55 insertions(+), 26 deletions(-) create mode 100644 src/internal/Loop.h diff --git a/src/internal/Loop.h b/src/internal/Loop.h new file mode 100644 index 000000000..b68982ab7 --- /dev/null +++ b/src/internal/Loop.h @@ -0,0 +1,54 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. Eigen itself is part of the KDE project. +// +// Copyright (C) 2007 Michael Olbrich +// +// Eigen is free software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the Free Software +// Foundation; either version 2 or (at your option) any later version. +// +// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +// details. +// +// You should have received a copy of the GNU General Public License along +// with Eigen; if not, write to the Free Software Foundation, Inc., 51 +// Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +// +// As a special exception, if other files instantiate templates or use macros +// or functions from this file, or you compile this file and link it +// with other works to produce a work based on this file, this file does not +// by itself cause the resulting work to be covered by the GNU General Public +// License. This exception does not invalidate any other reasons why a work +// based on this file might be covered by the GNU General Public License. + +#ifndef EI_LOOP_H +#define EI_LOOP_H + +template class EiLoop +{ + static const int col = (UnrollCount-1) / Rows; + static const int row = (UnrollCount-1) % Rows; + + public: + template + static void copy(Derived1 &dst, const Derived2 &src) + { + EiLoop::copy(dst, src); + dst.write(row, col) = src.read(row, col); + } +}; + +template class EiLoop<0, Rows> +{ + public: + template + static void copy(Derived1 &dst, const Derived2 &src) + { + EI_UNUSED(dst); + EI_UNUSED(src); + } +}; + +#endif //EI_LOOP_H diff --git a/src/internal/Object.h b/src/internal/Object.h index de33c84c0..6eec83e39 100644 --- a/src/internal/Object.h +++ b/src/internal/Object.h @@ -2,7 +2,6 @@ // for linear algebra. Eigen itself is part of the KDE project. // // Copyright (C) 2006-2007 Benoit Jacob -// Copyright (C) 2007 Michael Olbrich // // Eigen is free software; you can redistribute it and/or modify it under the // terms of the GNU General Public License as published by the Free Software @@ -28,31 +27,7 @@ #define EI_OBJECT_H #include "Util.h" - -template class EiLoop -{ - static const int col = (UnrollCount-1) / Rows; - static const int row = (UnrollCount-1) % Rows; - - public: - template - static void copy(Derived1 &dst, const Derived2 &src) - { - EiLoop::copy(dst, src); - dst.write(row, col) = src.read(row, col); - } -}; - -template class EiLoop<0, Rows> -{ - public: - template - static void copy(Derived1 &dst, const Derived2 &src) - { - EI_UNUSED(dst); - EI_UNUSED(src); - } -}; +#include "Loop.h" template class EiObject {