From 57fc038ece04ff2600cc24f0f7167626e08a0f26 Mon Sep 17 00:00:00 2001 From: Stefano Carrazza Date: Thu, 30 Jul 2020 15:10:40 +0200 Subject: [PATCH 1/5] fixing dilog computation based on sign of kinematics for T4 --- src/triangle.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/triangle.cc b/src/triangle.cc index 6242921..8c8c804 100644 --- a/src/triangle.cc +++ b/src/triangle.cc @@ -888,7 +888,7 @@ namespace ql const TOutput ct = TOutput(this->_pi2o6); TOutput dilog2; - if (Abs(omarg2) < this->_zero) + if (Real(omarg2) < this->_zero) dilog2 = ct-TOutput(this->ddilog(omarg2))-Log(arg2)*wlog; else dilog2 = TOutput(this->ddilog(arg2)); From fb9d7337c105018071528cf95ceefe987ca5aae9 Mon Sep 17 00:00:00 2001 From: Stefano Carrazza Date: Thu, 30 Jul 2020 15:27:59 +0200 Subject: [PATCH 2/5] replacing fabs with abs --- src/qcdloop/maths.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qcdloop/maths.h b/src/qcdloop/maths.h index 0b1be58..3e061cd 100644 --- a/src/qcdloop/maths.h +++ b/src/qcdloop/maths.h @@ -36,7 +36,7 @@ namespace ql // Absolute value inline double Abs(double const& x) { return std::fabs(x); } inline qdouble Abs(qdouble const& x) { return fabsq(x);} - inline double Abs(complex const& x) { return std::fabs(x);} + inline double Abs(complex const& x) { return std::abs(x);} inline qdouble Abs(qcomplex const& x) { return cabsq(x); } // Complex tools, imag, real and conj. From e68983d303ec9eb1dc0b0bfd89d9faf45744a91e Mon Sep 17 00:00:00 2001 From: Stefano Carrazza Date: Thu, 30 Jul 2020 15:28:19 +0200 Subject: [PATCH 3/5] adding c++11 flag in qcdloop-config --- src/qcdloop-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qcdloop-config.in b/src/qcdloop-config.in index f8133ec..f5fad24 100644 --- a/src/qcdloop-config.in +++ b/src/qcdloop-config.in @@ -28,7 +28,7 @@ tmp=$( echo "$*" | egrep -- '--\') test -n "$tmp" && OUT="$OUT @includedir@" tmp=$( echo "$*" | egrep -- '--\') -test -n "$tmp" && OUT="$OUT -I@includedir@" +test -n "$tmp" && OUT="$OUT -I@includedir@ -std=c++11" tmp=$( echo "$*" | egrep -- '--\') test -n "$tmp" && OUT="$OUT @libdir@" From bd0b8fcd4cd208a3b191464f6e8a89acfadb7e93 Mon Sep 17 00:00:00 2001 From: Stefano Carrazza Date: Thu, 30 Jul 2020 15:58:02 +0200 Subject: [PATCH 4/5] fixing another fabs to abs --- src/qcdloop/maths.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qcdloop/maths.h b/src/qcdloop/maths.h index 3e061cd..b66cb24 100644 --- a/src/qcdloop/maths.h +++ b/src/qcdloop/maths.h @@ -34,7 +34,7 @@ namespace ql inline qcomplex Sqrt(qcomplex const& x){ return csqrtq(x); } // Absolute value - inline double Abs(double const& x) { return std::fabs(x); } + inline double Abs(double const& x) { return std::abs(x); } inline qdouble Abs(qdouble const& x) { return fabsq(x);} inline double Abs(complex const& x) { return std::abs(x);} inline qdouble Abs(qcomplex const& x) { return cabsq(x); } From 7c8cf22b7e4fcfd8053870fb60d3ce512d073940 Mon Sep 17 00:00:00 2001 From: Stefano Carrazza Date: Thu, 30 Jul 2020 16:00:27 +0200 Subject: [PATCH 5/5] including redhat lib paths --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 392b90b..953289e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,10 +46,11 @@ configure_file( set(QUADMATH_NAMES ${QUADMATH_NAMES} libquadmath.so quadmath) find_library(QUADMATH_LIBRARY NAMES ${QUADMATH_NAMES} - PATHS /usr/lib64/atlas /usr/lib/atlas - /usr/lib64 /usr/lib /usr/local/lib64 + PATHS /usr/lib64/atlas /usr/lib/atlas + /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /usr/x86_64-linux-gnu/* /usr/lib/gcc/x86_64-linux-gnu/* + /usr/lib/gcc/x86_64-redhat-linux/* ) if(QUADMATH_LIBRARY) @@ -105,7 +106,7 @@ if(ENABLE_EXAMPLES) add_executable(cache_test examples/cache_test.cc) target_link_libraries(cache_test qcdloop ${QUADMATH_LIBRARIES}) set_target_properties(cache_test PROPERTIES LINK_FLAGS "-Wl,-rpath,./") - + add_executable(cmass_test examples/cmass_test.cc) target_link_libraries(cmass_test qcdloop ${QUADMATH_LIBRARIES}) set_target_properties(cmass_test PROPERTIES LINK_FLAGS "-Wl,-rpath,./")