Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Interface Arb with CSymPy, Add Zeta Module #265

Merged
merged 23 commits into from Aug 5, 2014
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ca4a7ed
Adding Arb in CMakeList. Arb can be used -DWITH_ARB=yes
sushant-hiray Jul 29, 2014
926d8a0
Modified Travis to install ARB if WITH_ARB is set
sushant-hiray Jul 29, 2014
395e8bc
Update mpfr install command in .travis.yml
sushant-hiray Jul 29, 2014
091c82c
Added explicit path for gmp
sushant-hiray Jul 30, 2014
6b87a94
Travis: remove "-v" from tar calls
certik Jul 30, 2014
37c99d7
Remove the --with-gmp
certik Jul 30, 2014
1fa88f7
Specify the location of libgmp.so
certik Jul 30, 2014
aef0e46
Installing Arb as an extension of flint
sushant-hiray Jul 30, 2014
f89f148
Arb: specify MPFR library location
certik Jul 30, 2014
7538f17
Arb: give the GMP paths to "make install"
certik Jul 30, 2014
c748274
Merge branch 'arb-fix' into arb
sushant-hiray Jul 30, 2014
5b08d65
Adding include flags for arb in CMAKE
sushant-hiray Aug 1, 2014
4c1c283
Added `bernoulli` function
sushant-hiray Aug 1, 2014
b30e6a0
Uodated bernoulli test to check exception if ARB is not present
sushant-hiray Aug 1, 2014
bbc895d
Upgraded ARB from 2.1.0 to 2.2.0
sushant-hiray Aug 1, 2014
89daf75
Updated `bin/test_travis.sh` to link installed libraries for arb
sushant-hiray Aug 1, 2014
fc05ecb
Added `Zeta` class
sushant-hiray Aug 2, 2014
d7503cb
Added tests for zeta, updated test_travis.sh
sushant-hiray Aug 2, 2014
77a6e24
include flint
isuruf Aug 2, 2014
a373b3c
Merge branch '4' into arb
sushant-hiray Aug 2, 2014
fdc11f2
Added API and function definition for Dirichlet_eta
sushant-hiray Aug 3, 2014
1d23c76
Added tests for dirichlet_eta
sushant-hiray Aug 3, 2014
2eeaf52
Remove WhiteSpace error from CMakeLists.txt
sushant-hiray Aug 5, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions .travis.yml
Expand Up @@ -22,6 +22,8 @@ env:
- BUILD_TYPE="Debug" WITH_BFD="yes" WITH_CSYMPY_ASSERT="yes" WITH_PRIMESIEVE="yes"
# Debug build (with BFD and CSYMPY_ASSERT) with Python 2.7
- BUILD_TYPE="Debug" WITH_BFD="yes" WITH_CSYMPY_ASSERT="yes" WITH_PYTHON="yes"
# Debug build (with BFD and CSYMPY_ASSERT) with Arb
- BUILD_TYPE="Debug" WITH_BFD="yes" WITH_CSYMPY_ASSERT="yes" WITH_ARB="yes"
# Debug build with Teuchos::RCP (just to test that it compiles)
- BUILD_TYPE="Debug" WITH_BFD="yes" WITH_CSYMPY_RCP="no"
# Release build (with BFD)
Expand Down Expand Up @@ -79,6 +81,15 @@ before_install:
tar -xzvf primesieve-5.2.tar.gz;
cd primesieve-5.2 && ./configure && make && sudo make install && cd ..;
fi
- if [[ "${WITH_ARB}" == "yes" ]]; then
sudo apt-get install libmpfr-dev;
wget http://www.flintlib.org/flint-2.4.4.tar.gz;
tar -xzvf flint-2.4.4.tar.gz;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the -v, it's just polluting the output.

cd flint-2.4.4 && ./configure && make && sudo make install && cd ..;
wget https://github.com/fredrik-johansson/arb/archive/2.1.0.tar.gz;
tar -xzvf 2.1.0.tar.gz;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the -v.

cd arb-2.1.0 && ./configure --with-gmp=/usr && make && sudo make install && cd ..;
fi
install:
- if [[ "${WITH_PYTHON}" == "yes" ]]; then
pip install cython sympy --use-mirrors;
Expand Down
17 changes: 17 additions & 0 deletions CMakeLists.txt
Expand Up @@ -58,6 +58,17 @@ if (WITH_PRIMESIEVE)
set(HAVE_CSYMPY_PRIMESIEVE yes)
endif()

#ARB
set(WITH_ARB no
CACHE BOOL "Build with Arb")

if (WITH_ARB)
find_package(ARB REQUIRED)
include_directories(${ARB_INCLUDE_DIRS})
set(LIBS ${LIBS} ${ARB_LIBRARY})
set(HAVE_CSYMPY_ARB yes)
endif()

# Python
set(WITH_PYTHON no
CACHE BOOL "Build with Python wrappers")
Expand Down Expand Up @@ -171,5 +182,11 @@ if (WITH_PRIMESIEVE)
message("PRIMESIEVE_LIBRARIES: ${PRIMESIEVE_LIBRARY}")
endif()

message("WITH_ARB: ${WITH_ARB}")
if (WITH_ARB)
message("ARB_INCLUDE_DIRS: ${ARB_INCLUDE_DIRS}")
message("ARB_LIBRARIES: ${ARB_LIBRARY}")
endif()

message("Copying source of python wrappers into: ${CMAKE_CURRENT_BINARY_DIR}")
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/csympy DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
3 changes: 3 additions & 0 deletions bin/test_travis.sh
Expand Up @@ -46,6 +46,9 @@ fi
if [[ "${WITH_PRIMESIEVE}" != "" ]]; then
cmake_line="$cmake_line -DWITH_PRIMESIEVE=${WITH_PRIMESIEVE}"
fi
if [[ "${WITH_ARB}" != "" ]]; then
cmake_line="$cmake_line -DWITH_ARB=${WITH_ARB}"
fi
if [[ "${PYTHON_INSTALL}" == "yes" ]]; then
git clean -dfx
python setup.py install
Expand Down
9 changes: 9 additions & 0 deletions cmake/FindARB.cmake
@@ -0,0 +1,9 @@
find_path(ARB_INCLUDE_DIR fmprb.h $ENV{PYTHONHPC}/include)
find_library(ARB arb $ENV{PYTHONHPC}/lib)
set(ARB_LIBRARY ${ARB})
set(ARB_INCLUDE_DIRS ${ARB_INCLUDE_DIR})

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ARB DEFAULT_MSG ARB_LIBRARY ARB_INCLUDE_DIR)

mark_as_advanced(ARB_INCLUDE_DIR ARB)