Still needs more changes to show how to do things with Meson

Author: diegomartinez2

UserGuide/install.rst

@@ -68,15 +68,15 @@ For python, we strongly recommend using the anaconda distribution, that already
 
 The numpy, scipy and matplotlib are python packages. These are usually provided with a new installation
 of python distributions like anaconda. Lapack and Blas are needed for compiling the FORTRAN code (together with a FORTRAN compiler like gfortran).
-In many Linux distributions like ubuntu they can be installed as 
+In many Linux distributions like ubuntu they can be installed as
 
 .. code-block:: console
 
    sudo apt-get install libblas-dev liblapack-dev liblapacke-dev gfortran
 
 
 
-Note that this specific command may change in time. 
+Note that this specific command may change in time.
 
 
 Together with these mandatory requirements (otherwise, the code will not compile correctly or raise an exception at the startup), we
@@ -90,7 +90,7 @@ If these packages are available, they will enable the automatic cluster/local ca
 To install all the python dependencies (and recommended) automatically, you may just run:
 
 .. code-block:: console
-   
+
    pip install -r requirements.txt
 
 
@@ -102,8 +102,8 @@ Installation from pip
 The easiest way to install python-sscha (and CellConstructor) is through the python package manager:
 
 .. code-block:: console
-   
-   pip install python-sscha 
+
+   pip install python-sscha
 
 
 
@@ -116,25 +116,40 @@ Installation from source
 ------------------------
 
 Once all the dependences of the codes are satisfied, you can unzip the source code downloaded from the website.
-Then run, inside the directory that contains the setup.py script, the following command:
+Then run, inside the directory that contains the meson.build script, the following command:
 
 .. code-block:: console
 
-   python setup.py install
+   pip install .
 
 
 As for the pip installation, you may append the --user option to install the package only for the user (without requiring administrator powers).
 
+An "editable" install is highly recommended for developers. It allows you to modify the source code and have the changes reflected immediately without needing to reinstall.
+.. code-block:: console
+
+   pip install -e .
+
 
 Install with Intel FORTRAN compiler
 -----------------------------------
 
-The setup.py script works automatically with the GNU FORTRAN compiler. However, due to some differences in linking lapack,
-to use the intel compiler you need to edit a bit the setup.py script:
+Meson works automatically with the GNU FORTRAN compiler. However, due to some differences in linking lapack,
+to use the intel compiler you need to:
+
+Ensure MKL is installed in your Conda environment:
+.. code-block:: console
 
-In this case, you need to delete the lapack linking from the
-setup.py and include the -mkl as linker option.
-Note that you must force to use the same liker compiler as the one used for the compilation. 
+   conda install mkl mkl-devel
+
+You can pass Meson options through pip's \--config-settings flag.
+.. code-block:: console
+
+    pip install . --config-settings=--setup-args=-Duse_mkl=true
+
+Or for an editable install:
+.. code-block::
+    pip install -e . --config-settings=--setup-args=-Duse_mkl=true
 
 Install with a specific compiler path
 -------------------------------------
@@ -154,5 +169,3 @@ If we want to use a custom compiler in /path/to/fcompiler we may run the setup a
 
 
 A specific setup.py script is provided to install it easily in FOSS clusters.
-
-