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
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 926d8a0
Modified Travis to install ARB if WITH_ARB is set
sushant-hiray 395e8bc
Update mpfr install command in .travis.yml
sushant-hiray 091c82c
Added explicit path for gmp
sushant-hiray 6b87a94
Travis: remove "-v" from tar calls
certik 37c99d7
Remove the --with-gmp
certik 1fa88f7
Specify the location of libgmp.so
certik aef0e46
Installing Arb as an extension of flint
sushant-hiray f89f148
Arb: specify MPFR library location
certik 7538f17
Arb: give the GMP paths to "make install"
certik c748274
Merge branch 'arb-fix' into arb
sushant-hiray 5b08d65
Adding include flags for arb in CMAKE
sushant-hiray 4c1c283
Added `bernoulli` function
sushant-hiray b30e6a0
Uodated bernoulli test to check exception if ARB is not present
sushant-hiray bbc895d
Upgraded ARB from 2.1.0 to 2.2.0
sushant-hiray 89daf75
Updated `bin/test_travis.sh` to link installed libraries for arb
sushant-hiray fc05ecb
Added `Zeta` class
sushant-hiray d7503cb
Added tests for zeta, updated test_travis.sh
sushant-hiray 77a6e24
include flint
isuruf a373b3c
Merge branch '4' into arb
sushant-hiray fdc11f2
Added API and function definition for Dirichlet_eta
sushant-hiray 1d23c76
Added tests for dirichlet_eta
sushant-hiray 2eeaf52
Remove WhiteSpace error from CMakeLists.txt
sushant-hiray File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
|
@@ -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; | ||
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; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove the |
||
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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.