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

Just updating the documentation to be in sync with main #65

Merged
merged 9 commits into from
Dec 16, 2024
8 changes: 4 additions & 4 deletions docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Once that is complete, try to install PyMultiNest using pip:

.. code-block:: bash

pip install pymultinest
python -m pip install pymultinest

If this works you may proceed to the Installing NEoST instructions as normal. However, if this fails, or works but installing MultiNest fails, we recomend using the following procedure from `NMMA <https://nuclear-multimessenger-astronomy.github.io/nmma/#for-arm64-macs>`_ to install PyMultiNest/MultiNest. You may also have a glance at the Alternative instructions for prerequisites for installing PyMultiNest/MultiNest as well.

Expand All @@ -127,7 +127,7 @@ or, equivalently,

.. code-block:: bash

pip install .
python -m pip install .

NEoST can optionally be installed without cythonizing the TOV solvers, at the expense of much slower performance. More specificaly, Cython offers a speed up of at least 15x (if dark matter is turned on) and 20x (if dark matter is turned off). If you wish to do this, rename or delete the ``setup.py`` file before running ``make install``. We only recommend using the Python TOV solvers if the cythonized solvers fail to compile or run. Note that the unit tests in the ``tests/`` directory fail if the Python solvers are used; this is expected.

Expand All @@ -151,7 +151,7 @@ If you haven't used conda, you can install them using

.. code-block:: bash

pip install sphinx nbsphinx decorator sphinxcontrib-websupport sphinx_rtd_theme
python -m pip install sphinx nbsphinx decorator sphinxcontrib-websupport sphinx_rtd_theme

Unfortunately, the ``pandoc`` version available in pip does not seem to work, so you may have to install pandoc separately using, e.g., your system's package manager. See also `Pandoc <https://pandoc.org/installing.html>`_.

Expand Down Expand Up @@ -195,7 +195,7 @@ The final step now is to install the Python interface to MultiNest, PyMultiNest.

.. code-block:: bash

pip install pymultinest
python -m pip install pymultinest

Alternatively you can clone its git repository and install manually:

Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@

# Common includes, linker arguments, compiler arguments
include_dirs = [np.get_include(), gsl_prefix+'/include', '.']
extra_link_args = ['-fopenmp']
extra_compile_args = ['-fopenmp', '-Wno-unused-function', '-Wno-uninitialized']
extra_link_args = []
extra_compile_args = ['-Wno-unused-function', '-Wno-uninitialized']

# OS-specific settings
if 'darwin' in OS:
# Using compiler of clang with llvm installed
os.environ["CC"] = "/usr/local/opt/llvm/bin/clang"
os.environ["CXX"] = "/usr/local/opt/llvm/bin/clang++"
# os.environ["CC"] = "/usr/local/opt/llvm/bin/clang"
# os.environ["CXX"] = "/usr/local/opt/llvm/bin/clang++"
library_dirs.append('/usr/local/opt/llvm/lib')
library_dirs.append('/opt/local/lib')
extra_compile_args.append('-Wno-#warnings')
extra_compile_args.append('-Wno-error=format-security')
include_dirs.append(['/usr/local/include', '/usr/local/opt/llvm/include', './neost'])
include_dirs.extend(['/usr/local/include', '/usr/local/opt/llvm/include', './neost/tovsolvers/'])

else:
# point to shared library at compile time so runtime resolution
Expand Down
Loading