1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-15 14:27:06 +01:00

Merge branch 'develop' into feature/gpu-port

This commit is contained in:
Peter Boyle
2018-12-13 05:11:34 +00:00
647 changed files with 49155 additions and 11160 deletions

View File

@ -11,12 +11,16 @@ Grid physics library, www.github.com/paboyle/Grid
Source file: $1
Copyright (C) 2015
Copyright (C) 2016
Copyright (C) 2015-2018
EOF
git log $1 | grep Author | sort -u >> message
git log $1 | grep Author > gitauth
grep 'Author: ' $1 > fileauth
cat gitauth fileauth | sort -u >> message
rm gitauth fileauth
cat >> message <<EOF
@ -60,4 +64,4 @@ shift
done
rm message tmp.fil

View File

@ -0,0 +1,19 @@
--- ./Eigen/unsupported/Eigen/CXX11/Tensor 2018-07-23 10:33:42.000000000 +0100
+++ Tensor 2018-08-28 16:15:56.000000000 +0100
@@ -25,7 +25,7 @@
#include <utility>
#endif
-#include <Eigen/src/Core/util/DisableStupidWarnings.h>
+#include "../../../Eigen/src/Core/util/DisableStupidWarnings.h"
#include "../SpecialFunctions"
#include "src/util/CXX11Meta.h"
@@ -147,6 +147,6 @@
#include "src/Tensor/TensorIO.h"
-#include <Eigen/src/Core/util/ReenableStupidWarnings.h>
+#include "../../../Eigen/src/Core/util/ReenableStupidWarnings.h"
//#endif // EIGEN_CXX11_TENSOR_MODULE

View File

@ -3,7 +3,7 @@
home=`pwd`
# library Make.inc
cd $home/lib
cd $home/Grid
HFILES=`find . -type f -name '*.h' -not -name '*Hdf5*' -not -path '*/gamma-gen/*' -not -path '*/Old/*' -not -path '*/Eigen/*'`
HFILES="$HFILES"
CCFILES=`find . -type f -name '*.cc' -not -path '*/gamma-gen/*' -not -name '*Communicator*.cc' -not -name '*SharedMemory*.cc' -not -name '*Hdf5*'`

View File

@ -7,8 +7,31 @@ fi
ARC=$1
INITDIR=`pwd`
cd ../lib
echo 'eigen_files =\' > Eigen.inc
find Eigen -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> Eigen.inc
rm -f Grid/Eigen
rm -rf Eigen
##################
#untar
##################
tar -xf ${ARC}
ARCDIR=`tar -tf ${ARC} | head -n1 | sed -e 's@/.*@@'`
###############################
# Link to a deterministic name
###############################
mv ${ARCDIR} Eigen
ln -s ${INITDIR}/Eigen/Eigen ${INITDIR}/Grid/Eigen
ln -s ${INITDIR}/Eigen/unsupported/Eigen ${INITDIR}/Grid/Eigen/unsupported
# Eigen source headers
cd ${INITDIR}/Grid
echo 'eigen_files =\' > ${INITDIR}/Grid/Eigen.inc
find -L Eigen -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> ${INITDIR}/Grid/Eigen.inc
###################################
# back to home
###################################
cd ${INITDIR}