Skip to content

Commit 3747458

Browse files
committed
add RHEL info; note update to Py3.13
1 parent f79be9b commit 3747458

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

webdocs/install-g2f-linux.rst

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,24 @@ The exact details for how the installation is performed will depend on "flavor"
3232
:alt: completion commands in terminal window
3333
:align: right
3434

35-
2) This will run for a few minutes (or longer depending on download speeds) and then the conda installation process will start, with the display of lots of text. At the end, the terminal window will appear as seen to the right. Note the addition of the GSASII file on the desktop (this may not happen on all Linux desktop managers.). The installation has been completed.
35+
Note that binary compatibility between Linux systems is not all that
36+
good. The above is constructed on an Ubuntu 24.04.2 LTS GitHub runner, but
37+
that will not run on APS Redhat Enterprise Linux systems. For RHEL a
38+
separate installer is available. Use this command, instead::
39+
40+
g2="https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/gsas2main-rhel-Latest-Linux-x86_64.sh"
41+
curl -L "$g2" > /tmp/g2.sh; bash /tmp/g2.sh -b -p <install-loc>
42+
43+
If neither of the two installers will work for your flavor of Linux
44+
(which will be obvious as starting either the GUI or loading the scriptable module
45+
will produce error messages about being unable to import the GSAS-II
46+
binaries), you will need to compile GSAS-II yourself. This can be done
47+
after using either of the two Linux installers by following the chapter
48+
`on compiling GSAS-II
49+
<https://advancedphotonsource.github.io/GSAS-II-tutorials/compile.html>`_. Note
50+
there the meson instructions.
51+
52+
2) The previous install step will run for a few minutes (or longer depending on download speeds) and then the conda installation process will start, with the display of lots of text. At the end, the terminal window will appear as seen to the right. Note the addition of the GSASII file on the desktop (this may not happen on all Linux desktop managers.). The installation has been completed.
3653

3754
.. raw:: html
3855

webdocs/install.rst

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,16 @@ where:
6161

6262
<install-loc> is where you want to install the software. (Use of ``~/g2main``, a subdirectory named ``g2main`` in your home directory is a good choice.)
6363

64-
More complete installation instructions are provided for `Linux separately <install-g2f-linux.html>`_.
64+
More complete installation instructions are provided for `Linux
65+
separately <install-g2f-linux.html>`_.
66+
67+
Note that binary compatibility between Linux systems is not all that
68+
good. The above is constructed on an Ubuntu 24.04.2 LTS GitHub runner, but
69+
that will not run on APS Redhat Enterprise Linux systems. For RHEL a
70+
separate installer is available. Use this command, instead::
71+
72+
g2="https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/download/v1.0.1/gsas2main-rhel-Latest-Linux-x86_64.sh"
73+
curl -L "$g2" > /tmp/g2.sh; bash /tmp/g2.sh -b -p <install-loc>
6574

6675

6776
GSAS2MAIN Additional Details
@@ -85,7 +94,7 @@ Users who work extensively with Python and use the conda Python installer may pr
8594

8695
conda create -n GSASII briantoby::gsas2pkg -c conda-forge
8796

88-
This creates a conda virtual environment named ``GSASII`` (this can be changed) for use by GSAS-II. While it is also possible to install GSAS-II into the conda base environment, this is not recommended as it can create conflicts between Python and package versions needed by GSAS-II and those required by other packages. (If you choose to do this anyway, be sure to specify ``conda install python=3.11 briantoby::gsas2pkg`` as Python is likely to be pinned to a different version.)
97+
This creates a conda virtual environment named ``GSASII`` (this can be changed) for use by GSAS-II. While it is also possible to install GSAS-II into the conda base environment, this is not recommended as it can create conflicts between Python and package versions needed by GSAS-II and those required by other packages. (If you choose to do this anyway, be sure to specify ``conda install python=3.13 briantoby::gsas2pkg`` as Python is likely to be pinned to a different version.)
8998

9099
After this command is run, use command ``conda activate GSASII`` to access the
91100
conda environment that has been created. On Linux and MacOS computers, two shortcut commands will then be available in the path, The first command, ``gsasII.sh``, which will start GSAS-II. This can optionally be used as ``gsasII.sh project.gpx`` to open existing project file ``project.gpx`` in GSAS-II. The second command, ``reset-gsasII.sh`` will rarely be used. This command will download the latest version of GSAS-II and update to that version, replacing any locally modified files with the original versions. This can be used to update GSAS-II when the program will not start, so the normal Help->Update menu command cannot be accessed. (Shortcuts available with gsas2pkg v5.1+.)
@@ -102,7 +111,8 @@ A small number of users or sites prefer to use Python distributions supplied via
102111
`found here <install-pip.html>`_. Independent of how Python is installed, multiple packages are needed, please see the
103112
`discussion on Python package requirements <https://gsas-ii.readthedocs.io/en/latest/packages.html#gui-requirements>`_, noting that the GSAS-II GUI requires at a minimum wxPython, matplotlib,
104113
PyOpenGL, NumPy and SciPy, while for scripting use, only NumPy and SciPy are required. For full functionality, several other optional packages are needed.
105-
If versions other than those recommended are selected (Python=3.11 and NumPy=1.26), you will likely need to either locate older binaries and install them manually or compile them yourself (`see compilation information <https://advancedphotonsource.github.io/GSAS-II-tutorials/compile.html>`_).
114+
If versions other than those recommended are selected (
115+
Python=3.13 with NumPy=2.2 or Python=3.11 with NumPy=1.26), you will likely need to either locate older binaries and install them manually or compile them yourself (`see compilation information <https://advancedphotonsource.github.io/GSAS-II-tutorials/compile.html>`_).
106116

107117
A simple way to install GSAS-II with a supplied Python environment uses the ``gitstrap.py`` script provided for this purpose. Use these commands (on any platform) to install GSAS-II::
108118

0 commit comments

Comments
 (0)