Commit aa6c21a7 authored by David Keitel's avatar David Keitel

Update README.md

 -make lalsuite-from-pip the default recommendation
 -don't call any packages that are included in the requirements "optional"
parent 4188e542
...@@ -46,7 +46,7 @@ $ git clone https://gitlab.aei.uni-hannover.de/GregAshton/PyFstat.git ...@@ -46,7 +46,7 @@ $ git clone https://gitlab.aei.uni-hannover.de/GregAshton/PyFstat.git
### Dependencies ### Dependencies
`pyfstat` makes uses the following external python modules: `pyfstat` uses the following external python modules:
* [numpy](http://www.numpy.org/) * [numpy](http://www.numpy.org/)
* [matplotlib](http://matplotlib.org/) >= 1.4 * [matplotlib](http://matplotlib.org/) >= 1.4
...@@ -55,14 +55,12 @@ $ git clone https://gitlab.aei.uni-hannover.de/GregAshton/PyFstat.git ...@@ -55,14 +55,12 @@ $ git clone https://gitlab.aei.uni-hannover.de/GregAshton/PyFstat.git
* [corner](https://pypi.python.org/pypi/corner/) * [corner](https://pypi.python.org/pypi/corner/)
* [dill](https://pypi.python.org/pypi/dill) * [dill](https://pypi.python.org/pypi/dill)
* [peakutils](https://pypi.python.org/pypi/PeakUtils) * [peakutils](https://pypi.python.org/pypi/PeakUtils)
* [pathos](https://pypi.python.org/pypi/pathos)
* [tqdm](https://pypi.python.org/pypi/tqdm)
* [bashplotlib](https://github.com/glamp/bashplotlib)
* [lalsuite](https://pypi.org/project/lalsuite/)
*Optional* *Optional*
* [tqdm](https://pypi.python.org/pypi/tqdm)(optional), if installed, this
provides a useful progress bar and estimate of the remaining run-time.
* [bashplotlib](https://github.com/glamp/bashplotlib), if installed, presents
a histogram of the loaded SFT data
* [pathos](https://pypi.python.org/pypi/pathos), if installed, this provides
support for multiprocessing some functions.
* [pycuda](https://pypi.org/project/pycuda/), required for the tCWFstatMapVersion=pycuda * [pycuda](https://pypi.org/project/pycuda/), required for the tCWFstatMapVersion=pycuda
option of the TransientGridSearch class. option of the TransientGridSearch class.
(Note: 'pip install pycuda' requires a working nvcc compiler in your path.) (Note: 'pip install pycuda' requires a working nvcc compiler in your path.)
...@@ -74,10 +72,10 @@ For an introduction to installing modules see ...@@ -74,10 +72,10 @@ For an introduction to installing modules see
$ pip install -r /PATH/TO/THIS/DIRECTORY/requirements.txt $ pip install -r /PATH/TO/THIS/DIRECTORY/requirements.txt
``` ```
In addition to these modules, you also need a working **swig-enabled** If you prefer to make your own LALSuite installation
[`lalapps`](http://software.ligo.org/docs/lalsuite/lalsuite/) with [https://git.ligo.org/lscsoft/lalsuite/](from source),
at least `lalpulsar`. A minimal confuration line to use when installing make sure it is **swig-enabled** and contains at least the `lalpulsar` package.
`lalapps` is A minimal confuration line to use would be e.g.:
``` ```
$ ./configure --prefix=${HOME}/lalsuite-install --disable-all-lal --enable-lalpulsar --enable-lalapps --enable-swig $ ./configure --prefix=${HOME}/lalsuite-install --disable-all-lal --enable-lalpulsar --enable-lalapps --enable-swig
...@@ -86,7 +84,8 @@ $ ./configure --prefix=${HOME}/lalsuite-install --disable-all-lal --enable-lalpu ...@@ -86,7 +84,8 @@ $ ./configure --prefix=${HOME}/lalsuite-install --disable-all-lal --enable-lalpu
### `pyfstat` installation ### `pyfstat` installation
The script can be installed system wide, assuming you are in the source directory, via The module and associated scripts can be installed system wide (or to the currently active venv),
assuming you are in the source directory, via
``` ```
$ python setup.py install $ python setup.py install
``` ```
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment