Skip to content

Commit

Permalink
Merge pull request #58 from wolfv/refactor
Browse files Browse the repository at this point in the history
move flens, change config
  • Loading branch information
SylvainCorlay committed Mar 5, 2018
2 parents fc9e02b + 24249b8 commit 7f9272d
Show file tree
Hide file tree
Showing 1,382 changed files with 3,096 additions and 3,043 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ docs/build/
.ipynb_checkpoints/

# Generated header
include/xtensor-blas/xblas_config.hpp
include/xtensor-blas/xblas_config_cling.hpp
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ cmake_minimum_required(VERSION 3.1)
project(xtensor-blas)

set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
set(FLENS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/xtensor-blas/flens)
set(XTENSOR_BLAS_INCLUDE_DIR ${INCLUDE_DIR} ${FLENS_INCLUDE_DIR})
set(XTENSOR_BLAS_INCLUDE_DIR ${INCLUDE_DIR})

# Configuration
# =============
Expand All @@ -22,8 +21,8 @@ set(XTENSOR_BLAS_CLING_LIBRARY_DIR_32 "\"${CMAKE_INSTALL_PREFIX}/lib32\"")
set(XTENSOR_BLAS_CLING_LIBRARY_DIR "\"${CMAKE_INSTALL_PREFIX}/lib\"")

configure_file (
"${INCLUDE_DIR}/xtensor-blas/xblas_config.hpp.in"
"${INCLUDE_DIR}/xtensor-blas/xblas_config.hpp"
"${INCLUDE_DIR}/xtensor-blas/xblas_config_cling.hpp.in"
"${INCLUDE_DIR}/xtensor-blas/xblas_config_cling.hpp"
)

# Versionning
Expand Down Expand Up @@ -53,6 +52,7 @@ set(XTENSOR_BLAS_HEADERS
${INCLUDE_DIR}/xtensor-blas/xblas.hpp
${INCLUDE_DIR}/xtensor-blas/xblas_utils.hpp
${INCLUDE_DIR}/xtensor-blas/xblas_config.hpp
${INCLUDE_DIR}/xtensor-blas/xblas_config_cling.hpp
${INCLUDE_DIR}/xtensor-blas/xlapack.hpp
${INCLUDE_DIR}/xtensor-blas/xlinalg.hpp
)
Expand Down Expand Up @@ -99,8 +99,8 @@ include(CMakePackageConfigHelpers)
install(FILES ${XTENSOR_BLAS_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor-blas)

install(DIRECTORY ${FLENS_INCLUDE_DIR}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor-blas/flens)
install(DIRECTORY ${INCLUDE_DIR}/xflens
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
set(XTENSOR_BLAS_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for xtensor-blasConfig.cmake")
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
#ifndef CXXBLAS_AUXILIARY_AUXILIARY_H
#define CXXBLAS_AUXILIARY_AUXILIARY_H 1

#include <cxxblas/auxiliary/complex.h>
#include <cxxblas/auxiliary/complextrait.h>
#include <cxxblas/auxiliary/debugmacro.h>
#include <cxxblas/auxiliary/fakeuse.h>
#include <cxxblas/auxiliary/iscomplex.h>
#include <cxxblas/auxiliary/ismpfrreal.h>
#include <cxxblas/auxiliary/issame.h>
#include <cxxblas/auxiliary/pow.h>
#include <cxxblas/auxiliary/restrictto.h>
#include "xflens/cxxblas/auxiliary/complex.h"
#include "xflens/cxxblas/auxiliary/complextrait.h"
#include "xflens/cxxblas/auxiliary/debugmacro.h"
#include "xflens/cxxblas/auxiliary/fakeuse.h"
#include "xflens/cxxblas/auxiliary/iscomplex.h"
#include "xflens/cxxblas/auxiliary/ismpfrreal.h"
#include "xflens/cxxblas/auxiliary/issame.h"
#include "xflens/cxxblas/auxiliary/pow.h"
#include "xflens/cxxblas/auxiliary/restrictto.h"

#endif // CXXBLAS_AUXILIARY_AUXILIARY_H
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef CXXBLAS_AUXILIARY_AUXILIARY_TCC
#define CXXBLAS_AUXILIARY_AUXILIARY_TCC 1

#include <cxxblas/auxiliary/complex.tcc>
#include <cxxblas/auxiliary/pow.tcc>
#include "xflens/cxxblas/auxiliary/complex.tcc"
#include "xflens/cxxblas/auxiliary/pow.tcc"

#endif // CXXBLAS_AUXILIARY_AUXILIARY_TCC
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#ifndef CXXBLAS_AUXILIARY_COMPLEX_H
#define CXXBLAS_AUXILIARY_COMPLEX_H 1

#include <cxxblas/typedefs.h>
#include <cxxblas/auxiliary/restrictto.h>
#include "xflens/cxxblas/typedefs.h"
#include "xflens/cxxblas/auxiliary/restrictto.h"

namespace cxxblas {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#define CXXBLAS_AUXILIARY_COMPLEX_TCC 1

#include <complex>
#include <cxxblas/auxiliary/complex.h>
#include "xflens/cxxblas/auxiliary/complex.h"

namespace cxxblas {

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
#ifndef CXXBLAS_AUXILIARY_POW_H
#define CXXBLAS_AUXILIARY_POW_H 1

#include <cxxblas/auxiliary/iscomplex.h>
#include <cxxblas/auxiliary/ismpfrreal.h>
#include <cxxblas/auxiliary/issame.h>
#include <cxxblas/auxiliary/restrictto.h>
#include "xflens/cxxblas/auxiliary/iscomplex.h"
#include "xflens/cxxblas/auxiliary/ismpfrreal.h"
#include "xflens/cxxblas/auxiliary/issame.h"
#include "xflens/cxxblas/auxiliary/restrictto.h"

#ifdef WITH_MPFR
#include <external/real.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#define CXXBLAS_AUXILIARY_POW_TCC 1

#include <cmath>
#include <cxxblas/auxiliary/complextrait.h>
#include <cxxblas/auxiliary/pow.h>
#include "xflens/cxxblas/auxiliary/complextrait.h"
#include "xflens/cxxblas/auxiliary/pow.h"
#ifdef WITH_MPFR
#include <external/real.hpp>
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef CXXBLAS_CXXBLAS_CXX
#define CXXBLAS_CXXBLAS_CXX 1

#include <cxxblas/cxxblas.h>
#include <cxxblas/cxxblas.tcc>
#include "xflens/cxxblas/cxxblas.h"
#include "xflens/cxxblas/cxxblas.tcc"

#endif // CXXBLAS_CXXBLAS_CXX
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@
#ifndef CXXBLAS_CXXBLAS_H
#define CXXBLAS_CXXBLAS_H 1

#include <cxxblas/auxiliary/auxiliary.h>
#include <cxxblas/drivers/drivers.h>
#include <cxxblas/typedefs.h>
#include "xflens/cxxblas/auxiliary/auxiliary.h"
#include "xflens/cxxblas/drivers/drivers.h"
#include "xflens/cxxblas/typedefs.h"

#include <cxxblas/level1/level1.h>
#include <cxxblas/level1extensions/level1extensions.h>
#include <cxxblas/level2/level2.h>
#include <cxxblas/level2extensions/level2extensions.h>
#include <cxxblas/level3/level3.h>
#include <cxxblas/level3extensions/level3extensions.h>
#include "xflens/cxxblas/level1/level1.h"
#include "xflens/cxxblas/level1extensions/level1extensions.h"
#include "xflens/cxxblas/level2/level2.h"
#include "xflens/cxxblas/level2extensions/level2extensions.h"
#include "xflens/cxxblas/level3/level3.h"
#include "xflens/cxxblas/level3extensions/level3extensions.h"

#include <cxxblas/sparselevel2/sparselevel2.h>
#include <cxxblas/sparselevel3/sparselevel3.h>
#include "xflens/cxxblas/sparselevel2/sparselevel2.h"
#include "xflens/cxxblas/sparselevel3/sparselevel3.h"

#include <cxxblas/tinylevel1/tinylevel1.h>
#include <cxxblas/tinylevel2/tinylevel2.h>
#include "xflens/cxxblas/tinylevel1/tinylevel1.h"
#include "xflens/cxxblas/tinylevel2/tinylevel2.h"

#endif // CXXBLAS_CXXBLAS_H
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@
#ifndef CXXBLAS_CXXBLAS_TCC
#define CXXBLAS_CXXBLAS_TCC 1

#include <cxxblas/auxiliary/auxiliary.tcc>
#include <cxxblas/drivers/drivers.tcc>
#include "xflens/cxxblas/auxiliary/auxiliary.tcc"
#include "xflens/cxxblas/drivers/drivers.tcc"

#include <cxxblas/level1/level1.tcc>
#include <cxxblas/level1extensions/level1extensions.tcc>
#include <cxxblas/level2/level2.tcc>
#include <cxxblas/level2extensions/level2extensions.tcc>
#include <cxxblas/level3/level3.tcc>
#include <cxxblas/level3extensions/level3extensions.tcc>
#include "xflens/cxxblas/level1/level1.tcc"
#include "xflens/cxxblas/level1extensions/level1extensions.tcc"
#include "xflens/cxxblas/level2/level2.tcc"
#include "xflens/cxxblas/level2extensions/level2extensions.tcc"
#include "xflens/cxxblas/level3/level3.tcc"
#include "xflens/cxxblas/level3extensions/level3extensions.tcc"

#include <cxxblas/sparselevel2/sparselevel2.tcc>
#include <cxxblas/sparselevel3/sparselevel3.tcc>
#include "xflens/cxxblas/sparselevel2/sparselevel2.tcc"
#include "xflens/cxxblas/sparselevel3/sparselevel3.tcc"

#include <cxxblas/tinylevel1/tinylevel1.tcc>
#include <cxxblas/tinylevel2/tinylevel2.tcc>
#include "xflens/cxxblas/tinylevel1/tinylevel1.tcc"
#include "xflens/cxxblas/tinylevel2/tinylevel2.tcc"

#endif // CXXBLAS_CXXBLAS_TCC
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#ifndef CXXBLAS_DRIVERS_DRIVERS_H
#define CXXBLAS_DRIVERS_DRIVERS_H 1

#include <cxxblas/auxiliary/issame.h>
#include <cxxblas/auxiliary/restrictto.h>
#include "xflens/cxxblas/auxiliary/issame.h"
#include "xflens/cxxblas/auxiliary/restrictto.h"

// define implementation specific constants, macros, etc.
#if defined (WITH_ATLAS)
Expand All @@ -53,14 +53,14 @@


#ifdef HAVE_CBLAS
#include <cxxblas/drivers/cblas.h>
#include "xflens/cxxblas/drivers/cblas.h"
#endif

#ifdef HAVE_SPARSEBLAS
#include <cxxblas/drivers/sparseblas.h>
#include "xflens/cxxblas/drivers/sparseblas.h"
#endif

#include <cxxblas/typedefs.h>
#include "xflens/cxxblas/typedefs.h"

namespace cxxblas {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#ifndef CXXBLAS_DRIVERS_DRIVERS_TCC
#define CXXBLAS_DRIVERS_DRIVERS_TCC 1

#include <cxxblas/auxiliary/auxiliary.h>
#include <cxxblas/drivers/drivers.h>
#include "xflens/cxxblas/auxiliary/auxiliary.h"
#include "xflens/cxxblas/drivers/drivers.h"

#ifndef BLAS_IMPL
# define BLAS_IMPL "CXXBLAS (generic)"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef CXXBLAS_DRIVERS_SPARSEBLAS_H
#define CXXBLAS_DRIVERS_SPARSEBLAS_H 1

#include <cxxblas/drivers/mklblas.h>
#include "xflens/cxxblas/drivers/mklblas.h"

#ifndef SPARSEBLAS_INT
# define SPARSEBLAS_INT int
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#ifndef CXXBLAS_LEVEL1_ASUM_H
#define CXXBLAS_LEVEL1_ASUM_H 1

#include <cxxblas/typedefs.h>
#include <cxxblas/drivers/drivers.h>
#include "xflens/cxxblas/typedefs.h"
#include "xflens/cxxblas/drivers/drivers.h"

#define HAVE_CXXBLAS_ASUM 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#define CXXBLAS_LEVEL1_ASUM_TCC 1

#include <cmath>
#include <cxxblas/cxxblas.h>
#include "xflens/cxxblas/cxxblas.h"


namespace cxxblas {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#ifndef CXXBLAS_LEVEL1_AXPY_H
#define CXXBLAS_LEVEL1_AXPY_H 1

#include <cxxblas/drivers/drivers.h>
#include <cxxblas/typedefs.h>
#include "xflens/cxxblas/drivers/drivers.h"
#include "xflens/cxxblas/typedefs.h"

#define HAVE_CXXBLAS_AXPY 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#define CXXBLAS_LEVEL1_AXPY_TCC 1

#include <cstdio>
#include <cxxblas/cxxblas.h>
#include "xflens/cxxblas/cxxblas.h"

namespace cxxblas {

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#ifndef CXXBLAS_LEVEL1_COPY_H
#define CXXBLAS_LEVEL1_COPY_H 1

#include <cxxblas/drivers/drivers.h>
#include <cxxblas/typedefs.h>
#include "xflens/cxxblas/drivers/drivers.h"
#include "xflens/cxxblas/typedefs.h"

#define HAVE_CXXBLAS_COPY 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef CXXBLAS_LEVEL1_COPY_TCC
#define CXXBLAS_LEVEL1_COPY_TCC 1

#include <cxxblas/cxxblas.h>
#include "xflens/cxxblas/cxxblas.h"

namespace cxxblas {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef CXXBLAS_LEVEL1_DOT_H
#define CXXBLAS_LEVEL1_DOT_H 1

#include <cxxblas/cxxblas.h>
#include "xflens/cxxblas/cxxblas.h"

#define HAVE_CXXBLAS_DOT 1
#define HAVE_CXXBLAS_DOTU 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifndef CXXBLAS_LEVEL1_DOT_TCC
#define CXXBLAS_LEVEL1_DOT_TCC 1

#include <cxxblas/cxxblas.h>
#include "xflens/cxxblas/cxxblas.h"

namespace cxxblas {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#ifndef CXXBLAS_LEVEL1_IAMAX_H
#define CXXBLAS_LEVEL1_IAMAX_H 1

#include <cxxblas/drivers/drivers.h>
#include <cxxblas/typedefs.h>
#include "xflens/cxxblas/drivers/drivers.h"
#include "xflens/cxxblas/typedefs.h"

#define HAVE_CXXBLAS_IAMAX 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include <complex>
#include <cmath>
#include <cxxblas/cxxblas.h>
#include "xflens/cxxblas/cxxblas.h"

namespace cxxblas {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
#ifndef CXXBLAS_LEVEL1_LEVEL1_H
#define CXXBLAS_LEVEL1_LEVEL1_H 1

#include <cxxblas/level1/asum.h>
#include <cxxblas/level1/axpy.h>
#include <cxxblas/level1/copy.h>
#include <cxxblas/level1/dot.h>
#include <cxxblas/level1/iamax.h>
#include <cxxblas/level1/nrm2.h>
#include <cxxblas/level1/rot.h>
#include <cxxblas/level1/rotm.h>
#include <cxxblas/level1/scal.h>
#include <cxxblas/level1/swap.h>
#include "xflens/cxxblas/level1/asum.h"
#include "xflens/cxxblas/level1/axpy.h"
#include "xflens/cxxblas/level1/copy.h"
#include "xflens/cxxblas/level1/dot.h"
#include "xflens/cxxblas/level1/iamax.h"
#include "xflens/cxxblas/level1/nrm2.h"
#include "xflens/cxxblas/level1/rot.h"
#include "xflens/cxxblas/level1/rotm.h"
#include "xflens/cxxblas/level1/scal.h"
#include "xflens/cxxblas/level1/swap.h"

#endif // CXXBLAS_LEVEL1_LEVEL1_H

0 comments on commit 7f9272d

Please sign in to comment.